Code formatting with Black

Author: GjjvdBurg

clevercsv/consistency.py

@@ -13,6 +13,7 @@
 from .detect_type import type_score
 from .potential_dialects import get_dialects
 
+
 def detect_dialect_consistency(data, delimiters=None, verbose=False):
     """Detect the dialect with the data consistency measure
 
@@ -55,10 +56,7 @@ def detect_dialect_consistency(data, delimiters=None, verbose=False):
     for dialect in sorted(dialects):
         P = pattern_score(data, dialect)
         if P < Qmax:
-            log(
-                "%15r:\tP = %15.6f\tskip."
-                % (dialect, P)
-            )
+            log("%15r:\tP = %15.6f\tskip." % (dialect, P))
             continue
         T = type_score(data, dialect)
         Q = P * T

clevercsv/console/commands/detect.py

@@ -37,4 +37,4 @@ def handle(self):
             self.line(f"quotechar = {dialect.quotechar}".strip())
             self.line(f"escapechar = {dialect.escapechar}".strip())
         else:
-            self.line('Detected: ' + str(dialect))
+            self.line("Detected: " + str(dialect))

clevercsv/cparser_util.py

@@ -13,6 +13,7 @@
 
 _FIELD_SIZE_LIMIT = 128 * 1024
 
+
 def field_size_limit(*args, **kwargs):
     """Get/Set the limit to the field size.
 

clevercsv/detect_type.py

@@ -249,7 +249,6 @@ def is_unix_path(self, cell):
         return self._run_regex(cell, "unix_path")
 
 
-
 def gen_known_type(cells):
     """
     Utility that yields a generator over whether or not the provided cells are 

clevercsv/dialect.py

@@ -120,7 +120,7 @@ def __eq__(self, other):
         return self.__key() == other.__key()
 
     def __lt__(self, other):
-        # This provides a partial order on dialect objects with the goal of 
+        # This provides a partial order on dialect objects with the goal of
         # speeding up the consistency measure.
         if not isinstance(other, SimpleDialect):
             return False

clevercsv/escape.py

@@ -43,8 +43,20 @@ def is_potential_escapechar(char, encoding, block_char=None):
 
     ctr = unicodedata.category(as_unicode)
     if block_char is None:
-        block_char = ["!", "?", '"', "'", ".", ",", ";", ":", "%", "*", "&", 
-                "#"]
+        block_char = [
+            "!",
+            "?",
+            '"',
+            "'",
+            ".",
+            ",",
+            ";",
+            ":",
+            "%",
+            "*",
+            "&",
+            "#",
+        ]
     if ctr == "Po":
         if as_unicode in block_char:
             return False

clevercsv/exceptions.py

@@ -9,8 +9,10 @@
 
 from .cparser import Error as ParserError
 
+
 class Error(ParserError):
     pass
 
+
 class NoDetectionResult(Exception):
     pass

clevercsv/read.py

@@ -15,6 +15,7 @@
 from .dialect import SimpleDialect
 from .exceptions import Error
 
+
 class reader(object):
     def __init__(self, csvfile, dialect="excel", **fmtparams):
         self.csvfile = csvfile

tests/test_unit/test_detect.py

@@ -103,14 +103,16 @@ def test_delimiters(self):
     def test_has_header(self):
         detector = Detector()
         self.assertEqual(detector.has_header(self.sample1), False)
-        self.assertEqual(detector.has_header(self.header1 + self.sample1), 
-                True)
+        self.assertEqual(
+            detector.has_header(self.header1 + self.sample1), True
+        )
 
     def test_has_header_regex_special_delimiter(self):
         detector = Detector()
         self.assertEqual(detector.has_header(self.sample8), False)
-        self.assertEqual(detector.has_header(self.header2 + self.sample8), 
-                True)
+        self.assertEqual(
+            detector.has_header(self.header2 + self.sample8), True
+        )
 
 
 if __name__ == "__main__":

tests/test_unit/test_detect_pattern.py

@@ -28,7 +28,8 @@ def test_abstraction_1(self):
 
     def test_abstraction_2(self):
         out = detect_pattern.make_abstraction(
-            "A,\rA,A,A\r", SimpleDialect(delimiter=",", quotechar="", escapechar="")
+            "A,\rA,A,A\r",
+            SimpleDialect(delimiter=",", quotechar="", escapechar=""),
         )
         exp = "CDCRCDCDC"
         self.assertEqual(exp, out)
@@ -73,7 +74,8 @@ def test_abstraction_7(self):
 
     def test_abstraction_8(self):
         out = detect_pattern.make_abstraction(
-            ',"",,\r\n', SimpleDialect(delimiter=",", quotechar='"', escapechar="")
+            ',"",,\r\n',
+            SimpleDialect(delimiter=",", quotechar='"', escapechar=""),
         )
         exp = "CDCDCDC"
         self.assertEqual(exp, out)
@@ -84,42 +86,48 @@ def test_abstraction_8(self):
 
     def test_abstraction_9(self):
         out = detect_pattern.make_abstraction(
-            "A,B|,C", SimpleDialect(delimiter=",", quotechar="", escapechar="|")
+            "A,B|,C",
+            SimpleDialect(delimiter=",", quotechar="", escapechar="|"),
         )
         exp = "CDC"
         self.assertEqual(exp, out)
 
     def test_abstraction_10(self):
         out = detect_pattern.make_abstraction(
-            'A,"B,C|"D"', SimpleDialect(delimiter=",", quotechar='"', escapechar="|")
+            'A,"B,C|"D"',
+            SimpleDialect(delimiter=",", quotechar='"', escapechar="|"),
         )
         exp = "CDC"
         self.assertEqual(exp, out)
 
     def test_abstraction_11(self):
         out = detect_pattern.make_abstraction(
-            "a,|b,c", SimpleDialect(delimiter=",", quotechar="", escapechar="|")
+            "a,|b,c",
+            SimpleDialect(delimiter=",", quotechar="", escapechar="|"),
         )
         exp = "CDCDC"
         self.assertEqual(exp, out)
 
     def test_abstraction_12(self):
         out = detect_pattern.make_abstraction(
-            "a,b|,c", SimpleDialect(delimiter=",", quotechar="", escapechar="|")
+            "a,b|,c",
+            SimpleDialect(delimiter=",", quotechar="", escapechar="|"),
         )
         exp = "CDC"
         self.assertEqual(exp, out)
 
     def test_abstraction_13(self):
         out = detect_pattern.make_abstraction(
-            'a,"b,c|""', SimpleDialect(delimiter=",", quotechar='"', escapechar="|")
+            'a,"b,c|""',
+            SimpleDialect(delimiter=",", quotechar='"', escapechar="|"),
         )
         exp = "CDC"
         self.assertEqual(exp, out)
 
     def test_abstraction_14(self):
         out = detect_pattern.make_abstraction(
-            "a,b||c", SimpleDialect(delimiter=",", quotechar="", escapechar="|")
+            "a,b||c",
+            SimpleDialect(delimiter=",", quotechar="", escapechar="|"),
         )
         exp = "CDC"
         self.assertEqual(exp, out)

tests/test_unit/test_normal_forms.py

@@ -50,7 +50,7 @@ def test_form_2(self):
         self.assertFalse(is_form_2('a,"",3\n1,2,3', dialect))
 
     def test_form_3(self):
-        A = SimpleDialect(delimiter=',', quotechar="'", escapechar="")
+        A = SimpleDialect(delimiter=",", quotechar="'", escapechar="")
         Q = SimpleDialect(delimiter=",", quotechar='"', escapechar="")
 
         self.assertTrue(is_form_3('A,B\nC,"D"', Q))
@@ -59,9 +59,8 @@ def test_form_3(self):
         self.assertFalse(is_form_3('A,\nC,"d,e"', Q))
         self.assertFalse(is_form_3("3;4,B\nC,D", Q))
 
-        self.assertFalse(is_form_3("A,B\n\"C\",D\n", A))
-        self.assertTrue(is_form_3("A,B\n\"C\",D\n", Q))
-
+        self.assertFalse(is_form_3('A,B\n"C",D\n', A))
+        self.assertTrue(is_form_3('A,B\n"C",D\n', Q))
 
     def test_form_4(self):
         quoted = SimpleDialect(delimiter="", quotechar='"', escapechar="")
@@ -90,5 +89,6 @@ def test_form_5(self):
         self.assertFalse(is_form_5("A,B\n1,\n2,3", dialect))
         self.assertFalse(is_form_5('"A,""B"""\n"1,"\n"2,3"', dialect))
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()

tests/test_unit/test_potential_dialects.py

@@ -41,5 +41,6 @@ def test_get_delimiters(self):
         out = get_delimiters(data, "UTF-8")
         self.assertEqual(out, exp)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()

tests/test_unit/test_wrappers.py

@@ -106,7 +106,7 @@ def test_read_csv(self):
             self._read_test_rows(rows, exp)
 
         # This raises a NoDetectionResult due to the spacing after the
-        # delimiter, which confuses the detection algorithm. Support for 
+        # delimiter, which confuses the detection algorithm. Support for
         # detecting 'skipinitialspace' should fix this problem.
         rows = ['1, "AA"', '2, "BB"', '3, "CC"']
         exp = [["1", "AA"], ["2", "BB"], ["3", "CC"]]