Base Py3 upgrade

src/compas/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+# ruff: noqa: F401
 
 import os
 
@@ -103,34 +103,6 @@
     pass
 
 
-__all__ = [
-    "WINDOWS",
-    "LINUX",
-    "OSX",
-    "MONO",
-    "IPY",
-    "RHINO",
-    "BLENDER",
-    "PY2",
-    "PY3",
-    "devday",
-    "is_windows",
-    "is_linux",
-    "is_osx",
-    "is_mono",
-    "is_ironpython",
-    "is_rhino",
-    "is_blender",
-    "is_grasshopper",
-    "get",
-    "json_dump",
-    "json_load",
-    "json_dumps",
-    "json_dumpz",
-    "json_loads",
-    "json_loadz",
-]
-
 __all_plugins__ = [
     "compas.geometry.booleans_shapely",
     "compas.scene",

src/compas/_iotools.py

@@ -2,11 +2,7 @@
 
 import io
 from contextlib import contextmanager
-
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
+from urllib.request import urlopen
 
 
 @contextmanager

src/compas/colors/__init__.py

@@ -2,13 +2,8 @@
 This package defines a color and color map class,
 that can be used to work wihth colors in a consistent way across color spaces.
 """
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
+# ruff: noqa: F401
 
 from .color import Color
 from .colormap import ColorMap
 from .colordict import ColorDict
-
-__all__ = ["Color", "ColorMap", "ColorDict"]

src/compas/colors/color.py

@@ -1,12 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-try:
-    basestring  # type: ignore
-except NameError:
-    basestring = str
-
 import colorsys
 import re
 
@@ -16,10 +7,7 @@
 
 BASE16 = "0123456789abcdef"
 
-try:
-    HEX_DEC = {v: int(v, base=16) for v in [x + y for x in BASE16 for y in BASE16]}
-except Exception:
-    HEX_DEC = {v: int(v, 16) for v in [x + y for x in BASE16 for y in BASE16]}
+HEX_DEC = {v: int(v, base=16) for v in [x + y for x in BASE16 for y in BASE16]}
 
 
 class ColorError(Exception):
@@ -567,7 +555,7 @@ def from_unknown(cls, unknown):
         if Color._is_rgb1(unknown):
             return cls(*list(unknown))
 
-        if isinstance(unknown, basestring):
+        if isinstance(unknown, str):
             return cls.from_name(unknown)
 
         raise ColorError
@@ -633,7 +621,7 @@ def _is_hex(color):
         bool
 
         """
-        if isinstance(color, basestring):
+        if isinstance(color, str):
             match = re.search(r"^#(?:[0-9a-fA-F]{3}){1,2}$", color)
             if match:
                 return True

src/compas/colors/colordict.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from compas.data import Data
 
 from .color import Color

src/compas/colors/colormap.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import os
 
 from compas.itertools import linspace

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