Rev 2951: Rename FTPServer.py to ftp_server.py. in file:///v/home/vila/src/bzr/bugs/157752/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/157752/

------------------------------------------------------------
revno: 2951
revision-id:v.ladeuil+lp at free.fr-20071031093150-jampe95fzzgls1ny
parent: v.ladeuil+lp at free.fr-20071030175409-yvkwn2d5t1paslvh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 157752
timestamp: Wed 2007-10-31 10:31:50 +0100
message:
  Rename FTPServer.py to ftp_server.py.
  
  * bzrlib/transport/ftp.py:
  Rename FTPServer.py to ftp_server.py.
  (get_test_permutations): Rename the fake FTPServer to
  UnavailableFTPServer.
  
  * bzrlib/tests/test_ftp_transport.py: 
  Rename FTPServer.py to ftp_server.py.
renamed:
  bzrlib/tests/FTPServer.py => bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
modified:
  bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
-------------- next part --------------
=== renamed file 'bzrlib/tests/FTPServer.py' => 'bzrlib/tests/ftp_server.py'
=== modified file 'bzrlib/tests/test_ftp_transport.py'
--- a/bzrlib/tests/test_ftp_transport.py	2007-10-30 17:54:09 +0000
+++ b/bzrlib/tests/test_ftp_transport.py	2007-10-31 09:31:50 +0000
@@ -28,8 +28,8 @@
     _test_needs_features = [tests.FTPServerFeature]
 
     def setUp(self):
-        from bzrlib.tests import FTPServer
-        self.transport_server = FTPServer.FTPServer
+        from bzrlib.tests import ftp_server
+        self.transport_server = ftp_server.FTPServer
         super(TestCaseWithFTPServer, self).setUp()
 
 

=== modified file 'bzrlib/transport/ftp.py'
--- a/bzrlib/transport/ftp.py	2007-10-30 17:54:09 +0000
+++ b/bzrlib/transport/ftp.py	2007-10-31 09:31:50 +0000
@@ -557,13 +557,13 @@
     """Return the permutations to be used in testing."""
     from bzrlib import tests
     if tests.FTPServerFeature.available():
-        from bzrlib.tests import FTPServer
-        return [(FtpTransport, FTPServer.FTPServer)]
+        from bzrlib.tests import ftp_server
+        return [(FtpTransport, ftp_server.FTPServer)]
     else:
         # Dummy server to have the test suite report the number of tests
         # needing that feature.
-        class FTPServer(object):
+        class UnavailableFTPServer(object):
             def setUp(self):
                 raise tests.UnavailableFeature(tests.FTPServerFeature)
 
-        return [(FtpTransport, FTPServer)]
+        return [(FtpTransport, UnavailableFTPServer)]