.coafile: Add PycodestyleBear

Adds PycodestyleBear in the autopep8 section and fixes the issues
discovered by the new bear.

Closes #3242

.coafile

@@ -19,7 +19,7 @@ preferred_quotation = '
 default_actions = *: ApplyPatchAction
 
 [autopep8]
-bears = PEP8Bear
+bears = PEP8Bear, PycodestyleBear
 
 default_actions = PEP8Bear: ApplyPatchAction
 

coala

@@ -15,15 +15,14 @@
 
 import sys
 
-# Start ignoring PyImportSortBear, we need to assert the version before
-# importing things that could cause an ImportError
+# Start ignoring PyImportSortBear and PycodestyleBear*, we need to assert the
+# version before importing things that could cause an ImportError
 from coalib import assert_supported_version
 
 assert_supported_version()
-# Stop ignoring
 
 from coalib.coala import main
-
+# Stop ignoring
 
 if __name__ == '__main__':
     sys.exit(main())

coalib/bearlib/abstractions/ExternalBearWrap.py

@@ -32,7 +32,7 @@ def _prepare_options(options):
             'Invalid keyword arguments provided: ' +
             ', '.join(repr(s) for s in sorted(superfluous_options)))
 
-    if not 'settings' in options:
+    if 'settings' not in options:
         options['settings'] = {}
 
 

coalib/bearlib/languages/Language.py

@@ -149,7 +149,7 @@ class Sub(cls, metaclass=SubLanguageMeta):
                 aliases = tuple(sorted(getattr(arg, 'aliases', ())))
                 _attributes = {name: member for name, member in getmembers(arg)
                                if not name.startswith('_')
-                               and not name in forbidden_attributes}
+                               and name not in forbidden_attributes}
 
             Sub.__name__ = arg.__name__
             type(cls).all.append(Sub)

coalib/coala.py

@@ -79,5 +79,6 @@ def main():
 
     return mode_normal(console_printer, log_printer)
 
+
 if __name__ == '__main__':  # pragma: no cover
     main()

coalib/coala_main.py

@@ -15,7 +15,9 @@
     settings_changed, update_settings_db, get_settings_hash)
 from coalib.misc.Constants import configure_logging
 
-do_nothing = lambda *args: True
+
+def do_nothing(*args):
+    return True
 
 
 def run_coala(console_printer=None,

coalib/collecting/Collectors.py

@@ -223,7 +223,7 @@ def filter_capabilities_by_languages(bears, languages):
             language_bears_capabilities.update(
                 {language: (capabilities[0] | bear.can_detect,
                             capabilities[1] | bear.CAN_FIX)}
-                            if language else {})
+                if language else {})
     return language_bears_capabilities
 
 

coalib/parsing/ConfParser.py

@@ -113,9 +113,11 @@ def __parse_lines(self, lines, origin):
                         Setting(key,
                                 value,
                                 origin,
-                                # Ignore PEP8Bear, it fails to format that
+                                # Start ignoring PEP8Bear, PycodestyleBear*
+                                # they fail to resolve this
                                 remove_empty_iter_elements=
                                 self.__remove_empty_iter_elements),
+                                # Stop ignoring
                         allow_appending=(keys == []))
                 else:
                     self.get_section(
@@ -124,9 +126,11 @@ def __parse_lines(self, lines, origin):
                             Setting(key,
                                     value,
                                     origin,
-                                    # Ignore PEP8Bear, it fails to format that
+                                    # Start ignoring PEP8Bear, PycodestyleBear*
+                                    # they fail to resolve this
                                     remove_empty_iter_elements=
                                     self.__remove_empty_iter_elements),
+                                    # Stop ignoring
                             allow_appending=(keys == []))
 
     def __init_sections(self):

coalib/settings/FunctionMetadata.py

@@ -133,8 +133,10 @@ def create_params_from_section(self, section):
 
     @staticmethod
     def _get_param(param, section, annotation):
+        def return_arg(x):
+            return x
         if annotation is None:
-            annotation = lambda x: x
+            annotation = return_arg
 
         try:
             return annotation(section[param])

coalib/settings/SectionFilling.py

@@ -80,7 +80,7 @@ def fill_section(section, acquire_settings, log_printer, bears):
     # Strip away existent settings.
     needed_settings = {}
     for setting, help_text in prel_needed_settings.items():
-        if not setting in section:
+        if setting not in section:
             needed_settings[setting] = help_text
 
     # Get missing ones.

setup.py

@@ -51,8 +51,9 @@ def run(self):
         errTwo = call(self.doc_command)
         sys.exit(errOne or errTwo)
 
+
 # Generate API documentation only if we are running on readthedocs.io
-on_rtd = getenv('READTHEDOCS', None) != None
+on_rtd = getenv('READTHEDOCS', None) is not None
 if on_rtd:
     call(BuildDocsCommand.apidoc_command)
     if 'dev' in VERSION:

tests/bearlib/abstractions/external_bear_wrap_testfiles/test_external_bear.py

@@ -2,13 +2,16 @@
 import sys
 import json
 
+# Start ignoring PycodestyleBear* as those imports may raise
+# import warnings
 sys.path.append(os.path.join(os.path.dirname(__file__),
                              '..', '..', '..', '..'))
 
 from coalib.results.Result import Result
 from coalib.results.SourceRange import SourceRange
 from coalib.output.JSONEncoder import create_json_encoder
 from coalib.results.RESULT_SEVERITY import RESULT_SEVERITY
+# Stop ignoring
 
 if __name__ == '__main__':
 

tests/coalaTest.py

@@ -27,9 +27,9 @@ def test_coala(self):
                 prepare_file(['#fixme'], None) as (lines, filename):
             retval, output = execute_coala(
                              coala.main,
-                            'coala', '-c', os.devnull,
-                            '-f', re.escape(filename),
-                            '-b', 'LineCountTestBear')
+                             'coala', '-c', os.devnull,
+                             '-f', re.escape(filename),
+                             '-b', 'LineCountTestBear')
             self.assertIn('This file has 1 lines.',
                           output,
                           'The output should report count as 1 lines')

tests/collecting/importers_test_dir/file_one.py

@@ -7,6 +7,7 @@ def __init__(self, *args):
     def method():
         pass
 
+
 a = [1, 2, 3]
 b = [1, 2, 4]
 

tests/results/SourcePositionTest.py

@@ -24,13 +24,13 @@ def test_string_conversion(self):
         self.assertRegex(
             repr(uut),
             "<SourcePosition object\\(file='.*filename', line=1, "
-                'column=None\\) at 0x[0-9a-fA-F]+>')
+            'column=None\\) at 0x[0-9a-fA-F]+>')
 
         uut = SourcePosition('None', None)
         self.assertRegex(
             repr(uut),
             "<SourcePosition object\\(file='.*None', line=None, column=None\\) "
-                'at 0x[0-9a-fA-F]+>')
+            'at 0x[0-9a-fA-F]+>')
 
     def test_json(self):
         with prepare_file([''], None) as (_, filename):