summaryrefslogtreecommitdiff
path: root/fs/zipfs.py
diff options
context:
space:
mode:
authorwillmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f>2011-12-26 20:52:33 +0000
committerwillmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f>2011-12-26 20:52:33 +0000
commitb0885a312f4f57c67758850be245db5a34e5c71f (patch)
treeb332b5ce21a5842eea21fa68a627c859d12234d2 /fs/zipfs.py
parentfafea9afc1fc576062c5c8070ec46ace8183be49 (diff)
downloadpyfilesystem-b0885a312f4f57c67758850be245db5a34e5c71f.tar.gz
First stab at a Python3 port
git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@724 67cdc799-7952-0410-af00-57a81ceafa0f
Diffstat (limited to 'fs/zipfs.py')
-rw-r--r--fs/zipfs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/zipfs.py b/fs/zipfs.py
index 08bb2ae..d22b79f 100644
--- a/fs/zipfs.py
+++ b/fs/zipfs.py
@@ -142,7 +142,7 @@ class ZipFS(FS):
return "<ZipFS: %s>" % self.zip_path
def __unicode__(self):
- return unicode(self.__str__())
+ return u"<ZipFS: %s>" % self.zip_path
def _parse_resource_list(self):
for path in self.zf.namelist():
@@ -209,7 +209,7 @@ class ZipFS(FS):
raise ValueError("Mode must contain be 'r' or 'w'")
@synchronize
- def getcontents(self, path):
+ def getcontents(self, path, mode="rb"):
if not self.exists(path):
raise ResourceNotFoundError(path)
path = normpath(relpath(path))