Formatted text using flake8

Author: burgerbecky

docs/build_rules.py

@@ -85,8 +85,7 @@ def build(working_directory, configuration):
             run_command(
                 ("dot", "-Tpng", item, "-otemp{0}images{0}{1}.png".format(
                     os.sep, item[:-4])),
-                    working_dir=working_directory)
-
+                working_dir=working_directory)
 
     # Get the input and output file names
     source = os.path.join(os.path.dirname(working_directory), "README.rst")

makeprojects/__init__.py

@@ -78,7 +78,7 @@
 ########################################
 
 # Current version of the library as a numeric tuple
-__numversion__ = (1, 1, 0)
+__numversion__ = (1, 1, 1)
 
 # Current version of the library
 __version__ = ".".join([str(num) for num in __numversion__])

makeprojects/build_rules.py

@@ -97,12 +97,12 @@
 # without any parameters, default create recommended
 # project for the host machine
 MAKEPROJECTS = (
-# This example builds Visual Studio 2019 and 2022 for Windows
-#    {"platform": "windows",
-#     "type": "library",
-#     "name": "project",
-#     "configuration": "Release",
-#     "ide": ("vs2019", "vs2022")},
+    # This example builds Visual Studio 2019 and 2022 for Windows
+    #    {"platform": "windows",
+    #     "type": "library",
+    #     "name": "project",
+    #     "configuration": "Release",
+    #     "ide": ("vs2019", "vs2022")},
 )
 
 ########################################

makeprojects/codewarrior.py

@@ -44,6 +44,7 @@
 # pylint: disable=consider-using-f-string
 # pylint: disable=too-few-public-methods
 # pylint: disable=useless-object-inheritance
+# pylint: disable=possibly-used-before-assignment
 
 from __future__ import absolute_import, print_function, unicode_literals
 
@@ -338,7 +339,7 @@ def build(self):
                             self.file_name))[0],
                     self.configuration))
             cmd = ['cmdide', '-proj', '-bcwef', error_file,
-                '-y', cw_path, '-z', self.configuration, self.file_name]
+                   '-y', cw_path, '-z', self.configuration, self.file_name]
 
         if self.verbose:
             print(' '.join(cmd))
@@ -397,7 +398,7 @@ def match(filename):
 
 
 def create_build_object(file_name, priority=50,
-                 configurations=None, verbose=False):
+                        configurations=None, verbose=False):
     """
     Create BuildMakeFile build records for every desired configuration
 
@@ -434,13 +435,13 @@ def create_build_object(file_name, priority=50,
         if '68K Linker' in linkers:
             print(
                 ('"{}" requires a 68k linker '
-                'which Windows doesn\'t support.').format(file_name))
+                 'which Windows doesn\'t support.').format(file_name))
             return []
 
         if 'PPC Linker' in linkers:
             print(
                 ('"{}" requires a PowerPC linker '
-                'which Windows doesn\'t support.').format(file_name))
+                 'which Windows doesn\'t support.').format(file_name))
             return []
 
     # If everything is requested, then only build 'Everything'
@@ -473,7 +474,7 @@ def create_build_object(file_name, priority=50,
 
 
 def create_clean_object(file_name, priority=50,
-                 configurations=None, verbose=False):
+                        configurations=None, verbose=False):
     """
     Create BuildMakeFile build records for every desired configuration
 
@@ -510,13 +511,13 @@ def create_clean_object(file_name, priority=50,
         if '68K Linker' in linkers:
             print(
                 ("\"{}\" requires a 68k linker "
-                "which Windows doesn't support.").format(file_name))
+                 "which Windows doesn't support.").format(file_name))
             return []
 
         if "PPC Linker" in linkers:
             print(
                 ('"{}" requires a PowerPC linker '
-                'which Windows doesn\'t support.').format(file_name))
+                 'which Windows doesn\'t support.').format(file_name))
             return []
 
     # If everything is requested, then only build 'Everything'
@@ -1132,7 +1133,7 @@ def generate(self, line_list, level=4):
         line_list.append(tabs + "<FILE>")
         line_list.append(tabs2 + "<PATHTYPE>Name</PATHTYPE>")
         line_list.append(tabs2 + "<PATH>" + self.filename + "</PATH>")
-        line_list.append(tabs2 + "<PATHFORMAT>" + \
+        line_list.append(tabs2 + "<PATHFORMAT>" +
                          self.format + "</PATHFORMAT>")
         line_list.append(tabs2 + "<FILEKIND>" + self.kind + "</FILEKIND>")
         line_list.append(tabs2 + "<FILEFLAGS>" + self.flags + "</FILEFLAGS>")
@@ -1175,7 +1176,7 @@ def generate(self, line_list, level=4):
                              "</TARGETNAME>")
         line_list.append(tabs2 + "<PATHTYPE>Name</PATHTYPE>")
         line_list.append(tabs2 + "<PATH>" + self.filename + "</PATH>")
-        line_list.append(tabs2 + "<PATHFORMAT>" + \
+        line_list.append(tabs2 + "<PATHFORMAT>" +
                          self.format + "</PATHFORMAT>")
         line_list.append(tabs + "</FILEREF>")
 
@@ -1572,7 +1573,8 @@ def __init__(self, solution, projectname=None,
                                     break
                             else:
                                 # Insert the library
-                                item = "MFCcw_D.lib" if configuration.debug else "MFCcw.lib"
+                                item = "MFCcw_D.lib" \
+                                    if configuration.debug else "MFCcw.lib"
                                 liblist.insert(0, item)
 
                 # Generate the file and group lists

makeprojects/core.py

@@ -49,7 +49,8 @@ class Attributes(object):
         cw_environment_variables: List of CodeWarrior environment variables
         custom_rules: Custom build rules
         platform: @ref makeprojects.enums.PlatformTypes enum for target platform
-        project_type: @ref makeprojects.enums.ProjectTypes enum for target output
+        project_type: @ref makeprojects.enums.ProjectTypes
+            enum for target output
         debug: Boolean for debug information generation
         link_time_code_generation: Boolean for LTCG
         optimization: Boolean for optimization enable
@@ -66,15 +67,17 @@ class Attributes(object):
         _platform: platform value
         _project_type: True @ref makeprojects.core.Attributes.project_type
         _debug: True @ref makeprojects.core.Attributes.debug
-        _link_time_code_generation: True @ref makeprojects.core.Attributes.link_time_code_generation
+        _link_time_code_generation: True
+            @ref makeprojects.core.Attributes.link_time_code_generation
         _optimization: True @ref makeprojects.core.Attributes.optimization
         _exceptions: False @ref makeprojects.core.Attributes.exceptions
         _analyze: True @ref makeprojects.core.Attributes.analyze
         _use_mfc: @ref makeprojects.core.Attributes.use_mfc
         _use_atl: @ref makeprojects.core.Attributes.use_atl
         _clr_support: @ref makeprojects.core.Attributes.clr_support
         _name: True @ref makeprojects.core.Attributes.name
-        _working_directory: True @ref makeprojects.core.Attributes.working_directory
+        _working_directory: True
+            @ref makeprojects.core.Attributes.working_directory
         _deploy_folder: True @ref makeprojects.core.Attributes.deploy_folder
         _fastcall: None @ref makeprojects.core.Attributes.fastcall
     """
@@ -499,8 +502,9 @@ class SourceFile(object):
     for processing.
 
     @note
-    For hash consistency, @ref makeprojects.core.SourceFile.relative_pathname has all directory
-    slashes in Windows format "\" instead of Linux/BSD format on all platforms.
+    For hash consistency, @ref makeprojects.core.SourceFile.relative_pathname
+    has all directory slashes in Windows format "\" instead of Linux/BSD
+    format on all platforms.
 
     Attributes:
         relative_pathname: File base name with extension
@@ -598,7 +602,7 @@ def __repr__(self):
         """
 
         return "FileType: {} Pathname: \"{}\"".format(str(self.type),
-                                                    self.get_abspath())
+                                                      self.get_abspath())
 
     def __str__(self):
         """
@@ -1276,7 +1280,8 @@ class Solution(Attributes):
         ide_code: IDE code for generation
         platform_code: Platform code for generation
         project_list: List of dependent projects
-        project_type: @ref makeprojects.enums.ProjectTypes enum for target output
+        project_type: @ref makeprojects.enums.ProjectTypes enum
+            for target output
         post_process: Python function to handle post processing
         _ide: Private instance of @ref makeprojects.enums.IDETypes
     """
@@ -1551,8 +1556,8 @@ def generate(self, ide=None):
         # No configurations passed? Abort
         if not configuration_list:
             print(
-                "Generator for IDE \"{}\" is incompatible with platform \"{}\"".format(
-                    ide, last_failed))
+                ("Generator for IDE \"{}\" is incompatible with platform "
+                 "\"{}\"").format(ide, last_failed))
             return 10
 
         # Get the platform code

makeprojects/masm_support.py

@@ -86,6 +86,6 @@ def make_masm_command(command_dict, source_file):
     cmd = convert_file_name(" ".join(cmd), source_file)
     description = convert_file_name(
         "Assembling %(FileName)%(Extension)...", source_file)
-    outputs = [convert_file_name(x, source_file) for x in outputs]    
+    outputs = [convert_file_name(x, source_file) for x in outputs]
 
     return cmd, description, outputs

makeprojects/watcom.py

@@ -110,8 +110,8 @@ def build(self):
         if watcom_path is None:
             file_name = self.file_name
             return BuildError(0, file_name,
-                msg="{} requires Watcom to be installed to build!".format(
-                    file_name))
+                              msg=("{} requires Watcom to be installed "
+                                   "to build!").format(file_name))
 
         # Watcom requires the path set up so it can access link files
         exe_name = where_is_watcom("wmake", verbose=self.verbose)
@@ -188,7 +188,7 @@ def match(filename):
 
 
 def create_build_object(file_name, priority=50,
-                 configurations=None, verbose=False):
+                        configurations=None, verbose=False):
     """
     Create BuildWatcomFile build records for every desired configuration
 
@@ -219,7 +219,7 @@ def create_build_object(file_name, priority=50,
 
 
 def create_clean_object(file_name, priority=50,
-                 configurations=None, verbose=False):
+                        configurations=None, verbose=False):
     """
     Create BuildWatcomFile clean records for every desired configuration
 
@@ -393,8 +393,8 @@ def __init__(self, solution):
 
                 # Get the rule list
                 rule_list = (configuration.custom_rules,
-                    configuration.parent.custom_rules,
-                    configuration.parent.parent.custom_rules)
+                             configuration.parent.custom_rules,
+                             configuration.parent.parent.custom_rules)
                 get_custom_list(custom_list, rule_list, codefiles)
 
         self.custom_list = custom_list
@@ -720,8 +720,8 @@ def _write_phony_binaries(self, line_list):
                     "",
                     target_name + ": .SYMBOLIC",
                     "\t@if not exist bin @mkdir bin",
-   	                "\t@if not exist \"temp\\{0}\" @mkdir \"temp\\{0}\"".format(
-   	                    bin_folder),
+                    "\t@if not exist \"temp\\{0}\" @mkdir \"temp\\{0}\"".format(
+                        bin_folder),
                     "\t@set CONFIG=" + configuration.name,
                     "\t@set TARGET=" + platform_short_code,
                     "\t@%make bin\\" + bin_name
@@ -1454,7 +1454,7 @@ def write_builds(self, line_list, has_rez):
                 line_list.extend([
                     "\t@SET WOW={$+$(OBJS)$-}",
                     "\t@echo Performing link...",
-                    "\t@$(LINK) $(LFlags" + configuration.name + \
+                    "\t@$(LINK) $(LFlags" + configuration.name +
                     configuration.platform.get_short_code() + ") "
                     "NAME $^@ FILE @wow"
                 ])

unittests/test_cleanme.py

@@ -12,8 +12,6 @@
 
 """
 
-# pylint: disable=wrong-import-position
-
 import sys
 import unittest
 import os
@@ -24,6 +22,8 @@
 # Insert the location of makeprojects at the begining so it's the first
 # to be processed
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+# pylint: disable=wrong-import-position
 import makeprojects
 from makeprojects.config import BUILD_RULES_PY
 
@@ -70,10 +70,8 @@ def setUp(self):
         # Make sure anything left behind is removed
         self.addCleanup(shutil.rmtree, self.tmpdir)
 
-
 ########################################
 
-
     def tearDown(self):
         """
         Restore directory
@@ -82,10 +80,8 @@ def tearDown(self):
         # Restore the working directory, if the test did not.
         os.chdir(self.saved_cwd)
 
-
 ########################################
 
-
     @staticmethod
     def mkdir(path, *paths):
         """
@@ -155,7 +151,7 @@ def test_cleanme(self):
             _IMPORT_BURGER,
             _DEF_CLEAN,
             ("\tburger.clean_directories(working_directory, "
-            "(\"temp\", \"bin\"))"),
+             "(\"temp\", \"bin\"))"),
             _RETURN_NONE]
         )
         # Make sure it was written

unittests/test_empty.py

@@ -12,8 +12,6 @@
 
 """
 
-# pylint: disable=wrong-import-position
-
 import os
 import sys
 import unittest
@@ -24,8 +22,9 @@
 # Insert the location of makeprojects at the begining so it's the first
 # to be processed
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from makeprojects.enums import IDETypes
+# pylint: disable=wrong-import-position
 import makeprojects
+from makeprojects.enums import IDETypes
 
 ########################################
 
@@ -42,15 +41,14 @@ def setUp(self):
         """
         Handle temporary directory
         """
+
         self.saved_cwd = os.getcwd()
         self.tmpdir = os.path.realpath(tempfile.mkdtemp())
         # Make sure anything left behind is removed
         self.addCleanup(shutil.rmtree, self.tmpdir)
 
-
 ########################################
 
-
     def tearDown(self):
         """
         Restore directory