Merge pull request #6 from GPLgithub/master

Fixes and polish

Author: ryanmayeda

.flake8

@@ -0,0 +1,53 @@
+# Copyright 2018 GPL Solutions, LLC.  All rights reserved.
+#
+# Use of this software is subject to the terms of the GPL Solutions license
+# agreement provided at the time of installation or download, or which otherwise
+# accompanies this software in either electronic or hard copy form.
+#
+
+# Flake 8 PEP and lint configuration - https://gitlab.com/pycqa/flake8
+#
+# This defines the official lint and PEP8 rules for this repository
+#
+# You can run this locally by doing pep install flake8 and then
+# >flake8 .
+
+[flake8]
+
+# Things we don't want to lint
+exclude =
+    .tox,
+    .git,
+    .flake8,
+    .gitignore,
+    .travis.yml,
+    .cache,
+    .eggs,
+    *.rst,
+    *.yml,
+    *.pyc,
+    *.pyo,
+    *.egg-info,
+    __pycache__,
+    # Those are our third parties, do not lint them
+    vendors,
+    # Skip __init__.py files, to not have a lot of 'xxx' imported but unused
+    python/__init__.py,
+    python/*/__init__.py,
+    # Skip the auto-generated ui file.
+    python/*/ui,
+    venv,
+    winenv,
+    osx_env,
+    win_env,
+
+# Ignore some errors
+#
+# E402 module level import not at top of file
+# E501 line too long (112 > 79 characters)
+# N802 Variables should be lower case. (clashes with Qt naming conventions)
+# N806 Variables should be lower case. (clashes with Qt naming conventions)
+# W503 line break before binary operator (it breaks before, not after)
+
+ignore = E501, E402, N802, N806, W503
+

framework.py

@@ -1,5 +1,5 @@
 # This file is based on templates provided and copyrighted by Autodesk, Inc.
-# This file has been modified by Epic Games, Inc. and is subject to the license 
+# This file has been modified by Epic Games, Inc. and is subject to the license
 # file included in this repository.
 
 """
@@ -22,7 +22,7 @@ class UnrealQtFramework(sgtk.platform.Framework):
 
     ##########################################################################################
     # init and destroy
-            
+
     def init_framework(self):
         """
         This framework ships with additional Python packages and tweak the Python
@@ -35,7 +35,7 @@ def init_framework(self):
 
         # Check if PySide is already available, do nothing if it is the case
         try:
-            from sgtk.platform.qt import QtCore
+            from sgtk.platform.qt import QtCore  # noqa
             self.log_debug("Qt is already available, not activating any custom package.")
             return
         except ImportError as e:

hooks/core/bootstrap.py

@@ -142,7 +142,7 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
             for asset in response_d["assets"]:
                 name = asset["name"]
                 m = re.match(
-                    "%s-py\d.\d-%s.zip" % (version, pname),
+                    r"%s-py\d.\d-%s.zip" % (version, pname),
                     name
                 )
                 if m:

hooks/tk-multi-publish2/tk-maya/basic/collector.py

@@ -21,7 +21,6 @@ class MayaSessionCollectorWithSecondaries(HookBaseClass):
         collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py:{config}/tk-multi-publish2/tk-maya/basic/collector.py"
     """
 
-
     def collect_current_maya_session(self, settings, parent_item):
         """
         Creates an item that represents the current maya session.

hooks/tk-multi-publish2/tk-maya/basic/publish_fbx.py

@@ -187,7 +187,6 @@ def validate(self, settings, item):
         :raises ValueError: For problems which can't be solved in the current session.
         """
 
-        publisher = self.parent
         path = _session_path()
 
         # ---- ensure the session has been saved
@@ -282,7 +281,6 @@ def validate(self, settings, item):
             # Set the publish_path to be explicit.
             item.local_properties["publish_path"] = publish_path
 
-
         # Set the session path on the item for use by the base plugin validation
         # step.
         # NOTE: this path could change prior to the publish phase.
@@ -312,8 +310,6 @@ def publish(self, settings, item):
         :param item: Item to process
         """
 
-        publisher = self.parent
-
         # Get the path in a normalized state. no trailing separator, separators
         # are appropriate for current os, no double separators, etc.
         path = sgtk.util.ShotgunPath.normalize(_session_path())
@@ -376,6 +372,7 @@ def _session_path():
 
     return path
 
+
 def _save_session(path):
     """
     Save the current session to the supplied path.