summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/zipfs.py3
-rw-r--r--setup.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/zipfs.py b/fs/zipfs.py
index e499859..667407a 100644
--- a/fs/zipfs.py
+++ b/fs/zipfs.py
@@ -205,7 +205,8 @@ class ZipFS(FS):
msg="1 Zip file must be opened for reading ('r') or appending ('a')")
try:
if hasattr(self.zf, 'open') and self._zip_file_string:
- return self.zf.open(self._encode_path(path), "r")
+ #return self.zf.open(self._encode_path(path), "r")
+ return self.zf.open(self._encode_path(path), 'rU' if 'U' in mode else 'r')
else:
contents = self.zf.read(self._encode_path(path))
except KeyError:
diff --git a/setup.py b/setup.py
index 2778adc..2254aa2 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ setup(install_requires=['distribute', 'six'],
author_email="will@willmcgugan.com",
#url="http://code.google.com/p/pyfilesystem/",
#download_url="http://code.google.com/p/pyfilesystem/downloads/list",
- url="http://pypi.python.org/pypi/fs/"
+ url="http://pypi.python.org/pypi/fs/",
platforms=['any'],
packages=['fs',
'fs.expose',