Rev 2954: Fix reference to FTPServer, forgotten in the previous renaming in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2954
revision-id: pqm at pqm.ubuntu.com-20071031123737-3srdl8uoj1o9vb69
parent: pqm at pqm.ubuntu.com-20071031104053-fj7i7m8037qjgce4
parent: v.ladeuil+lp at free.fr-20071031114844-4aiho9kp87gzzngk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-31 12:37:37 +0000
message:
  Fix reference to FTPServer, forgotten in the previous renaming
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 2953.1.1
    merged: v.ladeuil+lp at free.fr-20071031114844-4aiho9kp87gzzngk
    parent: pqm at pqm.ubuntu.com-20071031104053-fj7i7m8037qjgce4
    parent: v.ladeuil+lp at free.fr-20071031114545-4sovxko8bk8nq115
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: trunk
    timestamp: Wed 2007-10-31 12:48:44 +0100
    message:
      Fix reference to FTPServer, forgotten in the previous renaming
    ------------------------------------------------------------
    revno: 2949.3.3
    merged: v.ladeuil+lp at free.fr-20071031114545-4sovxko8bk8nq115
    parent: v.ladeuil+lp at free.fr-20071031093150-jampe95fzzgls1ny
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: 157752
    timestamp: Wed 2007-10-31 12:45:45 +0100
    message:
      Fix reference to FTPServer, forgotten in the previous renaming.
      
      * bzrlib/tests/__init__.py:
      (_FTPServerFeature._probe): Test the right module import.
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2007-10-30 17:54:09 +0000
+++ b/bzrlib/tests/__init__.py	2007-10-31 11:45:45 +0000
@@ -2734,7 +2734,7 @@
 
     def _probe(self):
         try:
-            import bzrlib.tests.FTPServer
+            import bzrlib.tests.ftp_server
             return True
         except ImportError:
             return False