new lint fixes (#75)

Author: ronanstokes-db

dbldatagen/data_generator.py

@@ -93,7 +93,7 @@ def __init__(self, sparkSession=None, name=None, randomSeedMethod=None,
         self._seedMethod = randomSeedMethod
 
         if randomSeed is None:
-            self._instanceRandomSeed =  self._randomSeed
+            self._instanceRandomSeed = self._randomSeed
 
             if randomSeedMethod is None:
                 self._seedMethod = RANDOM_SEED_HASH_FIELD_NAME
@@ -358,7 +358,7 @@ def _processOptions(self):
         for key, value in self._options.items():
             if key == "startingId":
                 self.starting_id = value
-            elif key == "rowCount" or key == "row_count":
+            elif key in ["rowCount", "row_count"]:
                 self._rowCount = value
         return self
 

dbldatagen/datagen_constants.py

@@ -25,4 +25,3 @@
 RANDOM_SEED_RANDOM_FLOAT = -1.0
 RANDOM_SEED_FIXED = "fixed"
 RANDOM_SEED_HASH_FIELD_NAME = "hash_fieldname"
-

dbldatagen/text_generator_plugins.py

@@ -364,13 +364,14 @@ def _loadLibrary(self, lib):
             raise DataGenError("Could not load or initialize Faker library", err)
 
 
-
-
-
 def fakerText(mname, *args, _lib=None, _rootClass=None, **kwargs):
     """Generate faker text generator object using default FakerTextFactory
        instance
 
+       :param mname: method name to invoke
+       :param args: positional args to be passed to underlying Faker instance
+       :param _lib: internal only param - library to load
+       :param _rootClass: internal only param - root class to create
        :returns : instance of PyfuncText for use with Faker
 
        ``fakerText("sentence")`` is same as ``FakerTextFactory()("sentence")``

dbldatagen/text_generators.py

@@ -279,8 +279,8 @@ def stringsFromSingleTemplate(self, baseValue, genTemplate, escapeSpecialMeaning
         use_value = False
         template_len = len(genTemplate)
 
-        # in the following code, the construct `(not escape) ^ self._escapeSpecialMeaning` means apply special meaning if
-        # either escape is not true or the option `self._escapeSpecialMeaning` is true.
+        # in the following code, the construct `(not escape) ^ self._escapeSpecialMeaning` means apply
+        # special meaning if either escape is not true or the option `self._escapeSpecialMeaning` is true.
         # This corresponds to the logical xor operation
         for i in range(0, template_len):
             char = genTemplate[i]

dbldatagen/utils.py

@@ -44,6 +44,7 @@ class DataGenError(Exception):
     def __init__(self, msg, baseException=None):
         """ constructor
         """
+        super().__init__(msg)
         self._underlyingException = baseException
         self._msg = msg
 

tests/test_basic_test.py

@@ -355,7 +355,6 @@ def test_percent_nulls(self):
         self.assertGreaterEqual( percent_nulls_observed, 5.0)
 
 
-
 # run the tests
 # if __name__ == '__main__':
 #  print("Trying to run tests")

tests/test_data_generation_plugins.py

@@ -13,7 +13,6 @@ class TestTextGenerationPlugins(unittest.TestCase):
     row_count = 15000
     column_count = 10
 
-
     def test_plugins(self):
         partitions_requested = 4
         data_rows = 100 * 1000
@@ -176,7 +175,7 @@ def initPluginContext(context):
         output = list(textGen.pandasGenerateText(inputSeries))
 
         for x in output:
-            self.assertEquals(x, "testing1again")
+            self.assertEqual(x, "testing1again")
 
     def test_plugins_faker_integration(self):
         """ test faker integration with mock objects"""
@@ -235,13 +234,6 @@ def test_plugins_faker_integration2(self):
             self.assertTrue(x["name"].startswith("<MagicMock"))
 
 
-
-
-
-
-
-
-
 # run the tests
 # if __name__ == '__main__':
 #  print("Trying to run tests")

tests/test_quick_tests.py

@@ -699,7 +699,6 @@ def test_strings_from_numeric_string_field4(self):
         self.assertEqual(rowCount, 0)
 
 
-
 # run the tests
 # if __name__ == '__main__':
 #  print("Trying to run tests")