combining two import statements

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__)

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'),