pep8 cleanup

7 files changed, 85 insertions, 59 deletions

diff --git a/components/__base__.py b/components/__base__.py
index bef7f0e..a29d775 100644
--- a/components/__base__.py
+++ b/components/__base__.py
@@ -39,7 +39,7 @@ class Component(QtCore.QObject):
         then update self.page widgets using the preset dict.
         '''
         self.currentPreset = presetName \
-            if presetName != None else presetDict['preset']
+            if presetName is not None else presetDict['preset']
 
     def preFrameRender(self, **kwargs):
         '''Triggered only before a video is exported (video_thread.py)
@@ -66,8 +66,9 @@ class Component(QtCore.QObject):
                 print('Couldn\'t locate preset "%s"' % preset)
                 quit(1)
             else:
-                print('Opening "%s" preset on layer %s' % \
-                    (preset, self.compPos))
+                print('Opening "%s" preset on layer %s' % (
+                    preset, self.compPos)
+                )
                 self.core.openPreset(path, self.compPos, preset)
         else:
             print(
@@ -142,10 +143,10 @@ class Component(QtCore.QObject):
         return image
     '''
 
+
 class BadComponentInit(Exception):
     def __init__(self, arg, name):
-        string = \
-'''################################
+        string = '''################################
 Mandatory argument "%s" not specified
   in %s instance initialization
 ###################################'''
diff --git a/components/color.py b/components/color.py
index 5ffcdea..3b73458 100644
--- a/components/color.py
+++ b/components/color.py
@@ -53,7 +53,7 @@ class Component(__base__.Component):
         page.spinBox_height.valueChanged.connect(self.update)
         page.checkBox_trans.stateChanged.connect(self.update)
 
-        self.fillLabels = [ \
+        self.fillLabels = [
             'Solid',
             'Linear Gradient',
             'Radial Gradient',
@@ -126,8 +126,8 @@ class Component(__base__.Component):
         r, g, b = self.color1
         shapeSize = (self.sizeWidth, self.sizeHeight)
         # in default state, skip all this logic and return a plain fill
-        if self.fillType==0 and shapeSize == (width, height) \
-            and self.x == 0 and self.y == 0:
+        if self.fillType == 0 and shapeSize == (width, height) \
+                and self.x == 0 and self.y == 0:
             return Image.new("RGBA", (width, height), (r, g, b, 255))
 
         frame = self.blankFrame(width, height)
@@ -143,9 +143,11 @@ class Component(__base__.Component):
             image = ImageQt(frame)
             painter = QtGui.QPainter(image)
             if self.stretch:
-                w = width; h = height
+                w = width
+                h = height
             else:
-                w = self.sizeWidth; h = self.sizeWidth
+                w = self.sizeWidth
+                h = self.sizeWidth
 
         if self.fillType == 1:  # Linear Gradient
             brush = QtGui.QLinearGradient(
@@ -170,8 +172,10 @@ class Component(__base__.Component):
         else:
             brush.setColorAt(1.0, QColor(*self.color2))
         painter.setBrush(brush)
-        painter.drawRect(self.x, self.y,
-            self.sizeWidth, self.sizeHeight)
+        painter.drawRect(
+            self.x, self.y,
+            self.sizeWidth, self.sizeHeight
+        )
         painter.end()
         imBytes = image.bits().asstring(image.numBytes())
         return Image.frombytes('RGBA', (width, height), imBytes)
diff --git a/components/video.py b/components/video.py
index 1d250bd..4fced4e 100644
--- a/components/video.py
+++ b/components/video.py
@@ -41,8 +41,8 @@ class Video:
             '-i', self.videoPath,
             '-f', 'image2pipe',
             '-pix_fmt', 'rgba',
-            '-filter:v', 'scale=%s:%s' %
-                scale(self.scale, self.width, self.height, str),
+            '-filter:v', 'scale=%s:%s' % scale(
+                self.scale, self.width, self.height, str),
             '-vcodec', 'rawvideo', '-',
         ]
 
@@ -199,8 +199,8 @@ class Component(__base__.Component):
             '-i', self.videoPath,
             '-f', 'image2pipe',
             '-pix_fmt', 'rgba',
-            '-filter:v', 'scale=%s:%s' %
-                scale(self.scale, width, height, str),
+            '-filter:v', 'scale=%s:%s' % scale(
+                self.scale, width, height, str),
             '-vcodec', 'rawvideo', '-',
             '-ss', '90',
             '-vframes', '1',
@@ -238,6 +238,7 @@ class Component(__base__.Component):
     def commandHelp(self):
         print('Load a video:\n    path=/filepath/to/video.mp4')
 
+
 def scale(scale, width, height, returntype=None):
     width = (float(width) / 100.0) * float(scale)
     height = (float(height) / 100.0) * float(scale)
@@ -248,6 +249,7 @@ def scale(scale, width, height, returntype=None):
     else:
         return (width, height)
 
+
 def finalizeFrame(self, imageData, width, height):
     if self.distort:
         try:
@@ -265,7 +267,7 @@ def finalizeFrame(self, imageData, width, height):
             imageData)
 
     if self.scale != 100 \
-        or self.xPosition != 0 or self.yPosition != 0:
+            or self.xPosition != 0 or self.yPosition != 0:
         frame = self.blankFrame(width, height)
         frame.paste(image, box=(self.xPosition, self.yPosition))
     else:
diff --git a/core.py b/core.py
index de6ed99..b51cf98 100644
--- a/core.py
+++ b/core.py
@@ -178,7 +178,8 @@ class Core():
                     clearThis = False
 
                     # add loaded named presets to savedPresets dict
-                    if 'preset' in preset and preset['preset'] != None:
+                    if 'preset' in preset and \
+                            preset['preset'] is not None:
                         nam = preset['preset']
                         filepath2 = os.path.join(
                             self.presetDir, name, str(vers), nam)
@@ -194,12 +195,13 @@ class Core():
                         -1,
                         self.moduleIndexFor(name),
                         loader)
-                    if i == None:
+                    if i is None:
                         loader.showMessage(msg="Too many components!")
                         break
 
                     try:
-                        if 'preset' in preset and preset['preset'] != None:
+                        if 'preset' in preset and \
+                                preset['preset'] is not None:
                             self.selectedComponents[i].loadPreset(
                                 preset
                             )
@@ -209,8 +211,9 @@ class Core():
                                 preset['preset']
                             )
                     except KeyError as e:
-                        print('%s missing value %s' %
-                            (self.selectedComponents[i], e))
+                        print('%s missing value %s' % (
+                            self.selectedComponents[i], e)
+                        )
 
                     if clearThis:
                         self.clearPreset(i)
@@ -220,7 +223,6 @@ class Core():
                 errcode = 1
                 data = sys.exc_info()
 
-
         if errcode == 1:
             typ, value, _ = data
             if typ.__name__ == KeyError:
@@ -273,11 +275,11 @@ class Core():
                             i += 1
                         elif i == 2:
                             lastCompPreset = Core.presetFromString(line)
-                            data[section].append(
-                                (lastCompName,
+                            data[section].append((
+                                lastCompName,
                                 lastCompVers,
-                                lastCompPreset)
-                            )
+                                lastCompPreset
+                            ))
                             i = 0
             return 0, data
         except:
@@ -308,7 +310,9 @@ class Core():
             return False, ''
 
     def exportPreset(self, exportPath, compName, vers, origName):
-        internalPath = os.path.join(self.presetDir, compName, str(vers), origName)
+        internalPath = os.path.join(
+            self.presetDir, compName, str(vers), origName
+        )
         if not os.path.exists(internalPath):
             return
         if os.path.exists(exportPath):
@@ -327,7 +331,8 @@ class Core():
             return False
 
     def createPresetFile(
-        self, compName, vers, presetName, saveValueStore, filepath=''):
+            self, compName, vers, presetName,
+            saveValueStore, filepath=''):
         '''Create a preset file (.avl) at filepath using args.
         Or if filepath is empty, create an internal preset using args'''
         if not filepath:
@@ -462,7 +467,9 @@ class Core():
     @staticmethod
     def presetToString(dictionary):
         '''Alphabetizes a dict into OrderedDict & returns string repr'''
-        return repr(OrderedDict(sorted(dictionary.items(), key=lambda t: t[0])))
+        return repr(
+            OrderedDict(sorted(dictionary.items(), key=lambda t: t[0]))
+        )
 
     @staticmethod
     def presetFromString(string):
diff --git a/main.py b/main.py
index 106bd29..715e433 100644
--- a/main.py
+++ b/main.py
@@ -30,7 +30,6 @@ def LoadDefaultSettings(self):
     }
 
     for parm, value in default.items():
-        #print(parm, self.settings.value(parm))
         if self.settings.value(parm) is None:
             self.settings.setValue(parm, value)
 
@@ -76,7 +75,11 @@ if __name__ == "__main__":
         dpi = desc.physicalDpiX()
 
         topMargin = 0 if (dpi == 96) else int(10 * (dpi / 96))
-        window.resize(window.width() * (dpi / 96), window.height() * (dpi / 96))
+        window.resize(
+            window.width() *
+            (dpi / 96), window.height() *
+            (dpi / 96)
+        )
         # window.verticalLayout_2.setContentsMargins(0, topMargin, 0, 0)
 
         main = MainWindow(window, proj)
diff --git a/presetmanager.py b/presetmanager.py
index 3b02714..1720b5c 100644
--- a/presetmanager.py
+++ b/presetmanager.py
@@ -21,22 +21,33 @@ class PresetManager(QtGui.QDialog):
 
         # window
         self.lastFilter = '*'
-        self.presetRows = [] # list of (comp, vers, name) tuples
+        self.presetRows = []  # list of (comp, vers, name) tuples
         self.window = window
         self.window.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint)
 
         # connect button signals
-        self.window.pushButton_delete.clicked.connect(self.openDeletePresetDialog)
-        self.window.pushButton_rename.clicked.connect(self.openRenamePresetDialog)
-        self.window.pushButton_import.clicked.connect(self.openImportDialog)
-        self.window.pushButton_export.clicked.connect(self.openExportDialog)
-        self.window.pushButton_close.clicked.connect(self.window.close)
+        self.window.pushButton_delete.clicked.connect(
+            self.openDeletePresetDialog
+        )
+        self.window.pushButton_rename.clicked.connect(
+            self.openRenamePresetDialog
+        )
+        self.window.pushButton_import.clicked.connect(
+            self.openImportDialog
+        )
+        self.window.pushButton_export.clicked.connect(
+            self.openExportDialog
+        )
+        self.window.pushButton_close.clicked.connect(
+            self.window.close
+        )
 
         # create filter box and preset list
         self.drawFilterList()
         self.window.comboBox_filter.currentIndexChanged.connect(
             lambda: self.drawPresetList(
-                self.window.comboBox_filter.currentText(), self.window.lineEdit_search.text()
+                self.window.comboBox_filter.currentText(),
+                self.window.lineEdit_search.text()
             )
         )
 
@@ -47,7 +58,8 @@ class PresetManager(QtGui.QDialog):
         self.window.lineEdit_search.setCompleter(completer)
         self.window.lineEdit_search.textChanged.connect(
             lambda: self.drawPresetList(
-                self.window.comboBox_filter.currentText(), self.window.lineEdit_search.text()
+                self.window.comboBox_filter.currentText(),
+                self.window.lineEdit_search.text()
             )
         )
         self.drawPresetList('*')
@@ -72,16 +84,14 @@ class PresetManager(QtGui.QDialog):
                     parseList.append((compName, int(compVers), preset))
                 except ValueError:
                     continue
-        self.presets =\
-            {
-            compName : \
-                [
-                (vers, preset) \
-                    for name, vers, preset in parseList \
-                    if name == compName \
-                ] \
-            for compName, _, __ in parseList \
-            }
+        self.presets = {
+            compName: [
+                (vers, preset)
+                for name, vers, preset in parseList
+                if name == compName
+            ]
+            for compName, _, __ in parseList
+        }
 
     def drawPresetList(self, compFilter=None, presetFilter=''):
         self.window.listWidget_presets.clear()
@@ -96,7 +106,9 @@ class PresetManager(QtGui.QDialog):
                 continue
             for vers, preset in presets:
                 if not presetFilter or presetFilter in preset:
-                    self.window.listWidget_presets.addItem('%s: %s' % (component, preset))
+                    self.window.listWidget_presets.addItem(
+                        '%s: %s' % (component, preset)
+                    )
                     self.presetRows.append((component, vers, preset))
                 if preset not in presetNames:
                     presetNames.append(preset)
@@ -149,7 +161,7 @@ class PresetManager(QtGui.QDialog):
             break
 
     def createNewPreset(
-        self, compName, vers, filename, saveValueStore, **kwargs):
+            self, compName, vers, filename, saveValueStore, **kwargs):
         path = os.path.join(self.presetDir, compName, str(vers), filename)
         if self.presetExists(path, **kwargs):
             return
diff --git a/video_thread.py b/video_thread.py
index 265feee..8266083 100644
--- a/video_thread.py
+++ b/video_thread.py
@@ -121,15 +121,12 @@ class Worker(QtCore.QObject):
         vencoders = options['video-codecs'][vcodec]
         aencoders = options['audio-codecs'][acodec]
 
-        #print(encoders)
         for encoder in vencoders:
-            #print(encoder)
             if encoder in encoders:
                 vencoder = encoder
                 break
 
         for encoder in aencoders:
-            #print(encoder)
             if encoder in encoders:
                 aencoder = encoder
                 break
@@ -167,10 +164,10 @@ class Worker(QtCore.QObject):
         numpy.seterr(divide='ignore')
 
         # Call preFrameRender on all components
-        print('Loaded Components:', ", ".join(
-            ["%s) %s" % (num, str(component)) \
-                for num, component in enumerate(reversed(self.components))
-            ]))
+        print('Loaded Components:', ", ".join([
+            "%s) %s" % (num, str(component))
+            for num, component in enumerate(reversed(self.components))
+        ]))
         self.staticComponents = {}
         numComps = len(self.components)
         for compNo, comp in enumerate(self.components):