Rev 3696: (trivial) Remove some unused imports, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3696
revision-id: pqm at pqm.ubuntu.com-20080908061835-nz7hj7o0pms1nf9p
parent: pqm at pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
parent: andrew.bennetts at canonical.com-20080908054927-q84h4v1c8dy91h92
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-09-08 07:18:35 +0100
message:
  (trivial) Remove some unused imports,
  	fix two trivially broken raise statements. (Andrew Bennetts)
modified:
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
  bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
    ------------------------------------------------------------
    revno: 3695.1.1
    revision-id: andrew.bennetts at canonical.com-20080908054927-q84h4v1c8dy91h92
    parent: pqm at pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: trivial
    timestamp: Mon 2008-09-08 15:49:27 +1000
    message:
      Remove some unused imports and fix a couple of trivially broken raise statements.
    modified:
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
      bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2008-09-06 10:25:39 +0000
+++ b/bzrlib/remote.py	2008-09-08 05:49:27 +0000
@@ -18,7 +18,6 @@
 # across to run on the server.
 
 import bz2
-from cStringIO import StringIO
 
 from bzrlib import (
     branch,
@@ -32,19 +31,13 @@
 )
 from bzrlib.branch import BranchReferenceFormat
 from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
-from bzrlib.config import BranchConfig, TreeConfig
 from bzrlib.decorators import needs_read_lock, needs_write_lock
 from bzrlib.errors import (
     NoSuchRevision,
     SmartProtocolError,
     )
 from bzrlib.lockable_files import LockableFiles
-from bzrlib.pack import ContainerPushParser
 from bzrlib.smart import client, vfs
-from bzrlib.symbol_versioning import (
-    deprecated_in,
-    deprecated_method,
-    )
 from bzrlib.revision import ensure_null, NULL_REVISION
 from bzrlib.trace import mutter, note, warning
 
@@ -554,7 +547,7 @@
             if _skip_rpc:
                 if self._lock_token is not None:
                     if token != self._lock_token:
-                        raise TokenMismatch(token, self._lock_token)
+                        raise errors.TokenMismatch(token, self._lock_token)
                 self._lock_token = token
             else:
                 self._lock_token = self._remote_lock_write(token)

=== modified file 'bzrlib/smart/message.py'
--- a/bzrlib/smart/message.py	2008-06-01 23:08:22 +0000
+++ b/bzrlib/smart/message.py	2008-09-08 05:49:27 +0000
@@ -120,7 +120,7 @@
         self.request_handler.accept_body(bytes)
         self.request_handler.end_of_body()
         if not self.request_handler.finished_reading:
-            raise SmartProtocolError(
+            raise errors.SmartProtocolError(
                 "Conventional request body was received, but request handler "
                 "has not finished reading.")
         self.responder.send_response(self.request_handler.response)

=== modified file 'bzrlib/smart/repository.py'
--- a/bzrlib/smart/repository.py	2008-08-26 08:25:27 +0000
+++ b/bzrlib/smart/repository.py	2008-09-08 05:49:27 +0000
@@ -17,7 +17,6 @@
 """Server-side repository related request implmentations."""
 
 import bz2
-from cStringIO import StringIO
 import os
 import sys
 import tempfile
@@ -28,7 +27,6 @@
     osutils,
     )
 from bzrlib.bzrdir import BzrDir
-from bzrlib.pack import ContainerSerialiser
 from bzrlib.smart.request import (
     FailedSmartServerResponse,
     SmartServerRequest,
@@ -351,7 +349,6 @@
     """
 
     def do_repository_request(self, repository, compression):
-        from bzrlib import osutils
         tmp_dirname, tmp_repo = self._copy_to_tempdir(repository)
         try:
             controldir_name = tmp_dirname + '/.bzr'