Misc code cleanup

Author: ferdnyc

src/classes/app.py

@@ -292,5 +292,6 @@ def onLogTheEnd():
         log.info(time.asctime().center(48))
         log.info("================================================")
     except Exception:
-        from classes.logger import log
+        import logging
+        log = logging.getLogger("OpenShot")
         log.warning('Failed to write session ended log')

src/classes/exceptions.py

@@ -1,26 +1,26 @@
-""" 
+"""
  @file
  @brief This file deals with unhandled exceptions
  @author Jonathan Thomas <[email protected]>
- 
+
  @section LICENSE
- 
+
  Copyright (c) 2008-2018 OpenShot Studios, LLC
  (http://www.openshotstudios.com). This file is part of
  OpenShot Video Editor (http://www.openshot.org), an open-source project
  dedicated to delivering high quality video editing and animation solutions
  to the world.
- 
+
  OpenShot Video Editor is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  OpenShot Video Editor is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
  """

src/classes/timeline.py

@@ -1,26 +1,26 @@
-""" 
+"""
  @file
  @brief This file contains a timeline object, which listens for updates and syncs a libopenshot timeline object
  @author Jonathan Thomas <[email protected]>
- 
+
  @section LICENSE
- 
+
  Copyright (c) 2008-2018 OpenShot Studios, LLC
  (http://www.openshotstudios.com). This file is part of
  OpenShot Video Editor (http://www.openshot.org), an open-source project
  dedicated to delivering high quality video editing and animation solutions
  to the world.
- 
+
  OpenShot Video Editor is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  OpenShot Video Editor is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
  """

src/windows/main_window.py

@@ -1689,7 +1689,7 @@ def keyPressEvent(self, event):
 
         # If we didn't act on the event, forward it to the base class
         else:
-            super(MainWindow, self).keyPressEvent(event)
+            super().keyPressEvent(event)
 
 
     def actionProfile_trigger(self, event):
@@ -2602,10 +2602,10 @@ def ExportFinished(self, path):
         except Exception:
             log.debug('Failed to notify unity launcher of export progress. Completed.')
 
-    def __init__(self, mode=None):
+    def __init__(self, *args, mode=None):
 
         # Create main window base class
-        QMainWindow.__init__(self)
+        super().__init__(*args)
         self.mode = mode    # None or unittest (None is normal usage)
         self.initialized = False
 

src/windows/preview_thread.py

@@ -25,7 +25,6 @@
  along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
  """
 
-import os
 import time
 import sip
 
@@ -35,9 +34,7 @@
 
 from classes.app import get_app
 from classes.logger import log
-from classes import settings
 
-import json
 
 class PreviewParent(QObject):
     """ Class which communicates with the PlayerWorker Class (running on a separate thread) """
@@ -226,7 +223,6 @@ def LoadFile(self, path=None):
             return
 
         log.info("LoadFile %s" % path)
-        s = settings.get_settings()
 
         # Determine the current frame of the timeline (when switching to a clip)
         seek_position = 1
@@ -248,7 +244,6 @@ def LoadFile(self, path=None):
             seek_position = self.original_position
         else:
             # Create new timeline reader (to preview selected clip)
-            s = settings.get_settings()
             project = get_app().project
 
             # Get some settings from the project

src/windows/views/webview.py

@@ -3102,6 +3102,8 @@ def render_cache_json(self):
 
     def __init__(self, window):
         super().__init__()
+        self.setObjectName("TimelineWebView")
+
         self.window = window
         self.setAcceptDrops(True)
         self.last_position_frames = None