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

Moved stderr and stdin handlers to only be installed for cli application; allows Gramps libraries to be used in other REPLs

Browse Source
This commit is contained in:
Doug Blank 2015-02-17 16:36:52 -05:00
parent ffa92451f9
commit d5b93c52be
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gramps/gen/utils/grampslocale.py
View File

@ -423,24 +423,6 @@ class GrampsLocale(object):
self.encoding = (locale.getpreferredencoding() self.encoding = (locale.getpreferredencoding()
or sys.getdefaultencoding()) or sys.getdefaultencoding())
LOG.debug("Setting encoding to %s", self.encoding) LOG.debug("Setting encoding to %s", self.encoding)
#Ensure that output is encoded correctly to stdout and stderr. This is
#much less cumbersome and error-prone than encoding individual outputs
#and better handles the differences between Python 2 and Python 3:
try:
_encoding = sys.stdout.encoding or sys.getdefaultencoding()
except:
_encoding = "UTF-8"
if sys.version_info[0] < 3:
sys.stdout = codecs.getwriter(_encoding)(sys.stdout,
'backslashreplace')
sys.stderr = codecs.getwriter(_encoding)(sys.stderr,
'backslashreplace')
else:
sys.stdout = codecs.getwriter(_encoding)(sys.stdout.detach(),
'backslashreplace')
sys.stderr = codecs.getwriter(_encoding)(sys.stderr.detach(),
'backslashreplace')
# Make sure that self.lang and self.language are reflected # Make sure that self.lang and self.language are reflected
# back into the environment for Gtk to use when its # back into the environment for Gtk to use when its

19
gramps/grampsapp.py
View File

@ -434,6 +434,25 @@ def run():
startgtkloop(error, argpars) startgtkloop(error, argpars)
else: else:
#CLI use of GRAMPS #CLI use of GRAMPS
#Ensure that output is encoded correctly to stdout and
#stderr. This is much less cumbersome and error-prone than
#encoding individual outputs and better handles the
#differences between Python 2 and Python 3:
try:
_encoding = sys.stdout.encoding or sys.getdefaultencoding()
except:
_encoding = "UTF-8"
if sys.version_info[0] < 3:
sys.stdout = codecs.getwriter(_encoding)(sys.stdout,
'backslashreplace')
sys.stderr = codecs.getwriter(_encoding)(sys.stderr,
'backslashreplace')
else:
sys.stdout = codecs.getwriter(_encoding)(sys.stdout.detach(),
'backslashreplace')
sys.stderr = codecs.getwriter(_encoding)(sys.stderr.detach(),
'backslashreplace')
argpars.print_help() argpars.print_help()
argpars.print_usage() argpars.print_usage()
from .cli.grampscli import startcli from .cli.grampscli import startcli