Fix some pylint/pep8 issues, silence others

crobinso · crobinso · commit 096c624138be · 2019-01-09T15:21:35.000-05:00
diff --git a/bugzilla/_cli.py b/bugzilla/_cli.py
@@ -14,6 +14,7 @@
 
 from __future__ import print_function
 
+import errno
 import locale
 from logging import getLogger, DEBUG, INFO, WARN, StreamHandler, Formatter
 import argparse
@@ -85,7 +86,7 @@ def open_without_clobber(name, *args):
         try:
             fd = os.open(name, os.O_CREAT | os.O_EXCL, 0o666)
         except OSError as err:
-            if err.errno == os.errno.EEXIST:
+            if err.errno == errno.EEXIST:
                 name = "%s.%i" % (orig_name, count)
                 count += 1
             else:
@@ -705,7 +706,7 @@ def bug_field(matchobj):
         if fieldname == "flag" and rest:
             val = b.get_flag_status(rest)
 
-        elif fieldname == "flags" or fieldname == "flags_requestee":
+        elif fieldname in ["flags", "flags_requestee"]:
             tmpstr = []
             for f in getattr(b, "flags", []):
                 requestee = f.get('requestee', "")
@@ -979,8 +980,6 @@ def _do_get_attach(bz, opt):
             data = att.read(4096)
         print("Wrote %s" % outfile.name)
 
-    return
-
 
 def _do_set_attach(bz, opt, parser):
     if not opt.ids:
diff --git a/bugzilla/transport.py b/bugzilla/transport.py
@@ -159,6 +159,7 @@ def _request_helper(self, url, request_body):
         response.
         """
         response = None
+        # pylint: disable=try-except-raise
         try:
             response = self.session.post(
                 url, data=request_body, **self.request_defaults)
diff --git a/tests/pycodestyle.cfg b/tests/pycodestyle.cfg
@@ -8,5 +8,6 @@ format = pylint
 # [E303] Too many blank lines
 # [E402] module level import not at top of file
 # [E731] do not assign a lambda expression, use a def
+# [W504] line break after binary operator
 
-ignore=E125,E128,E129,E303,E402,E731
+ignore=E125,E128,E129,E303,E402,E731,W504
diff --git a/tests/pylint.cfg b/tests/pylint.cfg
@@ -7,7 +7,7 @@ persistent=no
 # can either give multiple identifier separated by comma (,) or put this option
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once).
-disable=Design,Format,Similarities,invalid-name,missing-docstring,locally-disabled,unnecessary-lambda,star-args,fixme,global-statement,broad-except,no-self-use,bare-except,locally-enabled,wrong-import-position,consider-using-ternary,len-as-condition,no-else-return
+disable=Design,Format,Similarities,invalid-name,missing-docstring,locally-disabled,unnecessary-lambda,star-args,fixme,global-statement,broad-except,no-self-use,bare-except,locally-enabled,wrong-import-position,consider-using-ternary,len-as-condition,no-else-return,useless-object-inheritance,inconsistent-return-statements,consider-using-dict-comprehension
 enable=fixme
 
 
