Replaced the outdated grako library to parse WKT with TatSu (#1587)

* Replaced the outdated grako library to parse WKT with TatSu * formatted files with isort and black * added more examples of WKT strings --------- Co-authored-by: roll <[email protected]>
frictionlessdata · Jan 24, 2024 · 90f717f · 90f717f
1 parent bb4eeb3
commit 90f717f
Show file tree

Hide file tree

Showing 6 changed files with 400 additions and 309 deletions.
diff --git a/frictionless/fields/string.py b/frictionless/fields/string.py
@@ -73,13 +73,13 @@ def value_reader(cell: Any):
 
         # WKT
         elif self.format == "wkt":
-            parser = platform.wkt.WktParser()
+            parser = platform.wkt.Parser()
 
             def value_reader(cell: Any):
                 if not isinstance(cell, str):
                     return None
                 try:
-                    parser.parse(cell, rule_name="wkt_representation")
+                    parser.parse(cell)
                 except Exception:
                     return None
                 return cell

diff --git a/frictionless/platform.py b/frictionless/platform.py
@@ -13,9 +13,6 @@ def inner(*args: Any, **kwargs: Any):
             try:
                 return func(*args, **kwargs)
             except Exception:
-                if name == "wkt" and sys.version_info >= (3, 10):
-                    note = "WKT is not supported in Python3.10+ (grako is unmaintained)"
-                    raise platform.frictionless.FrictionlessException(note)
                 module = import_module("frictionless.exception")
                 note = f'Please install "frictionless[{name}]"'
                 raise module.FrictionlessException(note)

diff --git a/frictionless/vendors/wkt/__init__.py b/frictionless/vendors/wkt/__init__.py
@@ -1 +1 @@
-from .parser import WktParser
+from .parser import Parser