← Back to branch summary

~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:
bzrlib/transport/memory.py
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
 
68
67
            raise NoSuchFile(relpath)
69
68
        return StringIO(self._files[relpath])
70
69
 
71
 
    def put(self, relpath, f):
 
70
    def put(self, relpath, f, mode=None):
72
71
        """See Transport.put()."""
73
72
        self._check_parent(relpath)
74
73
        self._files[relpath] = f.read()
75
74
 
76
 
    def mkdir(self, relpath):
 
75
    def mkdir(self, relpath, mode=None):
77
76
        """See Transport.mkdir()."""
78
77
        self._check_parent(relpath)
79
78
        if relpath in self._dirs: