← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Andrew Bennetts
  • Date: 2008-09-08 05:49:27 UTC
  • mto: This revision was merged to the branch mainline in revision 3696.
  • Revision ID: andrew.bennetts@canonical.com-20080908054927-q84h4v1c8dy91h92
Remove some unused imports and fix a couple of trivially broken raise statements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
18
18
# across to run on the server.
19
19
 
20
20
import bz2
21
 
from cStringIO import StringIO
22
21
 
23
22
from bzrlib import (
24
23
    branch,
32
31
)
33
32
from bzrlib.branch import BranchReferenceFormat
34
33
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
35
 
from bzrlib.config import BranchConfig, TreeConfig
36
34
from bzrlib.decorators import needs_read_lock, needs_write_lock
37
35
from bzrlib.errors import (
38
36
    NoSuchRevision,
39
37
    SmartProtocolError,
40
38
    )
41
39
from bzrlib.lockable_files import LockableFiles
42
 
from bzrlib.pack import ContainerPushParser
43
40
from bzrlib.smart import client, vfs
44
 
from bzrlib.symbol_versioning import (
45
 
    deprecated_in,
46
 
    deprecated_method,
47
 
    )
48
41
from bzrlib.revision import ensure_null, NULL_REVISION
49
42
from bzrlib.trace import mutter, note, warning
50
43
 
554
547
            if _skip_rpc:
555
548
                if self._lock_token is not None:
556
549
                    if token != self._lock_token:
557
 
                        raise TokenMismatch(token, self._lock_token)
 
550
                        raise errors.TokenMismatch(token, self._lock_token)
558
551
                self._lock_token = token
559
552
            else:
560
553
                self._lock_token = self._remote_lock_write(token)