Add support for keyword attributes

This doesn't work exactly because of pyo3 get/set breaks this. See PyO3/pyo3#743
ethanhs · Jan 23, 2020 · b70277a · b70277a
1 parent 6638a23
commit b70277a
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 6 deletions.
diff --git a/abserde/gen_lib.py b/abserde/gen_lib.py
@@ -355,6 +355,61 @@
 CONTAINER_TYPE_MAP = {"List": "Vec", "Optional": "Option"}
 
 
+RUST_KEYWORDS = [
+    'abstract',
+    'become',
+    'box',
+    'do',
+    'final',
+    'macro',
+    'override',
+    'priv',
+    'typeof',
+    'unsized',
+    'virtual',
+    'yield',
+    'try',
+    'as',
+    'break',
+    'const',
+    'continue',
+    'crate',
+    'else',
+    'enum',
+    'extern',
+    'false',
+    'fn',
+    'for',
+    'if',
+    'impl',
+    'in',
+    'let',
+    'loop',
+    'match',
+    'mod',
+    'move',
+    'mut',
+    'pub',
+    'ref',
+    'return',
+    'self',
+    'Self',
+    'static',
+    'struct',
+    'super',
+    'trait',
+    'true',
+    'type',
+    'unsafe',
+    'use',
+    'where',
+    'while',
+    'async',
+    'await',
+    'dyn',
+]
+
+
 class InvalidTypeError(Exception):
     pass
 
@@ -412,6 +467,12 @@ def _convert_simple(self, typ: str) -> str:
         except KeyError:
             invalid_type(typ)
 
+    def escape_keywords(self, name):
+        if name in RUST_KEYWORDS:
+            return f'r#{name}'
+        else:
+            return name
+
     def is_union(self, item: AST) -> bool:
         return isinstance(item.annotation, Subscript) and item.annotation.value.id == "Union"
 
@@ -490,9 +551,10 @@ def visit_ClassDef(self, n: ClassDef) -> None:
                     enums.append((annotation, members))
                 else:
                     annotation = self.convert(item.annotation)
-                attributes.append((name, annotation))
+                assert annotation is not None, print(n.name, item.target.id)
+                attributes.append((self.escape_keywords(name), annotation))
                 self.writeline(" " * 4 + "#[pyo3(get, set)]")
-                self.writeline(" " * 4 + f"pub {name}: {annotation},")
+                self.writeline(" " * 4 + f"pub {self.escape_keywords(name)}: {annotation},")
         self.writeline("}")
         # Then we write out the class implementation.
         self.write(PYCLASS_PREFIX.format(name=n.name))

diff --git a/tox.ini b/tox.ini
@@ -16,7 +16,7 @@ deps =
 [testenv:py36]
 commands = python -m pytest {posargs}
 commands_pre =
-    python -m pip install --no-index --find-links=dist multiclass -U
+    python -m pip install --no-index --find-links=dist multiclass twitter -U
 
 
 [testenv:py37]
@@ -27,7 +27,7 @@ setenv =
     PYTHONWARNINGS=d
 commands = python -m pytest {posargs}
 commands_pre =
-    python -m pip install --no-index --find-links=dist multiclass -U
+    python -m pip install --no-index --find-links=dist multiclass twitter -U
 
 [testenv:py38]
 # Python 3.6+ has a number of compile-time warnings on invalid string escapes.
@@ -37,7 +37,7 @@ setenv =
     PYTHONWARNINGS=d
 commands = python -m pytest {posargs}
 commands_pre =
-    python -m pip install --no-index --find-links=dist multiclass -U
+    python -m pip install --no-index --find-links=dist multiclass twitter -U
 
 [testenv:lint]
 basepython = python3.7
@@ -51,4 +51,4 @@ commands = pre-commit run --all-files
 
 [flake8]
 max-line-length = 99
-ignore = F841
+ignore = F841, W503