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

Fix error if string is already unicode

Browse Source 
svn: r20647
This commit is contained in:
Benny Malengier 2012-11-10 16:53:49 +00:00
parent b4ca613e21
commit 59e3fe1f46
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gramps/gen/const.py.in
View File

@ -1,4 +1,4 @@
# -*- python -*- # -*- coding: utf-8 -*-
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
@ -26,6 +26,8 @@
Provides constants for other modules Provides constants for other modules
""" """
from __future__ import unicode_literals
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Standard python modules # Standard python modules
@ -40,7 +42,7 @@ import uuid
# Gramps modules # Gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from ggettext import sgettext as _ from .ggettext import sgettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -119,12 +121,12 @@ WINDOWS = ["Windows", "win32"]
# Windows apparently uses USERPROFILE # Windows apparently uses USERPROFILE
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
if os.environ.has_key('GRAMPSHOME'): if 'GRAMPSHOME' in os.environ:
USER_HOME = os.environ['GRAMPSHOME'] USER_HOME = os.environ['GRAMPSHOME']
HOME_DIR = os.path.join(USER_HOME, 'gramps') HOME_DIR = os.path.join(USER_HOME, 'gramps')
elif os.environ.has_key('USERPROFILE'): elif 'USERPROFILE' in os.environ:
USER_HOME = os.environ['USERPROFILE'] USER_HOME = os.environ['USERPROFILE']
if os.environ.has_key('APPDATA'): if 'APPDATA' in os.environ:
HOME_DIR = os.path.join(os.environ['APPDATA'], 'gramps') HOME_DIR = os.path.join(os.environ['APPDATA'], 'gramps')
else: else:
HOME_DIR = os.path.join(USER_HOME, 'gramps') HOME_DIR = os.path.join(USER_HOME, 'gramps')
@ -134,8 +136,14 @@ else:
# Conversion of USER_HOME to unicode was needed to have better # Conversion of USER_HOME to unicode was needed to have better
# support for non ASCII path names in Windows for the Gramps database. # support for non ASCII path names in Windows for the Gramps database.
USER_HOME = unicode(USER_HOME, sys.getfilesystemencoding())
HOME_DIR = unicode(HOME_DIR, sys.getfilesystemencoding()) if sys.version_info[0] < 3:
if not isinstance(USER_HOME, unicode):
USER_HOME = unicode(USER_HOME, sys.getfilesystemencoding())
if not isinstance(HOME_DIR, unicode):
HOME_DIR = unicode(HOME_DIR, sys.getfilesystemencoding())
else:
pass
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -143,11 +151,14 @@ HOME_DIR = unicode(HOME_DIR, sys.getfilesystemencoding())
# this one, and that the plugins directory is in a directory below this. # this one, and that the plugins directory is in a directory below this.
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# test for sys.frozen to detect a py2exe executable on Windows ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(
if hasattr(sys, "frozen"): __file__), os.pardir))
if sys.version_info[0] < 3:
# test for sys.frozen to detect a py2exe executable on Windows
if hasattr(sys, "frozen"):
ROOT_DIR = os.path.abspath(os.path.dirname( ROOT_DIR = os.path.abspath(os.path.dirname(
unicode(sys.executable, sys.getfilesystemencoding()))) unicode(sys.executable, sys.getfilesystemencoding())))
else: else:
ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname( ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(
unicode(__file__, sys.getfilesystemencoding())), os.pardir)) unicode(__file__, sys.getfilesystemencoding())), os.pardir))
@ -208,8 +219,8 @@ else:
# About box information # About box information
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
COPYRIGHT_MSG = u"\u00A9 2001-2006 Donald N. Allingham\n" \ COPYRIGHT_MSG = "© 2001-2006 Donald N. Allingham\n" \
u"\u00A9 2007-2012 The Gramps Developers" "© 2007-2012 The Gramps Developers"
COMMENTS = _("Gramps (Genealogical Research and Analysis " COMMENTS = _("Gramps (Genealogical Research and Analysis "
"Management Programming System) is a personal " "Management Programming System) is a personal "
"genealogy program.") "genealogy program.")