python3: Use items instead of iteritems

This commit is contained in:
Tomas Babej 2016-12-16 03:42:03 +01:00
parent 29c6c1d29c
commit 9e3382946d
4 changed files with 7 additions and 7 deletions

View file

@ -70,7 +70,7 @@ class TaskCache(object):
@property
def vimwikitask_dependency_order(self):
iterated_cache = {
k:v for k,v in self.vwtask.iteritems()
k:v for k,v in self.vwtask.items()
if v is not None
}

View file

@ -36,7 +36,7 @@ class ShortUUID(object):
"""
# Determine the key of the TW instance
[key] = [key for key, value in cache.warriors.iteritems()
[key] = [key for key, value in cache.warriors.items()
if value == self.tw]
prefix = '{0}:'.format(key) if key is not 'default' else ''

View file

@ -41,8 +41,8 @@ class WarriorStore(object):
def values(self):
return self.warriors.values()
def iteritems(self):
return self.warriors.iteritems()
def items(self):
return self.warriors.items()
class NoNoneStore(object):
@ -82,8 +82,8 @@ class NoNoneStore(object):
def values(self):
return self.store.values()
def iteritems(self):
return self.store.iteritems()
def items(self):
return self.store.items()
def clear(self):
return self.store.clear()

View file

@ -231,7 +231,7 @@ class ViewPort(object):
def raw_defaults(self):
return ', '.join(
'{0}:{1}'.format(key, value)
for key, value in self.defaults.iteritems()
for key, value in self.defaults.items()
)
@property