summaryrefslogtreecommitdiff
path: root/xattr/__init__.py
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2019-12-02 11:13:18 -0800
committerGitHub <noreply@github.com>2019-12-02 11:13:18 -0800
commit1d7acae7500bcea8c6dc9620c6e8a762c9e5334e (patch)
treefd57f9eb79662e88057a3bb6e9839e4115171348 /xattr/__init__.py
parent46e2ad7ae823e3b05ddbfb9ac809800fbe26cfa3 (diff)
parentedd28d55fc34666bfcd377e9d93a9f35ee5b428d (diff)
downloadxattr-1d7acae7500bcea8c6dc9620c6e8a762c9e5334e.tar.gz
Merge pull request #87 from xattr/iteritems-fix-gh-86
Use items rather than iteritems for xattr.update
Diffstat (limited to 'xattr/__init__.py')
-rw-r--r--xattr/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/xattr/__init__.py b/xattr/__init__.py
index 13389bf..50780b4 100644
--- a/xattr/__init__.py
+++ b/xattr/__init__.py
@@ -7,7 +7,7 @@ The xattr type wraps a path or file descriptor with a dict-like interface
that exposes these extended attributes.
"""
-__version__ = '0.9.6'
+__version__ = '0.9.7'
from .compat import integer_types
from .lib import (XATTR_NOFOLLOW, XATTR_CREATE, XATTR_REPLACE,
@@ -137,9 +137,9 @@ class xattr(object):
del self[k]
def update(self, seq):
- if not hasattr(seq, 'iteritems'):
+ if not hasattr(seq, 'items'):
seq = dict(seq)
- for k, v in seq.iteritems():
+ for k, v in seq.items():
self[k] = v
def copy(self):