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:19:48 -08:00 committed by Paul Franklin
parent 4fb98d5fbb
commit 08155ba962
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,14 +398,9 @@ 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.items():
for hndl, index in self._hndl2index.iteritems(): if index >= insert_pos:
if index >= insert_pos: self._hndl2index[hndl] += 1
self._hndl2index[hndl] += 1
else:
for hndl, index in self._hndl2index.items():
if index >= insert_pos:
self._hndl2index[hndl] += 1
self._hndl2index[srtkey_hndl[1]] = insert_pos self._hndl2index[srtkey_hndl[1]] = insert_pos
#update self.__corr so it remains correct #update self.__corr so it remains correct
if self._reverse: if self._reverse:
@ -447,14 +442,9 @@ 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.items():
for key, val in self._hndl2index.iteritems(): if val > index:
if val > index: self._hndl2index[key] -= 1
self._hndl2index[key] -= 1
else:
for key, val in self._hndl2index.items():
if val > index:
self._hndl2index[key] -= 1
return Gtk.TreePath((delpath,)) return Gtk.TreePath((delpath,))
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

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

@ -2400,7 +2400,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"