From b022fef955545d35b9799124da35714a9d017fd2 Mon Sep 17 00:00:00 2001 From: M2j Date: Thu, 10 Jun 2010 01:03:08 +0200 Subject: [PATCH] combining two import statements --- openlp/core/ui/pluginform.py | 3 +-- openlp/core/ui/thememanager.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py index 7100a19a4..faa08b3d7 100644 --- a/openlp/core/ui/pluginform.py +++ b/openlp/core/ui/pluginform.py @@ -27,8 +27,7 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate -from openlp.core.lib.plugin import PluginStatus +from openlp.core.lib.plugin import PluginStatus, translate from plugindialog import Ui_PluginViewDialog log = logging.getLogger(__name__) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 7ba4a351c..9c1ad8653 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -243,7 +243,7 @@ class ThemeManager(QtGui.QWidget): try: zip = zipfile.ZipFile(themePath, u'w') source = os.path.join(self.path, theme) - for root, dirs, files in os.walk(source): + for files in os.walk(source)[2]: for name in files: zip.write( os.path.join(source, name).encode(u'utf-8'),