Fix code minor issues from Codacy

README.md

@@ -23,7 +23,6 @@ To set CAMP on your project. There are two prerequisites:
 *   New configuration of the project can be achieved by:
 
     *   By substituting the FROM statement of a Dockerimage file
-
     *   By substituting an image of a docker-compose file
 
 Further, we need to identify variation points of your configuration,

camp/core.py

@@ -70,7 +70,7 @@ def _prepare_directories(self, arguments):
 
 
     def _load_model(self):
-        path, model, warnings = self._input.model
+        path, model, _ = self._input.model
         self._ui.model_loaded(path, model)
         model.accept(Checker(workspace=self._input.path))
         return model

camp/execute/engine.py

@@ -95,8 +95,8 @@ def find_all_files(self, extension, directory):
 class SimulatedShell(Shell):
 
 
-    def __init__(self, log, working_directory):
-        super(SimulatedShell, self).__init__(log, working_directory)
+    def __init__(self, log, working_directory, listener=None):
+        super(SimulatedShell, self).__init__(log, working_directory, listener)
 
 
     def _run_shell(self, command):

camp/execute/reporting/junit.py

@@ -17,9 +17,7 @@
     ErroneousTest, TestSuite
 from camp.execute.reporting.commons import ReportReader
 
-from os.path import abspath
-
-from xml.etree.ElementTree import fromstring
+from defusedxml.ElementTree import fromstring
 
 
 

camp/generate.py

@@ -362,7 +362,7 @@ def covered_values(self):
 
 
     def mark_as_covered(self, z3_solution):
-        for key, item in z3_solution.items():
+        for _, item in z3_solution.items():
             if "definition" in item:
                 definition = self.find(item["definition"])
                 if not definition in self.covered_components:

setup.py

@@ -45,6 +45,7 @@
           "PyYAML == 5.1",
           "jsonpath-rw == 1.4.0",
           "argparse == 1.2.1",
+          "defusedxml == 0.6.0",
           "ozepy @ git+https://github.com/STAMP-project/[email protected]#egg=ozepy"
       ],
       tests_require = test_dependencies,

tests/codecs/test_yaml_parsing.py

@@ -932,9 +932,10 @@ def test_when_omitting_test_report_pattern(self):
             path="components/server/tests/reports",
             candidates=["pattern"])
 
+
     def assert_missing(self, text, path, candidates):
         try:
-            model = self._codec.load_model_from(StringIO(text))
+            self._codec.load_model_from(StringIO(text))
             self.fail("InvalidYAMLModel should have been thrown!")
 
         except InvalidYAMLModel as error:

tests/commands/test_realize.py

@@ -30,7 +30,7 @@ def test_given_no_working_directory(self):
 
 
 
-    def test_given_no_working_directory(self):
+    def test_given_no_output_directory(self):
         command_line = "realize -d workspace"
 
         command = Command.extract_from(command_line.split())

tests/entities/test_coverage.py

@@ -61,7 +61,7 @@ def test_given_a_coverage_above_the_maximum_coverage(self):
                               values)
 
 
-    def test_given_a_coverage_above_the_maximum_coverage(self):
+    def test_given_a_coverage_way_above_the_maximum_coverage(self):
         values = Variable.cover(0, 6, 12)
 
         self._assertItemsEqual([0, 6],

tests/realize/test_docker.py

@@ -15,7 +15,6 @@
     Instance, Service, Feature, DockerImage, DockerFile
 from camp.realize import Builder
 
-from os import makedirs
 from os.path import isdir, join as join_paths
 
 from re import search

tests/realize/test_variables.py

@@ -15,9 +15,7 @@
 from camp.realize import Builder
 
 from os import makedirs
-from os.path import isdir, join as join_paths
-
-from shutil import rmtree
+from os.path import join as join_paths
 
 from tests.util import create_temporary_workspace