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 
* fix introduced errors: write of reference in db, check in dbloader on string type
 * working import of xml file in python 3


svn: r20659
This commit is contained in:
Benny Malengier 2012-11-15 10:28:19 +00:00
parent 8b39b80dc8
commit 1cad822978
14 changed files with 101 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps/gen/constfunc.py
View File

@ -49,16 +49,13 @@ from .const import WINDOWS, MACOS, LINUX
#-------------------------------------------------------------------------
#python 2 and 3 support, use correct conversion to unicode
if sys.version_info[0] < 3:
conv_to_unicode = unicode
conv_to_unicode_3 = unicode
conv_to_unicode_direct = unicode
STRTYPE = basestring
UNITYPE = unicode
else:
conv_to_unicode = lambda x,y: str(x)
conv_to_unicode_3 = lambda x,y,z: str(x)
conv_to_unicode_direct = str
STRTYPE = str
UNITYPE = str

25
gramps/gen/db/read.py
View File

@ -1190,23 +1190,24 @@ class DbBsddbRead(DbReadBase, Callback):
pattern_match = re.match(r"(.*)%[0 ](\d+)[diu]$", id_pattern)
if pattern_match:
str_prefix = pattern_match.group(1)
nr_width = pattern_match.group(2)
##nr_width = pattern_match.group(2)
def closure_func(gramps_id):
if gramps_id and gramps_id.startswith(str_prefix):
id_number = gramps_id[len(str_prefix):]
if id_number.isdigit():
id_value = int(id_number, 10)
if len(cuni(id_value)) > nr_width:
# The ID to be imported is too large to fit in the
# users format. For now just create a new ID,
# because that is also what happens with IDs that
# are identical to IDs already in the database. If
# the problem of colliding import and already
# present IDs is solved the code here also needs
# some solution.
gramps_id = id_pattern % 1
else:
gramps_id = id_pattern % id_value
## this code never ran, as an int compared to str with > is False!
## if len(cuni(id_value)) > nr_width:
## # The ID to be imported is too large to fit in the
## # users format. For now just create a new ID,
## # because that is also what happens with IDs that
## # are identical to IDs already in the database. If
## # the problem of colliding import and already
## # present IDs is solved the code here also needs
## # some solution.
## gramps_id = id_pattern % 1
## else:
gramps_id = id_pattern % id_value
return gramps_id
else:
def closure_func(gramps_id):

26
gramps/gen/db/write.py
View File

@ -410,6 +410,9 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
except:
# Just assume that the Berkeley DB version is OK.
pass
if not env_version:
#empty file, assume it is ok to open
env_version = (0, 0, 0)
if (env_version[0] > bdb_version[0]) or \
(env_version[0] == bdb_version[0] and
env_version[1] > bdb_version[1]):
@ -534,12 +537,12 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
with BSDDBTxn(self.env, self.metadata) as txn:
if gstats is None:
# New database. Set up the current version.
#self.metadata.put('version', _DBVERSION, txn=the_txn)
txn.put('version', _DBVERSION)
#self.metadata.put(b'version', _DBVERSION, txn=the_txn)
txn.put(b'version', _DBVERSION)
elif b'version' not in self.metadata:
# Not new database, but the version is missing.
# Use 0, but it is likely to fail anyway.
txn.put('version', 0)
txn.put(b'version', 0)
self.genderStats = GenderStats(gstats)
@ -946,6 +949,9 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
Remove the reference specified by the key, preserving the change in
the passed transaction.
"""
if isinstance(key, tuple):
#create a string key
key = str(key)
if isinstance(key, UNITYPE):
key = key.encode('utf-8')
if not self.readonly:
@ -960,6 +966,9 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
Add the reference specified by the key and the data, preserving the
change in the passed transaction.
"""
if isinstance(key, tuple):
#create a string key
key = str(key)
if isinstance(key, UNITYPE):
key = key.encode('utf-8')
if self.readonly or not key:
@ -1193,10 +1202,11 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
if self.update_env_version:
versionpath = os.path.join(self.path, BDBVERSFN)
try:
with open(versionpath, "wb") as version_file:
version = db.version()
if isinstance(version, UNITYPE):
version = version.encode('utf-8')
with open(versionpath, "w") as version_file:
version = str(db.version())
if sys.version_info[0] < 3:
if isinstance(version, UNITYPE):
version = version.encode('utf-8')
version_file.write(version)
except:
# Storing the version of Berkeley Db is not really vital.
@ -2050,7 +2060,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
self.metadata = self.__open_shelf(full_name, META)
with BSDDBTxn(self.env, self.metadata) as txn:
txn.put('version', _DBVERSION)
txn.put(b'version', _DBVERSION)
self.metadata.close()
self.env.close()

6
gramps/gen/plug/_manager.py
View File

@ -312,7 +312,11 @@ class BasePluginManager(object):
Reloads modules that might not be in the path.
"""
try:
reload(module)
if sys.version_info[0] < 3:
reload(module)
else:
import imp
imp.reload(module)
except:
if pdata.mod_name in sys.modules:
del sys.modules[pdata.mod_name]

39
gramps/gen/utils/file.py
View File

@ -43,7 +43,7 @@ LOG = logging.getLogger(".gen.utils.file")
# Gramps modules
#
#-------------------------------------------------------------------------
from ..constfunc import win, mac, cuni, conv_to_unicode, conv_to_unicode_3
from ..constfunc import win, mac, cuni, conv_to_unicode, UNITYPE
from ..const import TEMP_DIR, USER_HOME
#-------------------------------------------------------------------------
@ -129,23 +129,35 @@ def get_unicode_path_from_file_chooser(path):
:returns: The Unicode version of path.
"""
# make only unicode of path of type 'str'
if isinstance(path, UNITYPE):
return path
if not (isinstance(path, str)):
return path
## ONLY PYTHON 2 code shoulr reach this !
if win():
# in windows filechooser returns officially utf-8, not filesystemencoding
try:
return cuni(path)
except:
LOG.warn("Problem encountered converting string: %s." % path)
return conv_to_unicode_3(path, sys.getfilesystemencoding(),
if sys.version_info[0] < 3:
return unicode(path, sys.getfilesystemencoding(),
errors='replace')
else:
#no idea, need to know what path is to know what to do
raise NotImplementedError("Path of type", type(path))
else:
try:
return cuni(path, sys.getfilesystemencoding())
except:
LOG.warn("Problem encountered converting string: %s." % path)
return conv_to_unicode_3(path, sys.getfilesystemencoding(), errors='replace')
if sys.version_info[0] < 3:
return unicode(path, sys.getfilesystemencoding(), errors='replace')
else:
#no idea, need to know what path is to know what to do
raise NotImplementedError("Path of type", type(path))
def get_unicode_path_from_env_var(path):
"""
@ -167,15 +179,21 @@ def get_unicode_path_from_env_var(path):
return new_path
except:
LOG.warn("Problem encountered converting string: %s." % path)
return conv_to_unicode_3(path, sys.getfilesystemencoding(),
errors='replace')
if sys.version_info[0] < 3:
return unicode(path, sys.getfilesystemencoding(), errors='replace')
else:
#no idea, need to know what path is to know what to do
raise NotImplementedError("Path of type", type(path))
else:
try:
return str(path)
except:
LOG.warn("Problem encountered converting string: %s." % path)
return conv_to_unicode_3(path, sys.getfilesystemencoding(),
errors='replace')
if sys.version_info[0] < 3:
return unicode(path, sys.getfilesystemencoding(), errors='replace')
else:
#no idea, need to know what path is to know what to do
raise NotImplementedError("Path of type", type(path))
def get_new_filename(ext, folder='~/'):
ix = 1
@ -300,6 +318,9 @@ def fix_encoding(value, errors='strict'):
codeset = locale.getpreferredencoding()
except:
codeset = "UTF-8"
return conv_to_unicode_3(value, codeset, errors)
if sys.version_info[0] < 3:
return unicode(value, codeset, errors)
else:
return value.decode(encoding=codeset, errors=errors)
else:
return value

5
gramps/grampsapp.py
View File

@ -33,12 +33,9 @@ from __future__ import print_function
import sys
## hack to avoid mentioning 'utf8' encoding everywhere unicode or str is is used
try:
if sys.version_info[0] < 3:
reload(sys)
sys.setdefaultencoding('utf8')
except:
#python3 has no reload
pass
##
import os
import signal

6
gramps/gui/dbloader.py
View File

@ -61,6 +61,7 @@ from gramps.gen.db.exceptions import (DbUpgradeRequiredError,
BsddbDowngradeError,
DbVersionError,
DbEnvironmentError)
from gramps.gen.constfunc import STRTYPE
from gramps.gen.utils.file import get_unicode_path_from_file_chooser
from .pluginmanager import GuiPluginManager
from .dialog import (DBErrorDialog, ErrorDialog, QuestionDialog2,
@ -132,7 +133,7 @@ class DbLoader(CLIDbLoader):
pmgr = GuiPluginManager.get_instance()
import_dialog = Gtk.FileChooserDialog(_('Gramps: Import database'),
import_dialog = Gtk.FileChooserDialog(_('Gramps: Import Family Tree'),
self.uistate.window,
Gtk.FileChooserAction.OPEN,
(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
@ -205,8 +206,7 @@ class DbLoader(CLIDbLoader):
In this process, a warning dialog can pop up.
"""
if not isinstance(filename, str):
if not isinstance(filename, STRTYPE):
return True
filename = os.path.normpath(os.path.abspath(filename))

8
gramps/gui/tipofday.py
View File

@ -29,10 +29,11 @@ Handles the Tip of the Day dialog
# standard python modules
#
#-------------------------------------------------------------------------
from xml.parsers.expat import ParserCreate,ExpatError
from xml.parsers.expat import ParserCreate, ExpatError
from random import Random
from gramps.gen.ggettext import gettext as _
import os
import sys
#-------------------------------------------------------------------------
#
@ -139,7 +140,10 @@ class TipParser(object):
self.mylist = []
self.skip = False
xml_file = open(TIP_DATA)
if sys.version_info[0] < 3:
xml_file = open(TIP_DATA)
else:
xml_file = open(TIP_DATA, 'rb')
self.tlist = []
parser = ParserCreate()
parser.StartElementHandler = self.startElement

9
gramps/plugins/import/importgedcom.py
View File

@ -28,6 +28,7 @@
# python modules
#
#------------------------------------------------------------------------
import sys
from gramps.gen.ggettext import gettext as _
#------------------------------------------------------------------------
@ -47,8 +48,12 @@ from gramps.gen.errors import DbError, GedcomError
from gramps.gui.glade import Glade
from gramps.plugins.lib.libmixin import DbMixin
from gramps.plugins.lib import libgedcom
module = __import__("gramps.plugins.lib.libgedcom")
reload (module)
module = __import__("gramps.plugins.lib.libgedcom") # why o why ??
if sys.version_info[0] < 3:
reload (module)
else:
import imp
imp.reload(module)
from gramps.gen.config import config
from gramps.gen.constfunc import STRTYPE

1
gramps/plugins/import/importgeneweb.py
View File

@ -32,6 +32,7 @@ from __future__ import print_function
import re
import time
import sys
from gramps.gen.ggettext import gettext as _
from gramps.gen.ggettext import ngettext

5
gramps/plugins/import/importgpkg.py
View File

@ -47,8 +47,9 @@ log = logging.getLogger(".ReadPkg")
#
#-------------------------------------------------------------------------
from gramps.gen.const import XMLFILE
from . import importxml
from gramps.gen.utils.file import media_path
## we need absolute import as this is dynamically loaded:
from gramps.plugins.importers.importxml import importData
#-------------------------------------------------------------------------
#
@ -91,7 +92,7 @@ def impData(database, name, user):
imp_db_name = os.path.join(tmpdir_path, XMLFILE)
importer = importxml.importData
importer = importData
info = importer(database, imp_db_name, user)
newmediapath = database.get_mediapath()
#import of gpkg should not change media path as all media has new paths!

11
gramps/plugins/import/importprogen.py
View File

@ -53,7 +53,7 @@ from gramps.gui.utils import ProgressMeter
from gramps.gen.lib import (Attribute, AttributeType, ChildRef, Date, Event,
EventRef, EventType, Family, FamilyRelType, Name,
NameType, Note, NoteType, Person, Place, Source,
SourceRef, Surname)
Surname)
from gramps.gen.db import DbTxn
class ProgenError(Exception):
@ -153,17 +153,17 @@ def _read_recs(table, bname):
def _get_defname(fname):
'''
"""
Get the name of the PG30 DEF file by looking at the user DEF file. And return
the name of the DEF file. fname is expected to be somewhere in the PG30 tree.
Contents of <fname> is something like:
=> \0
=> C:\PG30\NL\PG30-1.DEF
=> \\0
=> C:\\PG30\\NL\\PG30-1.DEF
We will strip the C: and convert the rest to a native pathname. Next, this pathname
is compared with <fname>.
'''
"""
lines = open(fname).readlines()
if not lines[0].startswith(r'\0') or len(lines) < 2:
raise ProgenError(_("Not a Pro-Gen file"))
@ -596,6 +596,7 @@ class ProgenParser(object):
self.db.add_source(source, self.trans)
self.db.commit_source(source, self.trans)
self.skeys[source_name] = source.get_handle()
raise Error('Sourceref no longer exists, this piece must be converted to citation!')
sref = SourceRef()
sref.set_reference_handle(source.get_handle())
return sref

5
gramps/plugins/import/importxml.py
View File

@ -437,7 +437,10 @@ class ImportOpenFileContextManager:
if use_gzip:
xml_file = gzip.open(filename, "rb")
else:
xml_file = open(filename, "r")
if sys.version_info[0] < 3:
xml_file = open(filename, "r")
else:
xml_file = open(filename, "rb")
except IOError as msg:
self.user.notify_error(_("%s could not be opened") % filename, str(msg))
xml_file = None

5
gramps/plugins/lib/libholiday.py
View File

@ -302,7 +302,10 @@ class _Xml2Obj:
parser.StartElementHandler = self.start_element
parser.EndElementHandler = self.end_element
# Parse the XML File
parser.Parse(open(filename, 'r').read(), 1)
if sys.version_info[0] < 3:
parser.Parse(open(filename, 'r').read(), 1)
else:
parser.Parse(open(filename, 'rb').read(), 1)
return self.root
#------------------------------------------------------------------------