Rev 5284: Cleanup some imports in http_utils.py. in file:///home/vila/src/bzr/experimental/leaking-tests/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Sat Jun 12 15:56:23 BST 2010
At file:///home/vila/src/bzr/experimental/leaking-tests/
------------------------------------------------------------
revno: 5284
revision-id: v.ladeuil+lp at free.fr-20100612145623-6i8v3e7ee0etr8l5
parent: v.ladeuil+lp at free.fr-20100611165821-n9qocd25c84rrd1t
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: http-leaks
timestamp: Sat 2010-06-12 16:56:23 +0200
message:
Cleanup some imports in http_utils.py.
-------------- next part --------------
=== modified file 'bzrlib/tests/http_utils.py'
--- a/bzrlib/tests/http_utils.py 2010-06-11 16:31:34 +0000
+++ b/bzrlib/tests/http_utils.py 2010-06-12 14:56:23 +0000
@@ -28,13 +28,14 @@
errors,
osutils,
tests,
- )
-from bzrlib.smart import medium, protocol
+ transport,
+ )
+from bzrlib.smart import (
+ medium,
+ protocol,
+ )
from bzrlib.tests import http_server
-from bzrlib.transport import (
- chroot,
- get_transport,
- )
+from bzrlib.transport import chroot
class HTTPServerWithSmarts(http_server.HttpServer):
@@ -56,11 +57,12 @@
def do_POST(self):
"""Hand the request off to a smart server instance."""
- backing = get_transport(self.server.test_case_server._home_dir)
+ backing = transport.get_transport(
+ self.server.test_case_server._home_dir)
chroot_server = chroot.ChrootServer(backing)
chroot_server.start_server()
try:
- t = get_transport(chroot_server.get_url())
+ t = transport.get_transport(chroot_server.get_url())
self.do_POST_inner(t)
finally:
chroot_server.stop_server()
@@ -157,7 +159,7 @@
return self._adjust_url(base, relpath)
def get_secondary_transport(self, relpath=None):
- t = get_transport(self.get_secondary_url(relpath))
+ t = transport.get_transport(self.get_secondary_url(relpath))
self.assertTrue(t.is_readonly())
return t
@@ -261,7 +263,7 @@
return self._adjust_url(base, relpath)
def get_old_transport(self, relpath=None):
- t = get_transport(self.get_old_url(relpath))
+ t = transport.get_transport(self.get_old_url(relpath))
self.assertTrue(t.is_readonly())
return t
@@ -270,7 +272,7 @@
return self._adjust_url(base, relpath)
def get_new_transport(self, relpath=None):
- t = get_transport(self.get_new_url(relpath))
+ t = transport.get_transport(self.get_new_url(relpath))
self.assertTrue(t.is_readonly())
return t
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py 2010-06-11 16:31:34 +0000
+++ b/bzrlib/tests/test_http.py 2010-06-12 14:56:23 +0000
@@ -1406,8 +1406,8 @@
self.old_transport = self.get_old_transport()
- def get_a(self, transport):
- return transport.get('a')
+ def get_a(self, t):
+ return t.get('a')
def test_no_redirection(self):
t = self.get_new_transport()
More information about the bazaar-commits
mailing list