summaryrefslogtreecommitdiff
path: root/fs/mountfs.py
diff options
context:
space:
mode:
authorwillmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f>2012-01-05 18:12:48 +0000
committerwillmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f>2012-01-05 18:12:48 +0000
commit43d1ff1c8ce3b6a9f4427423450544a9a7bff2c8 (patch)
tree8136cc89d4b0e5f443105f79c45a6445a43969bb /fs/mountfs.py
parent9e59c89f9541a0a6c48352ea83e28b1e77628e37 (diff)
downloadpyfilesystem-43d1ff1c8ce3b6a9f4427423450544a9a7bff2c8.tar.gz
fixes
git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@729 67cdc799-7952-0410-af00-57a81ceafa0f
Diffstat (limited to 'fs/mountfs.py')
-rw-r--r--fs/mountfs.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/mountfs.py b/fs/mountfs.py
index dc5fe5e..684ce7a 100644
--- a/fs/mountfs.py
+++ b/fs/mountfs.py
@@ -54,10 +54,13 @@ class DirMount(object):
self.fs = fs
def __str__(self):
- return "Mount point: <%s,%s>" % (self.path,self.fs,)
- __repr__ = __str__
+ return "<DirMount %s, %s>" % (self.path, self.fs)
+
+ def __repr__(self):
+ return "<DirMount %s, %s>" % (self.path, self.fs)
+
def __unicode__(self):
- return unicode(str(self))
+ return u"<DirMount %s, %s>" % (self.path, self.fs)
class FileMount(object):
@@ -272,7 +275,6 @@ class MountFS(FS):
else:
yield mkpath(p)
-
@synchronize
def makedir(self, path, recursive=False, allow_recreate=False):
fs, _mount_path, delegate_path = self._delegate(path)
@@ -397,6 +399,7 @@ class MountFS(FS):
:param fs: A filesystem object to mount
"""
+ path = abspath(normpath(path))
self.mount_tree[path] = MountFS.DirMount(path, fs)
mount = mountdir