Merge branch 'fix-dumper-compat' into v2_main

src/thoughtspot_tml/_compat.py

@@ -1,5 +1,15 @@
 import sys
 
+import yaml
+
+
+try:
+    Dumper = yaml.CDumper
+    Loader = yaml.CSafeLoader
+except AttributeError:
+    Dumper = yaml.Dumper
+    Loader = yaml.SafeLoader
+
 if sys.version_info < (3, 8):
     from typing_extensions import get_origin, get_args
     from typing_extensions import Literal, TypedDict

src/thoughtspot_tml/_version.py

@@ -1 +1 @@
-__version__ = "2.1.0"
+__version__ = "2.1.1"

src/thoughtspot_tml/_yaml.py

@@ -5,6 +5,8 @@
 
 import yaml
 
+from thoughtspot_tml import _compat
+
 NEARLY_INFINITY = 999999999  # This used to be math.inf, but C has no concept of infinity. ;)
 
 # TML column ids typically take the form..
@@ -60,7 +62,7 @@ def _double_quote_when_special_char(dumper: yaml.Dumper, data: str) -> yaml.Scal
     return dumper.represent_scalar("tag:yaml.org,2002:str", data, style=style)
 
 
-yaml.add_representer(str, _double_quote_when_special_char, Dumper=yaml.CDumper)
+yaml.add_representer(str, _double_quote_when_special_char, Dumper=_compat.Dumper)
 
 # BUG: pyyaml #89 ==> resolved by #635
 yaml.Loader.yaml_implicit_resolvers.pop("=")
@@ -70,7 +72,7 @@ def load(document: str) -> Dict[str, Any]:
     """
     Load a TML object.
     """
-    return yaml.load(document, Loader=yaml.CSafeLoader)
+    return yaml.load(document, Loader=_compat.Loader)
 
 
 def dump(document: Dict[str, Any]) -> str:
@@ -92,6 +94,6 @@ def dump(document: Dict[str, Any]) -> str:
         "default_flow_style": False,
         "sort_keys": False,
         "allow_unicode": True,
-        "Dumper": yaml.CDumper,
+        "Dumper": _compat.Dumper,
     }
     return yaml.dump(document, **options)