Use enum's functional API

Author: Kijewski

generate_imports.py

@@ -52,18 +52,18 @@
     print(file=f)
     for enumname in sorted(enums):
         if enumname.lower().startswith('tidy'):
-            print(f"    ctypedef struct __Enum__{enumname}", file=f)
+            print("    ctypedef struct __Enum__", enumname, file=f, sep='')
 
     print(file=f)
     for enumname in sorted(enums):
         if enumname.lower().startswith('tidy'):
-            print(f"    ctypedef __Enum__{enumname} *{enumname} {enumname!r}", file=f)
+            print("    ctypedef __Enum__", enumname, " *", enumname, " ", repr(enumname), file=f, sep='')
 
     for enumname, definition in sorted(enums.items()):
         if enumname.lower().startswith('tidy'):
             print(file=f)
             for valuename in sorted(definition['values']):
-                print(f"    const {enumname} {valuename}", file=f)
+                print("    const ", enumname, " ", valuename, file=f, sep='')
 
 
 clsnames = {
@@ -88,37 +88,45 @@
 
 with open(join(root, 'lib', '_tidy_enum.pyx'), 'wt') as f:
     print("# GENERATED FILE: all modifications will be overwritten.", file=f)
+
     print(file=f)
-    for clsname in sorted(clsnames):
-        print(f'cdef type _{clsname}', file=f)
+    for clsname, (prefix, suffix, enumname) in sorted(clsnames.items()):
+        print("cdef object _", clsname, file=f, sep='')
+
+    print(file=f)
+    for clsname, (prefix, suffix, enumname) in sorted(clsnames.items()):
+        print("global ", clsname, file=f, sep='')
 
+    print(file=f)
     for clsname in sorted(clsnames):
         print(file=f)
-        print(file=f)
-        print(f"cdef object {underscore(clsname)}_for_name(name):", file=f)
-        print(f"    return _generic_id_for_name(_{clsname}, name)", file=f)
+        print("cdef object ", underscore(clsname), "_for_name(name):", file=f, sep='')
+        print("    return _generic_id_for_name(_", clsname, ", name)", file=f, sep='')
 
     for clsname, (prefix, suffix, enumname) in sorted(clsnames.items()):
+        definition = enums[enumname]
+
         print(file=f)
         print(file=f)
-        print(f"class _{clsname}(IntEnum):", file=f)
-        print(f"    __name__ =  __qualname__ = {clsname!r}", file=f)
-        print(f"    for_name = staticmethod({underscore(clsname)}_for_name)", file=f)
-        print(file=f)
-        definition = enums[enumname]
+        print("_", clsname, " = IntEnum(", repr(clsname), ", {", file=f, sep='')
         for valuename in sorted(definition['values']):
             pretty_name = valuename
             if prefix and pretty_name.startswith(prefix):
                 pretty_name = pretty_name[len(prefix):]
             if suffix and pretty_name.endswith(suffix):
                 pretty_name = pretty_name[:-len(suffix)]
             pretty_name = underscore(pretty_name)
+
+            if pretty_name.startswith('n_tidy_'):
+                continue
+
             if iskeyword(pretty_name):
                 pretty_name = f'{pretty_name}_'
 
-            print(f"    {pretty_name} = <{definition['type']}> {valuename}", file=f)
+            print("    ", repr(pretty_name), ": <", definition['type'], "> ", valuename, ",", file=f, sep='')
 
-    print(file=f)
-    print(file=f)
-    for clsname in sorted(clsnames):
-        print(f"{clsname} = _{clsname}", file=f)
+        print("})", file=f)
+        print(file=f)
+        print("_", clsname, ".for_name = ", underscore(clsname), "_for_name", file=f, sep='')
+        print(file=f)
+        print(clsname, " = _", clsname, file=f, sep='')

lib/_convenience.pyx

@@ -2,7 +2,9 @@ cdef tuple tuple_OutputSink_Buffer = (OutputSink, Buffer)
 cdef tuple tuple_str_Path = (str, Path)
 
 
-cdef type _DocumentEncoding
+cdef object _DocumentEncoding
+
+global DocumentEncoding
 
 cdef object document_encoding_for_name(name):
     return _generic_id_for_name(_DocumentEncoding, name)
@@ -13,13 +15,14 @@ cdef enum DocumentEncodingEnum:
     DE_Unicode
     DE_Utf8
 
-class _DocumentEncoding(IntEnum):
-    for_name = document_encoding_for_name
-
-    ascii = DocumentEncodingEnum.DE_Ascii
-    ascii_bytes = DocumentEncodingEnum.DE_AsciiBytes
-    unicode = DocumentEncodingEnum.DE_Unicode
-    utf8 = DocumentEncodingEnum.DE_Utf8
+_DocumentEncoding = IntEnum('DocumentEncoding', {
+    'ascii': <unsigned int> DocumentEncodingEnum.DE_Ascii,
+    'ascii_bytes': <unsigned int> DocumentEncodingEnum.DE_AsciiBytes,
+    'unicode': <unsigned int> DocumentEncodingEnum.DE_Unicode,
+    'utf8': <unsigned int> DocumentEncodingEnum.DE_Utf8,
+})
+
+_DocumentEncoding.for_name = document_encoding_for_name
 
 DocumentEncoding = _DocumentEncoding
 

lib/_tidy_document.pyx

@@ -1,14 +1,17 @@
-cdef type _ParseOutcome
+cdef object _ParseOutcome
+
+global ParseOutcome
 
 cdef object parse_outcome_for_name(name):
     return _generic_id_for_name(_ParseOutcome, name)
 
-class _ParseOutcome(IntEnum):
-    for_name = parse_outcome_for_name
+_ParseOutcome = IntEnum('ParseOutcome', {
+    'ok': 0,
+    'warnings': 1,
+    'errors': 2,
+})
 
-    ok = 0
-    warnings = 1
-    errors = 2
+_ParseOutcome.for_name = parse_outcome_for_name
 
 ParseOutcome = _ParseOutcome