7519: GRAMPs unable to handle ... Path with accented characters

This replaces commit 3535f7a79f with
removing the incorrect encoding of paths with the system filesystem
encoding. Python is mostly smart enough to do that itself.

Thanks to Paul Franklin and Josip Pisoj for their help with sorting this
out.
This commit is contained in:
John Ralls 2014-03-15 14:32:14 -07:00
parent 25b4c22a30
commit 61cdc0b54b
4 changed files with 6 additions and 26 deletions

View File

@ -476,8 +476,6 @@ def find_next_db_dir():
while True:
base = "%x" % int(time.time())
dbdir = os.path.expanduser(config.get('behavior.database-path'))
if sys.version_info[0] < 3:
dbdir = dbdir.encode(glocale.getfilesystemencoding())
new_path = os.path.join(dbdir, base)
if not os.path.isdir(new_path):
break

View File

@ -936,12 +936,8 @@ class GVPdfGvDoc(GVDocBase):
dotfile = os.fdopen(handle, "wb")
dotfile.write(self._dot.getvalue())
dotfile.close()
# Convert filename to str using file system encoding.
if sys.version_info[0] < 3:
fname = self._filename.encode(glocale.getfilesystemencoding())
else:
fname = self._filename
fname = self._filename
# Generate the PDF file.
os.system( 'dot -Tpdf -o"%s" "%s"' % (fname, tmp_dot) )

View File

@ -50,11 +50,7 @@ _ = glocale.translation.gettext
def safe_eval(exp):
# restrict eval to empty environment
try:
return eval(exp, {})
except SyntaxError:
logging.warning ("Invalid command string: %s", exp)
return exp
return eval(exp, {})
##try:
## from ast import literal_eval as safe_eval
@ -368,17 +364,9 @@ class ConfigManager(object):
default = ""
if isinstance(value, int):
value = int(value)
# repr() in Py2 effectively runs "encode(val,
# ascii, backslashreplace)" on its argument,
# and there's no way to reconstruct the
# string, so we special-case handling writing
# to ensure the unicode is preserved.
if isinstance(value, str) or isinstance(value, unicode):
key_file.write(("%s%s=u'%s'\n") % (default, key,
value))
else:
key_file.write(("%s%s=%s\n")% (default, key,
repr(value)))
key_file.write(("%s%s=%s\n")% (default,
key,
repr(value)))
key_file.write("\n")
key_file.close()
# else, no filename given; nothing to save so do nothing quietly

View File

@ -1097,8 +1097,6 @@ class ViewManager(CLIManager):
value = dialog.run()
if value:
(filename, title) = value
if sys.version_info[0] < 3:
filename = filename.encode(glocale.getfilesystemencoding())
self.db_loader.read_file(filename)
self._post_load_newdb(filename, 'x-directory/normal', title)