Merge ~jugmac00/launchpadlib:flake8-code into launchpadlib:main

[Jürgen Gmach]

Use flake8 via pre-commit

[Colin Watson (cjwatson)]

review: Approve

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 015c36c..8ef0d2f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+exclude: ^contrib/
+
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v3.2.0
@@ -8,3 +10,8 @@ repos:
     -   id: check-merge-conflict
     -   id: check-xml
     -   id: check-yaml
+    -   id: debug-statements
+-   repo: https://github.com/PyCQA/flake8
+    rev: 3.9.2
+    hooks:
+    -   id: flake8
diff --git a/setup.cfg b/setup.cfg
index 2a9acf1..121ec76 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,16 @@
 [bdist_wheel]
 universal = 1
+
+[flake8]
+ignore =
+    # indentation / whitespace issues -> will be auto-fixed by black
+    E123
+    E125
+    E126
+    E127
+    E128
+    E129
+    E501
+    # binary operator on same or next line; mutually exclusive
+    W503
+    W504
 \ No newline at end of file
diff --git a/setup.py b/setup.py
index 656888e..fbb9cab 100755
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,7 @@
 import sys
 from setuptools import setup, find_packages
 
+
 # generic helpers primarily for the long_description
 def generate(*docname_or_string):
     marker = '.. pypi description ends here'
@@ -38,6 +39,7 @@ def generate(*docname_or_string):
     return '\n'.join(res)
 # end generic helpers
 
+
 install_requires = [
     'httplib2',
     'importlib-metadata; python_version < "3.8"',
@@ -53,14 +55,14 @@ setup(
     name='launchpadlib',
     version='1.10.15.1',
     packages=find_packages('src'),
-    package_dir={'':'src'},
+    package_dir={'': 'src'},
     include_package_data=True,
     zip_safe=False,
     author='The Launchpad developers',
     author_email='[e-mail]',
     maintainer='LAZR Developers',
     maintainer_email='[e-mail]',
-    download_url= 'https://launchpad.net/launchpadlib/+download',
+    download_url='https://launchpad.net/launchpadlib/+download',
     description=open('README.rst').readline().strip(),
     long_description=generate(
         'src/launchpadlib/docs/index.rst',
diff --git a/src/launchpadlib/apps.py b/src/launchpadlib/apps.py
index f58dcb4..dc716da 100644
--- a/src/launchpadlib/apps.py
+++ b/src/launchpadlib/apps.py
@@ -48,5 +48,3 @@ class RequestTokenApp(object):
             self.context, self.web_root,
             token_format=Credentials.DICT_TOKEN_FORMAT)
         return json.dumps(token)
-
-
diff --git a/src/launchpadlib/bin/launchpad-request-token b/src/launchpadlib/bin/launchpad-request-token
index 2cc7db1..0690b28 100755
--- a/src/launchpadlib/bin/launchpad-request-token
+++ b/src/launchpadlib/bin/launchpad-request-token
@@ -22,6 +22,8 @@ This script will create a Launchpad request token and print to STDOUT
 some JSON data about the token and the available access levels.
 """
 
+from __future__ import print_function
+
 __metaclass__ = type
 
 from optparse import OptionParser
@@ -45,4 +47,4 @@ if __name__ == '__main__':
     consumer_name = args[0]
     app = RequestTokenApp(
         options.web_root, consumer_name, options.context)
-    print app.run()
+    print(app.run())
diff --git a/src/launchpadlib/credentials.py b/src/launchpadlib/credentials.py
index 5607d20..e2a3350 100644
--- a/src/launchpadlib/credentials.py
+++ b/src/launchpadlib/credentials.py
@@ -63,16 +63,16 @@ from six.moves.urllib.parse import parse_qs
 
 if bytes is str:
     # Python 2
-    unicode_type = unicode
+    unicode_type = unicode  # noqa: F821
 else:
     unicode_type = str
-    
+
 from lazr.restfulclient.errors import HTTPError
 from lazr.restfulclient.authorize.oauth import (
     AccessToken as _AccessToken,
     Consumer,
     OAuthAuthorizer,
-    SystemWideConsumer # Not used directly, just re-imported into here.
+    SystemWideConsumer  # Not used directly, just re-imported into here.
     )
 
 from launchpadlib import uris
@@ -271,7 +271,7 @@ class AnonymousAccessToken(_AccessToken):
     This token can be used for anonymous access.
     """
     def __init__(self):
-        super(AnonymousAccessToken, self).__init__('','')
+        super(AnonymousAccessToken, self).__init__('', '')
 
 
 class CredentialStore(object):
@@ -436,7 +436,7 @@ class KeyringCredentialStore(CredentialStore):
             try:
                 credentials = Credentials.from_string(credential_string)
                 return credentials
-            except:
+            except Exception:
                 # If any error occurs at this point the most reasonable thing
                 # to do is return no credentials, which will require
                 # re-authorization but the user will be able to proceed.
@@ -733,8 +733,8 @@ class AuthorizeRequestTokenWithBrowser(AuthorizeRequestTokenWithURL):
         # are discarding the passed-in values for consumer_name and
         # allow_access_levels.
         super(AuthorizeRequestTokenWithBrowser, self).__init__(
-              service_root, application_name, None,
-              credential_save_failed)
+            service_root, application_name, None,
+            credential_save_failed)
 
     def notify_end_user_authorization_url(self, authorization_url):
         """Notify the end-user of the URL."""
diff --git a/src/launchpadlib/docs/conf.py b/src/launchpadlib/docs/conf.py
index e18d614..2424f52 100644
--- a/src/launchpadlib/docs/conf.py
+++ b/src/launchpadlib/docs/conf.py
@@ -165,6 +165,3 @@ texinfo_documents = [
      author, 'launchpadlib', 'One line description of project.',
      'Miscellaneous'),
 ]
-
-
-
diff --git a/src/launchpadlib/errors.py b/src/launchpadlib/errors.py
index b9e59a4..87b6500 100644
--- a/src/launchpadlib/errors.py
+++ b/src/launchpadlib/errors.py
@@ -17,4 +17,4 @@
 
 """Reimport errors from restfulclient for convenience's sake."""
 
-from lazr.restfulclient.errors import *
+from lazr.restfulclient.errors import *  # noqa: F401, F403
diff --git a/src/launchpadlib/launchpad.py b/src/launchpadlib/launchpad.py
index ec88b01..c2c20ed 100644
--- a/src/launchpadlib/launchpad.py
+++ b/src/launchpadlib/launchpad.py
@@ -25,7 +25,7 @@ import errno
 import os
 try:
     from urllib.parse import urlsplit
-except:
+except ImportError:
     from urlparse import urlsplit
 import warnings
 
@@ -35,12 +35,12 @@ except ImportError:
     from httplib2 import ProxyInfo
     proxy_info_from_environment = ProxyInfo.from_environment
 
-from lazr.restfulclient.resource import (
+from lazr.restfulclient.resource import (  # noqa: F401
     CollectionWithKeyBasedLookup,
     HostedFile,           # Re-import for client convenience
     ScalarValue,          # Re-import for client convenience
     ServiceRoot,
-    )
+)
 from lazr.restfulclient.authorize.oauth import SystemWideConsumer
 from lazr.restfulclient._browser import RestfulHttp
 from launchpadlib.credentials import (
@@ -58,7 +58,7 @@ from launchpadlib import uris
 
 
 # Import old constants for backwards compatibility
-from launchpadlib.uris import STAGING_SERVICE_ROOT, EDGE_SERVICE_ROOT
+from launchpadlib.uris import STAGING_SERVICE_ROOT, EDGE_SERVICE_ROOT  # noqa: F401
 OAUTH_REALM = 'https://api.launchpad.net'
 
 
@@ -598,7 +598,6 @@ class Launchpad(ServiceRoot):
                 argument_name, argument_value, object_value,
                 object_name, argument_name, object_name))
 
-
     @classmethod
     def _get_paths(cls, service_root, launchpadlib_dir=None):
         """Locate launchpadlib-related user paths and ensure they exist.
diff --git a/src/launchpadlib/testing/helpers.py b/src/launchpadlib/testing/helpers.py
index 1afddf3..9bec27e 100644
--- a/src/launchpadlib/testing/helpers.py
+++ b/src/launchpadlib/testing/helpers.py
@@ -31,7 +31,7 @@ __all__ = [
     'nopriv_read_nonprivate',
     'salgado_read_nonprivate',
     'salgado_with_full_permissions',
-    ]
+]
 
 from contextlib import contextmanager
 
@@ -41,7 +41,7 @@ from launchpadlib.credentials import (
     AccessToken,
     Credentials,
     RequestTokenAuthorizationEngine,
-    )
+)
 
 
 missing = object()
diff --git a/src/launchpadlib/tests/test_credential_store.py b/src/launchpadlib/tests/test_credential_store.py
index 0aa308b..5ce9e1b 100644
--- a/src/launchpadlib/tests/test_credential_store.py
+++ b/src/launchpadlib/tests/test_credential_store.py
@@ -24,7 +24,7 @@ from base64 import b64decode
 
 if bytes is str:
     # Python 2
-    unicode_type = unicode
+    unicode_type = unicode  # noqa: F821
 else:
     unicode_type = str
 
diff --git a/src/launchpadlib/tests/test_launchpad.py b/src/launchpadlib/tests/test_launchpad.py
index 9a230d3..e21be2b 100644
--- a/src/launchpadlib/tests/test_launchpad.py
+++ b/src/launchpadlib/tests/test_launchpad.py
@@ -57,6 +57,7 @@ from launchpadlib.credentials import (
 # A dummy service root for use in tests
 SERVICE_ROOT = "http://api.example.com/"
 
+
 class TestResourceTypeClasses(unittest.TestCase):
     """launchpadlib must know about restfulclient's resource types."""
 
@@ -624,6 +625,7 @@ class TestCredenitialSaveFailedCallback(unittest.TestCase):
         # provided, it is called.
 
         callback_called = []
+
         def callback():
             # Since we can't rebind "callback_called" here, we'll have to
             # settle for mutating it to signal success.
diff --git a/src/launchpadlib/uris.py b/src/launchpadlib/uris.py
index 2456a34..ae74669 100644
--- a/src/launchpadlib/uris.py
+++ b/src/launchpadlib/uris.py
@@ -30,7 +30,7 @@ try:
     from urllib.parse import urlparse
 except ImportError:
     from urlparse import urlparse
-    
+
 import warnings
 from lazr.uri import URI
 
@@ -67,7 +67,7 @@ service_roots = dict(
 
 web_roots = dict(
     production=LPNET_WEB_ROOT,
-    edge = LPNET_WEB_ROOT,
+    edge=LPNET_WEB_ROOT,
     qastaging=QASTAGING_WEB_ROOT,
     staging=STAGING_WEB_ROOT,
     dogfood=DOGFOOD_WEB_ROOT,