From 8872ab4ec2cb86c4725bd90087a963ddad8cf658 Mon Sep 17 00:00:00 2001 From: Tim G L Lyons Date: Fri, 10 Feb 2012 20:14:14 +0000 Subject: [PATCH] 0003874: ImportGedcom: does not recognise changes to 'preferences.default-source' after startup svn: r18850 --- src/plugins/import/ImportGedcom.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/import/ImportGedcom.py b/src/plugins/import/ImportGedcom.py index b4e3d6667..59e320335 100644 --- a/src/plugins/import/ImportGedcom.py +++ b/src/plugins/import/ImportGedcom.py @@ -51,12 +51,7 @@ import libgedcom module = __import__("libgedcom") reload (module) -try: - import config - DEFAULT_SOURCE = config.get('preferences.default-source') -except ImportError: - LOG.warn("No Config module available using defaults.") - DEFAULT_SOURCE = False +import config #------------------------------------------------------------------------- # @@ -111,8 +106,9 @@ def importData(database, filename, callback=None): if code_set: stage_one.set_encoding(code_set) ifile.seek(0) - gedparse = libgedcom.GedcomParser(database, ifile, filename, callback, - stage_one, DEFAULT_SOURCE) + gedparse = libgedcom.GedcomParser( + database, ifile, filename, callback, stage_one, + config.get('preferences.default-source')) except IOError, msg: ErrorDialog(_("%s could not be opened\n") % filename, str(msg)) return