summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/base.py2
-rw-r--r--fs/errors.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/base.py b/fs/base.py
index fed68fb..04440eb 100644
--- a/fs/base.py
+++ b/fs/base.py
@@ -754,7 +754,7 @@ class FS(object):
"""
info = self.getinfo(path)
- return {k: info[k] for k in keys if k in info}
+ return dict((k, info[k]) for k in keys if k in info)
def desc(self, path):
"""Returns short descriptive text regarding a path. Intended mainly as
diff --git a/fs/errors.py b/fs/errors.py
index a683d2d..7f41623 100644
--- a/fs/errors.py
+++ b/fs/errors.py
@@ -67,7 +67,7 @@ class FSError(Exception):
keys = {}
for k,v in self.__dict__.iteritems():
if isinstance(v, six.binary_type):
- v = v.decode(sys.getfilesystemencoding(), errors='replace')
+ v = v.decode(sys.getfilesystemencoding(), 'replace')
keys[k] = v
return unicode(self.msg, encoding=sys.getfilesystemencoding(), errors='replace') % keys