monkeytoolbox 0.2.0__tar.gz → 0.4.0__tar.gz

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/CHANGELOG.md

@@ -7,7 +7,17 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
 the [PEP 440 version scheme](https://peps.python.org/pep-0440/#version-scheme).
 
 
-## [v0.2.0 - 2024-01-04]
+## [0.4.0]
+### Fixed
+- Error that prevents monkeytoolbox from being imported on Darwin. #6
+- Import error in `open_new_securely_permissioned_file()` on Windows. #6
+
+## [0.3.0] - 2024-01-16
+### Fixed
+- The location of the `py.typed` file so that type checking is now properly
+  supported
+
+## [0.2.0] - 2024-01-04
 ### Added
 - `get_os_version()`
 - `get_hostname()`

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: monkeytoolbox
-Version: 0.2.0
+Version: 0.4.0
 Summary: Miscellaneous convenience utilities for Python programs
 Home-page: https://github.com/guardicode/monkeytoolbox
 License: GPLv3
@@ -11,6 +11,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: egg-timer
 Requires-Dist: ifaddr
 Requires-Dist: monkey-types

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/monkeytoolbox/code_utils.py

@@ -4,7 +4,8 @@ import random
 import secrets
 import string
 from threading import Event, Thread
-from typing import Any, Callable, Iterable, List, MutableMapping, Optional, TypeVar
+from typing import Any, MutableMapping, Optional, TypeVar
+from collections.abc import Iterable, Callable
 
 T = TypeVar("T")
 
@@ -26,7 +27,7 @@ def apply_filters(filters: Iterable[Callable[[T], bool]], iterable: Iterable[T])
     return filtered_iterable
 
 
-def queue_to_list(q: queue.Queue) -> List[Any]:
+def queue_to_list(q: queue.Queue) -> list[Any]:
     list_ = []
     try:
         while True:

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/monkeytoolbox/decorators.py

@@ -1,8 +1,9 @@
 import threading
 from functools import wraps
-from typing import Any, Callable
+from typing import Any
+from collections.abc import Callable
 
-from egg_timer import EggTimer
+from eggtimer import EggTimer
 
 
 def request_cache(ttl: float):

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/monkeytoolbox/file_utils.py

@@ -4,7 +4,8 @@ import logging
 import os
 import shutil
 from pathlib import Path
-from typing import BinaryIO, Iterable
+from typing import BinaryIO
+from collections.abc import Iterable
 
 logger = logging.getLogger(__name__)
 

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/monkeytoolbox/network_utils.py

@@ -1,6 +1,7 @@
 import ipaddress
 from ipaddress import IPv4Address, IPv4Interface
-from typing import Iterable, List, Optional, Sequence
+from typing import Optional
+from collections.abc import Iterable, Sequence
 
 import ifaddr
 import psutil
@@ -10,7 +11,7 @@ def get_my_ip_addresses() -> Sequence[IPv4Address]:
     return [interface.ip for interface in get_network_interfaces()]
 
 
-def get_network_interfaces() -> List[IPv4Interface]:
+def get_network_interfaces() -> list[IPv4Interface]:
     local_interfaces = []
     for adapter in ifaddr.get_adapters():
         for ip in _select_ipv4_ips(adapter.ips):
@@ -41,7 +42,7 @@ def port_is_used(
 def get_connections(
     ports: Optional[Sequence[int]] = None,
     ip_addresses: Optional[Sequence[IPv4Address]] = None,
-) -> List[psutil._common.sconn]:
+) -> list[psutil._common.sconn]:
     connections = psutil.net_connections()
     if ports:
         connections = [connection for connection in connections if connection.laddr.port in ports]

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/monkeytoolbox/secure_directory.py

@@ -1,17 +1,29 @@
 import logging
 import stat
+import warnings
+from collections.abc import Callable
 from pathlib import Path
-from typing import Callable
 
 from monkeytypes import OperatingSystem
 
 from . import get_os
 
-if get_os() == OperatingSystem.WINDOWS:
-    import win32file
-    import win32security
-
-    from .windows_permissions import get_security_descriptor_for_owner_only_permissions
+try:
+    if get_os() == OperatingSystem.WINDOWS:
+        import win32file
+        import win32security
+
+        from .windows_permissions import get_security_descriptor_for_owner_only_permissions
+except RuntimeError:
+    # The most likely cause of this error is that this module has been imported
+    # on MacOS (Darwin). While the code in this module may or may not function
+    # properly on Darwin, there is code within this package That is platform
+    # agnostic. This error, if not caught, will prevent this entire package
+    # from being imported, which is not the desired behavior.
+    warnings.warn(
+        "OS compatibility check failed: This package may not work properly on this OS.",
+        ImportWarning,
+    )
 
 logger = logging.getLogger(__name__)
 

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/monkeytoolbox/secure_file.py

@@ -1,20 +1,31 @@
 import logging
 import os
 import stat
+import warnings
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from monkeytypes import OperatingSystem
 
 from . import get_os
 
-if get_os() == OperatingSystem.WINDOWS:
-    import win32file
-    import win32job
-    import win32security
-
-    from .windows_permissions import get_security_descriptor_for_owner_only_permissions
-
+try:
+    if get_os() == OperatingSystem.WINDOWS:
+        import win32file
+        import win32job
+        import win32security
+
+        from .windows_permissions import get_security_descriptor_for_owner_only_permissions
+except RuntimeError:
+    # The most likely cause of this error is that this module has been imported
+    # on MacOS (Darwin). While the code in this module may or may not function
+    # properly on Darwin, there is code within this package That is platform
+    # agnostic. This error, if not caught, will prevent this entire package
+    # from being imported, which is not the desired behavior.
+    warnings.warn(
+        "OS compatibility check failed: This package may not work properly on this OS.",
+        ImportWarning,
+    )
 
 logger = logging.getLogger(__name__)
 

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/monkeytoolbox/threading.py

@@ -3,7 +3,8 @@ import threading
 from functools import wraps
 from itertools import count
 from threading import Lock, Thread
-from typing import Any, Callable, Iterable, Iterator, Optional, Tuple, TypeVar
+from typing import Any, Iterator, Optional, Tuple, TypeVar
+from collections.abc import Iterable, Callable
 
 from monkeytypes import Event
 

{monkeytoolbox-0.2.0 → monkeytoolbox-0.4.0}/pyproject.toml

@@ -43,7 +43,7 @@ paths = ["monkeytoolbox", "vulture_allowlist.py"]
 
 [tool.poetry]
 name = "monkeytoolbox"
-version = "v0.2.0"
+version = "v0.4.0"
 description = "Miscellaneous convenience utilities for Python programs"
 authors = [
     "Ilija Lazoroski <ilija.la@live.com>",