f3d 2.3.0rc4__cp310-cp310-win_amd64.whl → 3.0.0rc5__cp310-cp310-win_amd64.whl

f3d/__init__.py

@@ -2,10 +2,11 @@
 # Refer to python/__init__.py.in source file
 
 import os
-import sys
 import re
+import sys
 import warnings
 from pathlib import Path
+from typing import Any, Iterable, Mapping, Union
 
 F3D_ABSOLUTE_DLLS = [
     # 
@@ -27,50 +28,43 @@ from .pyf3d import *
 # Automatically load plugins for the user
 Engine.autoload_plugins()
 
-# TODO: Delete this in 3.0, it's there for retrocompatibility with old class naming
-engine = Engine
-options = Options
-loader = Loader
-image = Image
-interactor = Interactor
-window = Window
-camera = Camera
-camera_state_t = CameraState
-utils = Utils
-
-__version__ = "2.3.0"
+__version__ = "3.0.0"
 
 
 ################################################################################
 # monkey patch `options.update`
 
 
-def f3d_options_update(self, arg):
+def _f3d_options_update(
+    self, arg: Union[Mapping[str, Any], Iterable[tuple[str, Any]]]
+) -> None:
     try:
         for k, v in arg.items():
             self[k] = v
         return
-    except AttributeError:
+    except AttributeError:  # `arg` doesn't have `.items()`
         pass
 
     try:
         for k, v in arg:
             self[k] = v
         return
-    except AttributeError:
+    except TypeError:  # `arg` isn't iterable
+        pass
+    except ValueError:  # `arg` isn't iterable of pairs
         pass
 
-    raise ValueError(f"cannot update {self} from {args}")
+    raise ValueError(f"cannot update {self} from {arg}")
 
 
-Options.update = f3d_options_update
+Options.update = _f3d_options_update
 
 
 ################################################################################
 # add deprecated warnings
 
 
-def deprecated_decorator(f, reason):
+def _deprecated_decorator(f, reason):
     def g(*args, **kwargs):
         warnings.warn(reason, DeprecationWarning, 2)
         return f(*args, **kwargs)
@@ -78,14 +72,15 @@ def deprecated_decorator(f, reason):
     return g
 
 
-def add_deprecation_warnings():
+def _add_deprecation_warnings():
     for f3d_class in (
         Camera,
-        Loader,
+        Scene,
         Options,
         Interactor,
         Engine,
         Window,
+        Image,
     ):
         for name, member in f3d_class.__dict__.items():
             if callable(member) and member.__doc__:
@@ -93,7 +88,7 @@ def add_deprecation_warnings():
                 if m:
                     reason = m.group(1) or ""
                     msg = f"{f3d_class.__qualname__}.{name} is deprecated{reason}"
-                    setattr(f3d_class, name, deprecated_decorator(member, msg))
+                    setattr(f3d_class, name, _deprecated_decorator(member, msg))
 
 
-add_deprecation_warnings()
+_add_deprecation_warnings()

f3d/__init__.pyi

@@ -0,0 +1,34 @@
+from __future__ import annotations
+from f3d.pyf3d import Camera
+from f3d.pyf3d import CameraState
+from f3d.pyf3d import Engine
+from f3d.pyf3d import Image
+from f3d.pyf3d import InteractionBind
+from f3d.pyf3d import Interactor
+from f3d.pyf3d import LibInformation
+from f3d.pyf3d import Log
+from f3d.pyf3d import Mesh
+from f3d.pyf3d import Options
+from f3d.pyf3d import ReaderInformation
+from f3d.pyf3d import Scene
+from f3d.pyf3d import Utils
+from f3d.pyf3d import Window
+import os as os
+import pathlib
+from pathlib import Path
+import re as re
+import sys as sys
+import warnings as warnings
+from . import pyf3d
+__all__ = ['Camera', 'CameraState', 'Engine', 'F3D_ABSOLUTE_DLLS', 'F3D_RELATIVE_DLLS', 'Image', 'InteractionBind', 'Interactor', 'LibInformation', 'Log', 'Mesh', 'Options', 'Path', 'ReaderInformation', 'Scene', 'Utils', 'Window', 'abs_path', 'os', 'pyf3d', 're', 'root', 'sys', 'warnings']
+def _add_deprecation_warnings():
+    ...
+def _deprecated_decorator(f, reason):
+    ...
+def _f3d_options_update(self, arg: typing.Union[typing.Mapping[str, typing.Any], typing.Iterable[tuple[str, typing.Any]]]) -> None:
+    ...
+F3D_ABSOLUTE_DLLS: list = ['D:/a/f3d-superbuild/f3d-superbuild/fsbb/install/bin', 'D:/a/f3d-superbuild/f3d-superbuild/fsbb/install/lib', 'C:/Users/runneradmin/AppData/Local/Temp/tmpgb5nczch/build/bin']
+F3D_RELATIVE_DLLS: list = list()
+__version__: str = '3.0.0'
+abs_path: str = 'C:/Users/runneradmin/AppData/Local/Temp/tmpgb5nczch/build/bin'
+root: pathlib.WindowsPath  # value = WindowsPath('C:/Users/runneradmin/AppData/Local/Temp/tmpgb5nczch/build/f3d')