Refactor: Resolve remaining flake8 violations

- E304 blank lines found after function decorator
- E402 module level import not at top of file
- E741 ambiguous variable name 'l'
- F522 '...'.format(...) has unused named argument(s): end
- W601 .has_key() is deprecated, use 'in'

Change-Id: I2607e7bb195f6175a7b331e89870fa23e225e31c
Signed-off-by: Thanh Ha <zxiiro@gmail.com>

diff --git a/.flake8 b/.flake8
new file mode 100644 (file)
index 0000000..e0b762b
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,4 @@
+[flake8]
+max-line-length = 120
+# E203 and W503 are not python-black compatible
+ignore = E203,W503

diff --git a/docs/conf.py b/docs/conf.py
index 40f03fa..c76c199 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,7 +25,7 @@ import sphinx_bootstrap_theme  # noqa
 sys.path.insert(0, os.path.abspath(".."))
 
 from docs_conf.conf import *  # noqa
-from pbr.version import VersionInfo
+from pbr.version import VersionInfo  # noqa
 
 version = str(VersionInfo("lftools"))
 release = str(VersionInfo("lftools"))

diff --git a/lftools/cli/deploy.py b/lftools/cli/deploy.py
index 27b1b19..4500501 100644 (file)
--- a/lftools/cli/deploy.py
+++ b/lftools/cli/deploy.py
@@ -156,7 +156,6 @@ def s3(ctx, s3_bucket, s3_path, build_url, workspace, pattern):
 @click.argument("nexus-url", envvar="NEXUS_URL")
 @click.argument("repo-id", envvar="REPO_ID")
 @click.argument("file-name", envvar="FILE_NAME")
-
 # Maven Config
 @click.option("-b", "--maven-bin", envvar="MAVEN_BIN", help="Path of maven binary.")
 @click.option("-gs", "--global-settings", envvar="GLOBAL_SETTINGS_FILE", help="Global settings file.")

diff --git a/lftools/cli/infofile.py b/lftools/cli/infofile.py
index d12c27d..d71dd9b 100644 (file)
--- a/lftools/cli/infofile.py
+++ b/lftools/cli/infofile.py
@@ -139,7 +139,7 @@ tsc:
           name: ''
           link: ''
 """.format(
-        tsc_approval, end=""
+        tsc_approval
     )
     empty_committer = """    - name: ''
       email: ''
@@ -151,7 +151,7 @@ tsc:
     print("repositories:")
     print("    - {}".format(gerrit_project))
     print("committers:")
-    print("    - <<: *{1}_{0}_ptl".format(project_underscored, umbrella, end=""))
+    print("    - <<: *{1}_{0}_ptl".format(project_underscored, umbrella))
     if not empty:
         this = helper_yaml4info(ldap_group)
         print(this, end="")

diff --git a/lftools/cli/ldap_cli.py b/lftools/cli/ldap_cli.py
index 0088f6e..241cbdf 100644 (file)
--- a/lftools/cli/ldap_cli.py
+++ b/lftools/cli/ldap_cli.py
@@ -102,7 +102,7 @@ def csv(ctx, ldap_server, ldap_group_base, ldap_user_base, groups):
             ldap_object.protocol_version = ldap.VERSION3
             ldap_object.simple_bind_s()
         except ldap.LDAPError as e:
-            if type(e.message) == dict and e.message.has_key("desc"):
+            if type(e.message) == dict and "desc" in e.message:
                 print(e.message["desc"])
             else:
                 print(e)
@@ -159,24 +159,24 @@ def csv(ctx, ldap_server, ldap_group_base, ldap_user_base, groups):
         )
 
     def main(groups):
-        """Preform an LDAP query."""
-        l = ldap.initialize(ldap_server)
-        ldap_connect(l)
+        """Perform an LDAP query."""
+        ldap_obj = ldap.initialize(ldap_server)
+        ldap_connect(ldap_obj)
         for arg in groups:
-            groups = ldap_query(l, ldap_group_base, "cn=%s" % arg, ["member"])
+            groups = ldap_query(ldap_obj, ldap_group_base, "cn=%s" % arg, ["member"])
             group_dict = package_groups(groups)
             cut_length = len(ldap_group_base) + 1
             for group_bar in group_dict:
                 group_name = group_bar["name"][3:-cut_length]
                 for user in group_bar["members"]:
                     user = user.decode("utf-8")
-                    user_info = ldap_query(l, ldap_user_base, user, ["uid", "cn", "mail"])
+                    user_info = ldap_query(ldap_obj, ldap_user_base, user, ["uid", "cn", "mail"])
                     try:
                         print("%s,%s" % (group_name, user_to_csv(user_info)))
                     except Exception:
                         eprint("Error parsing user: %s" % user)
                         continue
-        ldap_disconnect(l)
+        ldap_disconnect(ldap_obj)
 
     main(groups)
 

diff --git a/lftools/openstack/stack.py b/lftools/openstack/stack.py
index f77fefe..3e58c46 100644 (file)
--- a/lftools/openstack/stack.py
+++ b/lftools/openstack/stack.py
@@ -107,7 +107,7 @@ def cost(os_cloud, stack_name):
         resources = []
 
         def _is_nested(resource):
-            link_types = [l["rel"] for l in resource.links]
+            link_types = [link["rel"] for link in resource.links]
             if "nested" in link_types:
                 return True
             return False