summaryrefslogtreecommitdiff
path: root/xattr
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-07-20 00:29:13 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2013-07-20 00:29:13 -0700
commit14795a47b1dc4bb994faf520888c51c5886b8187 (patch)
tree657ca77481f007db51247a92ba28a411bc8f7faa /xattr
parent14d57409998e934af0dd1dad41049b494d95a676 (diff)
downloadxattr-14795a47b1dc4bb994faf520888c51c5886b8187.tar.gz
Added python3 support.
Diffstat (limited to 'xattr')
-rw-r--r--xattr/__init__.py2
-rw-r--r--xattr/lib.py2
-rw-r--r--xattr/tests/test_xattr.py12
3 files changed, 8 insertions, 8 deletions
diff --git a/xattr/__init__.py b/xattr/__init__.py
index a452f66..64f92ae 100644
--- a/xattr/__init__.py
+++ b/xattr/__init__.py
@@ -93,7 +93,7 @@ class xattr(object):
See x-man-page://2/listxattr for options and possible errors.
"""
- res = self._call(_listxattr, _flistxattr, options | self.options).split('\x00')
+ res = self._call(_listxattr, _flistxattr, options | self.options).split(b'\x00')
res.pop()
return [unicode(s, 'utf-8') for s in res]
diff --git a/xattr/lib.py b/xattr/lib.py
index 824f0b6..0466d30 100644
--- a/xattr/lib.py
+++ b/xattr/lib.py
@@ -602,7 +602,7 @@ XATTR_RESOURCEFORK_NAME = "com.apple.ResourceFork"
def fs_encode(val):
- if isinstance(val, bytes):
+ if not isinstance(val, bytes):
return val.encode(sys.getfilesystemencoding())
else:
return val
diff --git a/xattr/tests/test_xattr.py b/xattr/tests/test_xattr.py
index d75d7ee..689ae4f 100644
--- a/xattr/tests/test_xattr.py
+++ b/xattr/tests/test_xattr.py
@@ -11,15 +11,15 @@ class BaseTestXattr(object):
self.assertEqual(x.keys(), [])
self.assertEqual(dict(x), {})
- x['user.sopal'] = 'foo'
- x['user.sop.foo'] = 'bar'
+ x['user.sopal'] = b'foo'
+ x['user.sop.foo'] = b'bar'
del x
x = xattr.xattr(self.tempfile)
self.assertTrue('user.sopal' in x)
- self.assertEqual(x['user.sopal'], 'foo')
+ self.assertEqual(x['user.sopal'], b'foo')
self.assertTrue('user.sop.foo' in x)
- self.assertEqual(x['user.sop.foo'], 'bar')
+ self.assertEqual(x['user.sop.foo'], b'bar')
del x['user.sop.foo']
del x
@@ -33,9 +33,9 @@ class BaseTestXattr(object):
try:
symlink = xattr.xattr(symlinkPath, options=xattr.XATTR_NOFOLLOW)
realfile = xattr.xattr(self.tempfilename)
- symlink['user.islink'] = 'true'
+ symlink['user.islink'] = b'true'
self.assertEqual(dict(realfile), {})
- self.assertEqual(symlink['user.islink'], 'true')
+ self.assertEqual(symlink['user.islink'], b'true')
finally:
os.remove(symlinkPath)