diff options
| author | willmcgugan@gmail.com <willmcgugan@gmail.com@67cdc799-7952-0410-af00-57a81ceafa0f> | 2014-02-19 16:27:30 +0000 |
|---|---|---|
| committer | willmcgugan@gmail.com <willmcgugan@gmail.com@67cdc799-7952-0410-af00-57a81ceafa0f> | 2014-02-19 16:27:30 +0000 |
| commit | 2a4d1fd5225e2c7488025743ba695778eb32c94f (patch) | |
| tree | ed6e01a604a9ca7b371f49aa5b0c6c43ce968c31 | |
| parent | 9b4fcbd538179a02874007a6d85b36549e86d3c9 (diff) | |
| download | pyfilesystem-2a4d1fd5225e2c7488025743ba695778eb32c94f.tar.gz | |
fixes
git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@883 67cdc799-7952-0410-af00-57a81ceafa0f
| -rw-r--r-- | fs/iotools.py | 2 | ||||
| -rw-r--r-- | fs/mountfs.py | 2 | ||||
| -rw-r--r-- | fs/multifs.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/iotools.py b/fs/iotools.py index 296efd3..fcf4818 100644 --- a/fs/iotools.py +++ b/fs/iotools.py @@ -79,7 +79,7 @@ class RawWrapper(object): def read1(self, n=-1): if self.is_io: - return self.read1(n) + return self._f.read1(n) return self.read(n) def readall(self): diff --git a/fs/mountfs.py b/fs/mountfs.py index c7eabaf..1377d66 100644 --- a/fs/mountfs.py +++ b/fs/mountfs.py @@ -161,7 +161,7 @@ class MountFS(FS): return "Mount dir" else: return "Mounted file" - return "Mounted dir, maps to path %s on %s" % (delegate_path or '/', str(fs)) + return "Mounted dir, maps to path %s on %s" % (abspath(delegate_path) or '/', str(fs)) @synchronize def isdir(self, path): diff --git a/fs/multifs.py b/fs/multifs.py index cdfce67..bb171fe 100644 --- a/fs/multifs.py +++ b/fs/multifs.py @@ -235,7 +235,7 @@ class MultiFS(FS): name, fs = self.which(path) if name is None: return "" - return "%s, on %s (%s)" % (fs.desc(path), name, fs) + return "%s (in %s)" % (fs.desc(path), name) @synchronize def open(self, path, mode='r', buffering=-1, encoding=None, errors=None, newline=None, line_buffering=False, **kwargs): |