From 9a0b01864331d38fbc7f65a9badcfee4f6167467 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 8 May 2009 09:32:35 -0700 Subject: [PATCH] Use absolute imports for input/output widgets --- src/calibre/gui2/convert/bulk.py | 8 +++----- src/calibre/gui2/convert/single.py | 9 +++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/calibre/gui2/convert/bulk.py b/src/calibre/gui2/convert/bulk.py index 7bdacc26ee..5d54ed6350 100644 --- a/src/calibre/gui2/convert/bulk.py +++ b/src/calibre/gui2/convert/bulk.py @@ -4,8 +4,6 @@ __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' __docformat__ = 'restructuredtext en' -import sys - from PyQt4.Qt import QString, SIGNAL from calibre.gui2.convert.single import Config, sort_formats_by_preference, \ @@ -64,10 +62,10 @@ class BulkConfig(Config): toc = widget_factory(TOCWidget) output_widget = None - name = 'calibre.gui2.convert.%s' % self.plumber.output_plugin.name.lower().replace(' ', '_') + name = self.plumber.output_plugin.name.lower().replace(' ', '_') try: - __import__(name) - output_widget = sys.modules[name] + output_widget = __import__('calibre.gui2.convert.'+name, + fromlist=[1]) pw = output_widget.PluginWidget pw.ICON = ':/images/back.svg' pw.HELP = _('Options specific to the output format.') diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py index eea4b6e11a..b735e17bc9 100644 --- a/src/calibre/gui2/convert/single.py +++ b/src/calibre/gui2/convert/single.py @@ -142,10 +142,10 @@ class Config(ResizableDialog, Ui_Dialog): toc = widget_factory(TOCWidget) output_widget = None - name = 'calibre.gui2.convert.%s' % self.plumber.output_plugin.name.lower().replace(' ', '_') + name = self.plumber.output_plugin.name.lower().replace(' ', '_') try: - __import__(name) - output_widget = sys.modules[name] + output_widget = __import__('calibre.gui2.convert.'+name, + fromlist=[1]) pw = output_widget.PluginWidget pw.ICON = ':/images/back.svg' pw.HELP = _('Options specific to the output format.') @@ -155,7 +155,8 @@ class Config(ResizableDialog, Ui_Dialog): input_widget = None name = self.plumber.input_plugin.name.lower().replace(' ', '_') try: - input_widget = __import__(name) + input_widget = __import__('calibre.gui2.convert.'+name, + fromlist=[1]) pw = input_widget.PluginWidget pw.ICON = ':/images/forward.svg' pw.HELP = _('Options specific to the input format.')