py2.6 fixes

git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@885 67cdc799-7952-0410-af00-57a81ceafa0f

3 files changed, 3 insertions, 3 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
 
diff --git a/tox.ini b/tox.ini
index 1511ea5..06f76eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py31,py32,pypy
+envlist = py26,py27,py31,py32,py33,pypy
 sitepackages = False
 
 [testenv]