clean up prev commit
This commit is contained in:
24
lib/util.py
24
lib/util.py
@@ -66,12 +66,14 @@ class FileImportFailed(Exception):
|
||||
def __str__(self):
|
||||
return _("Failed to import from file.") + "\n" + self.message
|
||||
|
||||
|
||||
class FileExportFailed(Exception):
|
||||
def __init__(self, reason=''):
|
||||
self.message = str(reason)
|
||||
def __init__(self, message=''):
|
||||
self.message = str(message)
|
||||
|
||||
def __str__(self):
|
||||
return( _("Failed to export to file.") + "\n" + self.message )
|
||||
return _("Failed to export to file.") + "\n" + self.message
|
||||
|
||||
|
||||
# Throw this exception to unwind the stack like when an error occurs.
|
||||
# However unlike other exceptions the user won't be informed.
|
||||
@@ -788,6 +790,7 @@ def setup_thread_excepthook():
|
||||
def versiontuple(v):
|
||||
return tuple(map(int, (v.split("."))))
|
||||
|
||||
|
||||
def import_meta(path, validater, load_meta):
|
||||
try:
|
||||
with open(path, 'r') as f:
|
||||
@@ -798,13 +801,14 @@ def import_meta(path, validater, load_meta):
|
||||
traceback.print_exc(file=sys.stderr)
|
||||
raise FileImportFailed(_("Invalid JSON code."))
|
||||
except BaseException as e:
|
||||
traceback.print_exc(file=sys.stdout)
|
||||
raise FileImportFailed(e)
|
||||
traceback.print_exc(file=sys.stdout)
|
||||
raise FileImportFailed(e)
|
||||
|
||||
|
||||
def export_meta(meta, fileName):
|
||||
try:
|
||||
with open(fileName, 'w+') as f:
|
||||
try:
|
||||
with open(fileName, 'w+') as f:
|
||||
json.dump(meta, f, indent=4, sort_keys=True)
|
||||
except (IOError, os.error) as reason:
|
||||
traceback.print_exc(file=sys.stderr)
|
||||
raise FileExportFailed(str(reason))
|
||||
except (IOError, os.error) as e:
|
||||
traceback.print_exc(file=sys.stderr)
|
||||
raise FileExportFailed(e)
|
||||
|
||||
Reference in New Issue
Block a user