Rev 3924: Fix 313498 by allowing direct "use" of UnavailableFTPServer in http://bazaar.launchpad.net/%7Evila/bzr/bzr.integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Evila/bzr/bzr.integration

------------------------------------------------------------
revno: 3924
revision-id: v.ladeuil+lp at free.fr-20090107085955-bqtvip4ll1ooq7g5
parent: pqm at pqm.ubuntu.com-20090106171520-9pzjoqa7m74hvhht
parent: v.ladeuil+lp at free.fr-20090107084051-kzknwgxdt8u4j0nk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Wed 2009-01-07 09:59:55 +0100
message:
  Fix 313498 by allowing direct "use" of UnavailableFTPServer
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
    ------------------------------------------------------------
    revno: 3921.1.2
    revision-id: v.ladeuil+lp at free.fr-20090107084051-kzknwgxdt8u4j0nk
    parent: garyvdm at gmail.com-20090103200652-bobqmhzi5r6vel1m
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: 313498-no-ftp-server
    timestamp: Wed 2009-01-07 09:40:51 +0100
    message:
      Add NEWS entry.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3921.1.1
    revision-id: garyvdm at gmail.com-20090103200652-bobqmhzi5r6vel1m
    parent: pqm at pqm.ubuntu.com-20081229142916-z08eu2alga2acrh6
    committer: Gary van der Merwe <garyvdm at gmail.com>
    branch nick: bzr.dev
    timestamp: Sat 2009-01-03 22:06:52 +0200
    message:
      Make UnavailableFTPServer.setUp() the same as FTPServer.setUp
    modified:
      bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-01-06 16:20:02 +0000
+++ b/NEWS	2009-01-07 08:59:55 +0000
@@ -53,6 +53,9 @@
     * Don't require embedding user in HTTP(S) URLs do use authentication.conf.
       (Ben Jansen, Vincent Ladeuil, #300347)
 
+    * Fix bogus setUp signature in UnavailableFTPServer.
+     (Gary van der Merwe, #313498)
+
     * Fix compilation error in ``_dirstate_helpers_c`` on SunOS/Solaris.
       (Jari Aalto)
 

=== modified file 'bzrlib/transport/ftp/__init__.py'
--- a/bzrlib/transport/ftp/__init__.py	2008-10-15 15:51:50 +0000
+++ b/bzrlib/transport/ftp/__init__.py	2009-01-03 20:06:52 +0000
@@ -599,7 +599,7 @@
         # side-effects (tearDown is never called).
         class UnavailableFTPServer(object):
 
-            def setUp(self):
+            def setUp(self, vfs_server=None):
                 pass
 
             def tearDown(self):