Rev 6126: (vila) Cleanup http imports (Jelmer Vernooij) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 6126 [merge]
revision-id: pqm at pqm.ubuntu.com-20110904105444-pnhb87wwruork1ki
parent: pqm at pqm.ubuntu.com-20110902124536-e8qhanwx2fkhdcwl
parent: jelmer at samba.org-20110903163053-aisvzybnpi9167ht
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2011-09-04 10:54:44 +0000
message:
  (vila) Cleanup http imports (Jelmer Vernooij)
modified:
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
  bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
  bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
=== modified file 'bzrlib/transport/http/__init__.py'
--- a/bzrlib/transport/http/__init__.py	2011-08-19 22:34:02 +0000
+++ b/bzrlib/transport/http/__init__.py	2011-09-03 16:30:53 +0000
@@ -20,7 +20,6 @@
 """
 
 from cStringIO import StringIO
-import mimetools
 import re
 import urlparse
 import urllib
@@ -35,14 +34,9 @@
     urlutils,
     )
 from bzrlib.smart import medium
-from bzrlib.symbol_versioning import (
-        deprecated_method,
-        )
 from bzrlib.trace import mutter
 from bzrlib.transport import (
     ConnectedTransport,
-    _CoalescedOffset,
-    Transport,
     )
 
 # TODO: This is not used anymore by HttpTransport_urllib
@@ -612,7 +606,7 @@
             t = self._http_transport_ref()
             code, body_filelike = t._post(bytes)
             if code != 200:
-                raise InvalidHttpResponse(
+                raise errors.InvalidHttpResponse(
                     t._remote_path('.bzr/smart'),
                     'Expected 200 response code, got %r' % (code,))
         except (errors.InvalidHttpResponse, errors.ConnectionReset), e:

=== modified file 'bzrlib/transport/http/_urllib.py'
--- a/bzrlib/transport/http/_urllib.py	2011-06-14 01:26:41 +0000
+++ b/bzrlib/transport/http/_urllib.py	2011-09-03 16:30:53 +0000
@@ -14,14 +14,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-from cStringIO import StringIO
-import urllib
-import urlparse
-
 from bzrlib import (
     errors,
     trace,
-    urlutils,
     )
 from bzrlib.transport import http
 # TODO: handle_response should be integrated into the http/__init__.py

=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py	2011-08-10 22:34:25 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py	2011-09-03 16:30:53 +0000
@@ -70,7 +70,6 @@
     osutils,
     trace,
     transport,
-    ui,
     urlutils,
     )
 

=== modified file 'bzrlib/transport/http/response.py'
--- a/bzrlib/transport/http/response.py	2011-07-27 11:57:32 +0000
+++ b/bzrlib/transport/http/response.py	2011-09-03 16:30:53 +0000
@@ -28,7 +28,6 @@
 
 from bzrlib import (
     errors,
-    trace,
     osutils,
     )
 

=== modified file 'bzrlib/transport/http/wsgi.py'
--- a/bzrlib/transport/http/wsgi.py	2011-03-05 02:26:26 +0000
+++ b/bzrlib/transport/http/wsgi.py	2011-09-03 16:30:53 +0000
@@ -22,7 +22,7 @@
 
 from cStringIO import StringIO
 
-from bzrlib.smart import protocol, medium
+from bzrlib.smart import medium
 from bzrlib.transport import chroot, get_transport
 from bzrlib.urlutils import local_path_to_url