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

2620: GEPS 031: Python 3 support - 3.2

Browse Source 
This does patch updates Gramps to the 3.2 syntax, it does not yet mean Gramps works with python 3.2
Expect next day commits to fix further issues, but this is the main 2to3 tool created patch changed
where needed to have python 2.7 work. 
Specific issues might be:
  1. next has been changed, must be checked
  2. new division as on the wiki page listed is to do
  3. ...


svn: r20634
This commit is contained in:
Benny Malengier
2012-11-07 17:53:14 +00:00
parent 3b2a0dbe48
commit bb5fc7cb7c
526 changed files with 7561 additions and 6929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gramps/plugins/export/exportgedcom.py
View File

@@ -50,6 +50,7 @@ from gramps.gui.plug.export import WriterOptionBox
from gramps.gen.updatecallback import UpdateCallback
from gramps.gen.utils.file import media_path_full
from gramps.gen.utils.place import conv_lat_lon
from gramps.gen.constfunc import cuni
#-------------------------------------------------------------------------
#
@@ -276,7 +277,7 @@ class GedcomWriter(UpdateCallback):
token_level = level
for text in textlist:
# make it unicode so that breakup below does the right thin.
text = unicode(text)
text = cuni(text)
if limit:
prefix = "\n%d CONC " % (level + 1)
txt = prefix.join(breakup(text, limit))
@@ -373,9 +374,9 @@ class GedcomWriter(UpdateCallback):
mail = owner.get_email()
if not name :
name = u'Not Provided'
name = cuni('Not Provided')
if not addr :
addr = u'Not Provided'
addr = cuni('Not Provided')
self._writeln(0, "@SUBM@", "SUBM")
self._writeln(1, "NAME", name)
@@ -383,7 +384,7 @@ class GedcomWriter(UpdateCallback):
if city and state and post:
self._writeln(2, "CONT", "%s, %s %s" % (city, state, post))
else:
self._writeln(2, "CONT", u"Not Provided")
self._writeln(2, "CONT", cuni("Not Provided"))
if addr:
self._writeln(2, "ADR1", addr)
if adr2:
@@ -1359,9 +1360,9 @@ class GedcomWriter(UpdateCallback):
self._note_references(note_list, level+1)
self._photos(citation.get_media_list(), level+1)
if "EVEN" in citation.get_data_map().keys():
if "EVEN" in list(citation.get_data_map().keys()):
self._writeln(level+1, "EVEN", citation.get_data_map()["EVEN"])
if "EVEN:ROLE" in citation.get_data_map().keys():
if "EVEN:ROLE" in list(citation.get_data_map().keys()):
self._writeln(level+2, "ROLE",
citation.get_data_map()["EVEN:ROLE"])
@@ -1452,9 +1453,9 @@ def export_data(database, filename, user, option_box=None):
try:
ged_write = GedcomWriter(database, user, option_box)
ret = ged_write.write_gedcom_file(filename)
except IOError, msg:
except IOError as msg:
msg2 = _("Could not create %s") % filename
user.notify_error(msg2, str(msg))
except DatabaseError, msg:
except DatabaseError as msg:
user.notify_db_error(_("Export failed"), str(msg))
return ret