Fix

Author: jaredmdobson

mysql_ch_replicator/converter_enum_parser.py

@@ -1,3 +1,5 @@
+
+
 def parse_mysql_enum(enum_definition):
     """
     Accepts a MySQL ENUM definition string (case–insensitive),
@@ -20,7 +22,7 @@ def parse_mysql_enum(enum_definition):
         raise ValueError("String does not start with 'enum'")
 
     # Find the first opening parenthesis.
-    pos = s.find("(")
+    pos = s.find('(')
     if pos == -1:
         raise ValueError("Missing '(' in the enum definition")
 
@@ -46,22 +48,22 @@ def _extract_parenthesized_content(s, start_index):
     ', " or `) and also to skip over escape sequences in single/double quotes.
     (Backticks do not process backslash escapes.)
     """
-    if s[start_index] != "(":
+    if s[start_index] != '(':
         raise ValueError("Expected '(' at position {}".format(start_index))
     depth = 1
     i = start_index + 1
     content_start = i
     in_quote = None  # will be set to a quoting character when inside a quoted literal
 
     # Allow these quote characters.
-    allowed_quotes = ("'", '"', "`")
+    allowed_quotes = ("'", '"', '`')
 
     while i < len(s):
         c = s[i]
         if in_quote:
             # Inside a quoted literal.
             if in_quote in ("'", '"'):
-                if c == "\\":
+                if c == '\\':
                     # Skip the escape character and the next character.
                     i += 2
                     continue
@@ -85,16 +87,16 @@ def _extract_parenthesized_content(s, start_index):
                 in_quote = c
                 i += 1
                 continue
-            elif c == "(":
+            elif c == '(':
                 depth += 1
                 i += 1
                 continue
-            elif c == ")":
+            elif c == ')':
                 depth -= 1
                 i += 1
                 if depth == 0:
                     # Return the substring inside (excluding the outer parentheses)
-                    return s[content_start : i - 1], i
+                    return s[content_start:i - 1], i
                 continue
             else:
                 i += 1
@@ -114,7 +116,7 @@ def _parse_enum_values(content):
     """
     values = []
     i = 0
-    allowed_quotes = ("'", '"', "`")
+    allowed_quotes = ("'", '"', '`')
     while i < len(content):
         # Skip any whitespace.
         while i < len(content) and content[i].isspace():
@@ -123,38 +125,34 @@ def _parse_enum_values(content):
             break
         # The next non–whitespace character must be one of the allowed quotes.
         if content[i] not in allowed_quotes:
-            raise ValueError(
-                "Expected starting quote for enum value at position {} in {!r}".format(
-                    i, content
-                )
-            )
+            raise ValueError("Expected starting quote for enum value at position {} in {!r}".format(i, content))
         quote = content[i]
         i += 1  # skip the opening quote
 
         literal_chars = []
         while i < len(content):
             c = content[i]
             # For single- and double–quotes, process backslash escapes.
-            if quote in ("'", '"') and c == "\\":
+            if quote in ("'", '"') and c == '\\':
                 if i + 1 < len(content):
                     next_char = content[i + 1]
                     # Mapping for common escapes. (For the quote character, map it to itself.)
                     escapes = {
-                        "0": "\0",
-                        "b": "\b",
-                        "n": "\n",
-                        "r": "\r",
-                        "t": "\t",
-                        "Z": "\x1a",
-                        "\\": "\\",
-                        quote: quote,
+                        '0': '\0',
+                        'b': '\b',
+                        'n': '\n',
+                        'r': '\r',
+                        't': '\t',
+                        'Z': '\x1a',
+                        '\\': '\\',
+                        quote: quote
                     }
                     literal_chars.append(escapes.get(next_char, next_char))
                     i += 2
                     continue
                 else:
                     # Trailing backslash – treat it as literal.
-                    literal_chars.append("\\")
+                    literal_chars.append('\\')
                     i += 1
                     continue
             elif c == quote:
@@ -171,27 +169,24 @@ def _parse_enum_values(content):
                 literal_chars.append(c)
                 i += 1
         # Finished reading one literal; join the characters.
-        value = "".join(literal_chars)
+        value = ''.join(literal_chars)
         values.append(value)
 
         # Skip whitespace after the literal.
         while i < len(content) and content[i].isspace():
             i += 1
         # If there’s a comma, skip it; otherwise, we must be at the end.
         if i < len(content):
-            if content[i] == ",":
+            if content[i] == ',':
                 i += 1
             else:
-                raise ValueError(
-                    "Expected comma between enum values at position {} in {!r}".format(
-                        i, content
-                    )
-                )
+                raise ValueError("Expected comma between enum values at position {} in {!r}"
+                                 .format(i, content))
     return values
 
 
 # --- For testing purposes ---
-if __name__ == "__main__":
+if __name__ == '__main__':
     tests = [
         "enum('point','qwe','def')",
         "ENUM('asd', 'qwe', 'def')",
@@ -208,4 +203,4 @@ def _parse_enum_values(content):
             result = parse_mysql_enum(t)
             print("Input: {}\nParsed: {}\n".format(t, result))
         except Exception as e:
-            print("Error parsing {}: {}\n".format(t, e))
+            print("Error parsing {}: {}\n".format(t, e))