Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7470: Upgrade to db version 17 fails in Python 3 due to use of iteritems

Browse Source
This commit is contained in:
Marc Hulsman 2014-02-13 18:16:58 -08:00 committed by Paul Franklin
parent 8752d173af
commit 7346496214
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/gen/db/upgrade.py
View File

@ -290,7 +290,7 @@ def upgrade_datamap_17(datamap):
new_srcattr_list = [] new_srcattr_list = []
private = False private = False
from ..lib.srcattrtype import SrcAttributeType from ..lib.srcattrtype import SrcAttributeType
for (key, value) in datamap.iteritems(): for (key, value) in datamap.items():
the_type = SrcAttributeType(key).serialize() the_type = SrcAttributeType(key).serialize()
new_srcattr_list.append((private, the_type, value)) new_srcattr_list.append((private, the_type, value))
return new_srcattr_list return new_srcattr_list

2
gramps/gen/filters/rules/place/_hasplace.py
View File

@ -91,7 +91,7 @@ class HasPlace(Rule):
""" """
Check each location for a match. Check each location for a match.
""" """
for place_type, field in self.TYPE2FIELD.iteritems(): for place_type, field in self.TYPE2FIELD.items():
name = location.get(place_type, '') name = location.get(place_type, '')
if not self.match_substring(field, name): if not self.match_substring(field, name):
return False return False

10
gramps/gui/views/treemodels/flatbasemodel.py
View File

@ -398,11 +398,6 @@ class FlatNodeMap(object):
insert_pos = bisect.bisect_left(self._index2hndl, srtkey_hndl) insert_pos = bisect.bisect_left(self._index2hndl, srtkey_hndl)
self._index2hndl.insert(insert_pos, srtkey_hndl) self._index2hndl.insert(insert_pos, srtkey_hndl)
#make sure the index map is updated #make sure the index map is updated
if sys.version_info[0] < 3:
for hndl, index in self._hndl2index.iteritems():
if index >= insert_pos:
self._hndl2index[hndl] += 1
else:
for hndl, index in self._hndl2index.items(): for hndl, index in self._hndl2index.items():
if index >= insert_pos: if index >= insert_pos:
self._hndl2index[hndl] += 1 self._hndl2index[hndl] += 1
@ -447,11 +442,6 @@ class FlatNodeMap(object):
if self._reverse: if self._reverse:
self.__corr = (len(self._index2hndl) - 1, -1) self.__corr = (len(self._index2hndl) - 1, -1)
#update the handle2path map so it remains correct #update the handle2path map so it remains correct
if sys.version_info[0] < 3:
for key, val in self._hndl2index.iteritems():
if val > index:
self._hndl2index[key] -= 1
else:
for key, val in self._hndl2index.items(): for key, val in self._hndl2index.items():
if val > index: if val > index:
self._hndl2index[key] -= 1 self._hndl2index[key] -= 1

2
gramps/plugins/importer/importxml.py
View File

@ -2491,7 +2491,7 @@ class GrampsParser(UpdateCallback):
element_name = xml_element_name, element_name = xml_element_name,
attrs = " ".join( attrs = " ".join(
['{}="{}"'.format(k,escape(v, entities={'"' : "&quot;"})) ['{}="{}"'.format(k,escape(v, entities={'"' : "&quot;"}))
for k,v in xml_attrs.iteritems()])) for k,v in xml_attrs.items()]))
# TRANSLATORS: leave the {date} and {xml} untranslated in the format string, # TRANSLATORS: leave the {date} and {xml} untranslated in the format string,
# but you may re-order them if needed. # but you may re-order them if needed.
LOG.warning(_("Invalid date {date} in XML {xml}, preserving XML as text" LOG.warning(_("Invalid date {date} in XML {xml}, preserving XML as text"