compas.data

Author: tomvanmele

src/compas/data/__init__.py

@@ -2,8 +2,7 @@
 This package defines the core infrastructure for data serialisation in the COMPAS framework.
 It provides a base class for data objects, a JSON encoder and decoder, serialisers and deserialisers, and schema validation.
 """
-
-from __future__ import absolute_import
+# ruff: noqa: F401
 
 from .exceptions import DecoderError
 from .encoders import DataEncoder
@@ -12,20 +11,3 @@
 from .json import json_load, json_loads, json_loadz, json_dump, json_dumps, json_dumpz
 from .schema import dataclass_dataschema, dataclass_typeschema, dataclass_jsonschema
 from .schema import compas_dataclasses
-
-__all__ = [
-    "Data",
-    "DataEncoder",
-    "DataDecoder",
-    "DecoderError",
-    "json_load",
-    "json_loads",
-    "json_loadz",
-    "json_dump",
-    "json_dumps",
-    "json_dumpz",
-    "dataclass_dataschema",
-    "dataclass_typeschema",
-    "dataclass_jsonschema",
-    "compas_dataclasses",
-]

src/compas/data/coercion.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .validators import is_item_iterable
 
 

src/compas/data/data.py

@@ -1,34 +1,15 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-try:
-    from typing import TypeVar  # noqa: F401
-
-    D = TypeVar("D", bound="Data")
-except ImportError:
-    pass
-
 import hashlib
 from copy import deepcopy
+from typing import TypeVar
 from uuid import UUID
 from uuid import uuid4
 
 import compas
 
-# ==============================================================================
-# If you ever feel tempted to use ABCMeta in your code: don't, just DON'T.
-# Assigning __metaclass__ = ABCMeta to a class causes a severe memory leak/performance
-# degradation on IronPython 2.7.
-
-# See these issues for more details:
-# - https://github.com/compas-dev/compas/issues/562
-# - https://github.com/compas-dev/compas/issues/649
-
-# ==============================================================================
+D = TypeVar("D", bound="Data")
 
 
-class Data(object):
+class Data:
     """Abstract base class for all COMPAS data objects.
 
     Parameters
@@ -145,7 +126,7 @@ def __setstate__(self, state):
             self.name = state["name"]
 
     @classmethod
-    def __from_data__(cls, data):  # type: (dict) -> Data
+    def __from_data__(cls, data) -> "Data":
         """Construct an object of this type from the provided data.
 
         Parameters
@@ -190,7 +171,7 @@ def name(self, name):
         self._name = name
 
     @classmethod
-    def from_json(cls, filepath):  # type: (...) -> Data
+    def from_json(cls, filepath) -> "Data":
         """Construct an object of this type from a JSON file.
 
         Parameters
@@ -232,7 +213,7 @@ def to_json(self, filepath, pretty=False, compact=False, minimal=False):
         compas.json_dump(self, filepath, pretty=pretty, compact=compact, minimal=minimal)
 
     @classmethod
-    def from_jsonstring(cls, string):  # type: (...) -> Data
+    def from_jsonstring(cls, string) -> "Data":
         """Construct an object of this type from a JSON string.
 
         Parameters
@@ -276,7 +257,7 @@ def to_jsonstring(self, pretty=False, compact=False, minimal=False):
         """
         return compas.json_dumps(self, pretty=pretty, compact=compact, minimal=minimal)
 
-    def copy(self, cls=None, copy_guid=False):  # type: (...) -> D
+    def copy(self, cls=None, copy_guid=False) -> D:  # type: ignore
         """Make an independent copy of the data object.
 
         Parameters

src/compas/data/encoders.py

@@ -1,16 +1,10 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-try:
-    from typing import Type  # noqa: F401
-except ImportError:
-    pass
-
 import json
 import platform
+from typing import Type
 
-from .data import Data  # noqa: F401
+import numpy as np
+
+from .data import Data
 from .exceptions import DecoderError
 
 IDictionary = None
@@ -27,20 +21,8 @@
     except:  # noqa: E722
         pass
 
-try:
-    import numpy as np
-
-    try:
-        np_float = np.float_
-    except AttributeError:
-        np_float = np.float64
-
-    numpy_support = True
-except (ImportError, SyntaxError):
-    numpy_support = False
 
-
-def cls_from_dtype(dtype, inheritance=None):  # type: (...) -> Type[Data]
+def cls_from_dtype(dtype, inheritance=None) -> Type[Data]:
     """Get the class object corresponding to a COMPAS data type specification.
 
     Parameters
@@ -144,32 +126,31 @@ def default(self, o):
         if hasattr(o, "__next__"):
             return list(o)
 
-        if numpy_support:
-            if isinstance(o, np.ndarray):
-                return o.tolist()
-            if isinstance(
-                o,
-                (
-                    np.int_,
-                    np.intc,
-                    np.intp,
-                    np.int8,
-                    np.int16,
-                    np.int32,
-                    np.int64,
-                    np.uint8,
-                    np.uint16,
-                    np.uint32,
-                    np.uint64,
-                ),  # type: ignore
-            ):
-                return int(o)
-            if isinstance(o, (np_float, np.float16, np.float32, np.float64)):  # type: ignore
-                return float(o)
-            if isinstance(o, np.bool_):
-                return bool(o)
-            if isinstance(o, np.void):
-                return None
+        if isinstance(o, np.ndarray):
+            return o.tolist()
+        if isinstance(
+            o,
+            (
+                np.int_,
+                np.intc,
+                np.intp,
+                np.int8,
+                np.int16,
+                np.int32,
+                np.int64,
+                np.uint8,
+                np.uint16,
+                np.uint32,
+                np.uint64,
+            ),  # type: ignore
+        ):
+            return int(o)
+        if isinstance(o, (np.float_, np.float16, np.float32, np.float64)):  # type: ignore
+            return float(o)
+        if isinstance(o, np.bool_):
+            return bool(o)
+        if isinstance(o, np.void):
+            return None
 
         if dotnet_support:
             if isinstance(o, (System.Decimal, System.Double, System.Single)):
@@ -217,7 +198,7 @@ class DataDecoder(json.JSONDecoder):
     """
 
     def __init__(self, *args, **kwargs):
-        super(DataDecoder, self).__init__(object_hook=self.object_hook, *args, **kwargs)
+        super().__init__(object_hook=self.object_hook, *args, **kwargs)
 
     def object_hook(self, o):
         """Reconstruct a deserialized object.

src/compas/data/json.py

@@ -1,12 +1,7 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import json
 import zipfile
 
 from compas import _iotools
-from compas.data import Data  # noqa: F401
 from compas.data import DataDecoder
 from compas.data import DataEncoder
 
@@ -66,7 +61,7 @@ def json_dump(data, fp, pretty=False, compact=False, minimal=False):
         return json.dump(data, f, cls=DataEncoder, **kwargs)
 
 
-def json_dumps(data, pretty=False, compact=False, minimal=False):  # type: (...) -> str
+def json_dumps(data, pretty=False, compact=False, minimal=False) -> str:
     """Write a collection of COMPAS objects to a JSON string.
 
     Parameters
@@ -173,7 +168,7 @@ def json_loadz(zip_file):
     return json_loads(json_str)
 
 
-def json_load(fp):  # type: (...) -> dict
+def json_load(fp) -> dict:
     """Read COMPAS object data from a JSON file.
 
     Parameters
@@ -207,7 +202,7 @@ def json_load(fp):  # type: (...) -> dict
         return json.load(f, cls=DataDecoder)
 
 
-def json_loads(s):  # type: (...) -> dict
+def json_loads(s) -> dict:
     """Read COMPAS object data from a JSON string.
 
     Parameters

src/compas/data/schema.py

@@ -1,12 +1,8 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import json
 import os
 
 
-def dataclass_dataschema(cls):  # type: (...) -> dict
+def dataclass_dataschema(cls) -> dict:
     """Generate a JSON schema for a COMPAS object class.
 
     Parameters
@@ -23,7 +19,7 @@ def dataclass_dataschema(cls):  # type: (...) -> dict
     return cls.DATASCHEMA
 
 
-def dataclass_typeschema(cls):  # type: (...) -> dict
+def dataclass_typeschema(cls) -> dict:
     """Generate a JSON schema for the data type of a COMPAS object class.
 
     Parameters
@@ -43,7 +39,7 @@ def dataclass_typeschema(cls):  # type: (...) -> dict
     }
 
 
-def dataclass_jsonschema(cls, filepath=None, draft=None):  # type: (...) -> dict
+def dataclass_jsonschema(cls, filepath=None, draft=None) -> dict:
     """Generate a JSON schema for a COMPAS object class.
 
     Parameters
@@ -85,7 +81,7 @@ def dataclass_jsonschema(cls, filepath=None, draft=None):  # type: (...) -> dict
     return schema
 
 
-def compas_jsonschema(dirname=None):  # type: (...) -> list
+def compas_jsonschema(dirname=None) -> list:
     """Generate a JSON schema for the COMPAS data model.
 
     Parameters
@@ -110,7 +106,7 @@ def compas_jsonschema(dirname=None):  # type: (...) -> list
     return schemas
 
 
-def compas_dataclasses():  # type: (...) -> list
+def compas_dataclasses() -> list:
     """Find all classes in the COMPAS data model.
 
     Returns

src/compas/data/validators.py

@@ -1,13 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-try:
-    basestring  # type: ignore
-except NameError:
-    basestring = str
-
-
 def is_sequence_of_str(items):
     """Verify that the sequence contains only items of type str.
 
@@ -23,7 +13,7 @@ def is_sequence_of_str(items):
         False otherwise.
 
     """
-    return all(isinstance(item, basestring) for item in items)
+    return all(isinstance(item, str) for item in items)
 
 
 def is_sequence_of_int(items):