Merge pull request #37 from creativecommons/fix-lint-issues

Fix lint issues (reformat with black and fix flake8 errors)

Author: TimidRobot

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+exclude =
+    .git,
+    base-images,
+    www

pyproject.toml

@@ -0,0 +1,9 @@
+[tool.black]
+line-length = 79
+exclude = '''
+/(
+    \.git
+  | \base-images
+  | \www
+)/
+'''

scripts/cc/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__import__("pkg_resources").declare_namespace(__name__)

scripts/cc/image_tools/imgsplat.py

@@ -19,62 +19,67 @@
 NS_FOAF = Namespace("http://xmlns.com/foaf/0.1/")
 
 MONEY = {
-    'at': 'euro',
-    'be': 'euro',
-    'fi': 'euro',
-    'de': 'euro',
-    'es': 'euro',
-    'fr': 'euro',
-    'gr': 'euro',
-    'ie': 'euro',
-    'it': 'euro',
-    'lu': 'euro',
-    'nl': 'euro',
-    'pt': 'euro'}
+    "at": "euro",
+    "be": "euro",
+    "fi": "euro",
+    "de": "euro",
+    "es": "euro",
+    "fr": "euro",
+    "gr": "euro",
+    "ie": "euro",
+    "it": "euro",
+    "lu": "euro",
+    "nl": "euro",
+    "pt": "euro",
+}
 
 
 def checkout_base():
     """Return the base destination path.  Note that this assumes you're
     running the tool from a Subversion checkout (or that your filesystem
     layout is the same as our repository)."""
 
-
     return os.path.abspath(
-        os.path.join(os.path.dirname(__file__), '..', '..', '..')
-        )
+        os.path.join(os.path.dirname(__file__), "..", "..", "..")
+    )
+
 
 def load_graph(filename):
     """Load the specified filename; return a graph."""
 
     store = Graph()
     store.bind("cc", "http://creativecommons.org/ns#")
     store.bind("dc", "http://purl.org/dc/elements/1.1/")
-    store.bind("dcq","http://purl.org/dc/terms/")
-    store.bind("rdf","http://www.w3.org/1999/02/22-rdf-syntax-ns#")
+    store.bind("dcq", "http://purl.org/dc/terms/")
+    store.bind("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#")
 
     store.load(filename)
 
     return store
 
+
 def copyto(source, dest, code, size, jurisdiction, money=MONEY):
     # Make the destination directory, if necessary
     dest_dir = os.path.dirname(dest)
-    if (not os.access(dest_dir, os.F_OK)):
+    if not os.access(dest_dir, os.F_OK):
         os.makedirs(dest_dir)
 
     # If NC (and not the 80x15 icon), use the appropriate currency icon.
-    if ((string.find(code, 'nc') != -1
-         and money.has_key(jurisdiction)
-         and size != '80x15'
-         and not 'somerights1' in source)):
-        source += '_' + money[jurisdiction]
+    if (
+        string.find(code, "nc") != -1
+        and jurisdiction in money
+        and size != "80x15"
+        and "somerights1" not in source
+    ):
+        source += "_" + money[jurisdiction]
 
-    source += '.png'
+    source += ".png"
 
     try:
         shutil.copy2(source, dest)
-    except:
-        print 'Failed to copy '+source+' to '+dest
+    except:  # noqa: E722 (FIXME)
+        # Flake8 lint runs via Python 3 so skip following E999
+        print "Failed to copy", source, "to", dest  # noqa: E999
 
 
 def splat(license_graph):
@@ -84,34 +89,34 @@ def splat(license_graph):
         for s, p, logo in license_graph.triples((uri, NS_FOAF.logo, None)):
             # Get the dest_path, which is base-images and
             # everything after 'http://i.creativecommons.org/'
-            dest_path = os.path.join(
-                checkout_base(), 'www', str(logo)[29:])
+            dest_path = os.path.join(checkout_base(), "www", str(logo)[29:])
 
             m = re.search(
-                '^http://i.creativecommons.org/'
-                '(?P<group>l|p)/'
-                '(?P<code>.*?)/'
-                '((?P<version>.*?)/'
-                '((?P<jurisdiction>.*?)/)?)?'
-                '(?P<size>.*)\.png$', str(logo))
-
-            code = m.group('code')
-            jurisdiction = m.group('jurisdiction')
-            size = m.group('size')
+                "^http://i.creativecommons.org/"
+                "(?P<group>l|p)/"
+                "(?P<code>.*?)/"
+                "((?P<version>.*?)/"
+                "((?P<jurisdiction>.*?)/)?)?"
+                r"(?P<size>.*)\.png$",
+                str(logo),
+            )
+
+            code = m.group("code")
+            jurisdiction = m.group("jurisdiction")
+            size = m.group("size")
 
             code2 = code
-            if (code == 'by-nd-nc'):
-                code2 = 'by-nc-nd'
-            elif code in ('nc', 'nd', 'sa', 'nd-nc', 'nc-sa'):
-                code2 = 'somerights1'
+            if code == "by-nd-nc":
+                code2 = "by-nc-nd"
+            elif code in ("nc", "nd", "sa", "nd-nc", "nc-sa"):
+                code2 = "somerights1"
 
-            source = os.path.join(
-                checkout_base(), 'base-images', size, code2)
+            source = os.path.join(checkout_base(), "base-images", size, code2)
 
             copyto(source, dest_path, code, size, jurisdiction)
 
 
 def cli():
     """imgsplat command line interface."""
 
-    splat(load_graph('http://creativecommons.org/licenses/index.rdf'))
+    splat(load_graph("http://creativecommons.org/licenses/index.rdf"))

scripts/genicons.py

@@ -15,8 +15,8 @@
 import cairo
 import gi
 
-gi.require_version("PangoCairo", "1.0")  # noqa: E402
-from gi.repository import PangoCairo as pangocairo
+gi.require_version("PangoCairo", "1.0")
+from gi.repository import PangoCairo as pangocairo  # noqa: E402
 
 
 SUITES = {

scripts/setup.py

@@ -1,46 +1,40 @@
 # Copyright (c) 2007 Nathan R. Yergler, Creative Commons
-
-## Permission is hereby granted, free of charge, to any person obtaining
-## a copy of this software and associated documentation files (the "Software"),
-## to deal in the Software without restriction, including without limitation
-## the rights to use, copy, modify, merge, publish, distribute, sublicense,
-## and/or sell copies of the Software, and to permit persons to whom the
-## Software is furnished to do so, subject to the following conditions:
-
-## The above copyright notice and this permission notice shall be included in
-## all copies or substantial portions of the Software.
-
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-## FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-## DEALINGS IN THE SOFTWARE.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
 
 from setuptools import setup
 
 setup(
-    name = "cc.image_tools",
-    version = "1.0",
-    packages = ['cc.image_tools'],
-
-    entry_points = {'console_scripts' :
-                    ['imgsplat = cc.image_tools.imgsplat:cli',
-                     ]
-                    },
-
-    install_requires = ['setuptools',
-                        'rdflib<3.0',
-                        ],
-
-    include_package_data = True,
-    zip_safe = True,
-
-    author = 'Mike Linksvayer',
-    author_email = 'ml@creativecommons.org',
-    description = 'Tools for managing i.creativecommons.org.',
-    license = 'MIT',
-    url = 'http://wiki.creativecommons.org/Developer',
-
-    )
+    name="cc.image_tools",
+    version="1.0",
+    packages=["cc.image_tools"],
+    entry_points={
+        "console_scripts": [
+            "imgsplat = cc.image_tools.imgsplat:cli",
+        ]  # (increase line length for black/flake8 harmony)
+    },
+    install_requires=["setuptools", "rdflib<3.0",],  # noqa: E231
+    include_package_data=True,
+    zip_safe=True,
+    author="Mike Linksvayer",
+    author_email="ml@creativecommons.org",
+    description="Tools for managing i.creativecommons.org.",
+    license="MIT",
+    url="http://wiki.creativecommons.org/Developer",
+)