~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/memory.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
from cStringIO import StringIO
21
21
 
22
22
from bzrlib.trace import mutter
23
 
from bzrlib.transport import Transport, \
24
 
    TransportError, NoSuchFile, FileExists
25
 
 
 
23
from bzrlib.errors import TransportError, NoSuchFile, FileExists
 
24
from bzrlib.transport import Transport
26
25
 
27
26
class MemoryStat(object):
28
27