Moved compatibility modules into a compat package.

jaraco · Mar 22, 2024 · a6db3c0 · a6db3c0
1 parent cbadb25
commit a6db3c0
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 13 deletions.
diff --git a/hook-keyring.backend.py b/hook-keyring.backend.py
@@ -2,6 +2,6 @@
 Hook used by pyinstaller to expose hidden imports.
 """
 
-from keyring.py312compat import metadata
+from keyring.compat.py312 import metadata
 
 hiddenimports = [ep.value for ep in metadata.entry_points(group='keyring.backends')]
diff --git a/keyring/backend.py b/keyring/backend.py
@@ -12,8 +12,8 @@
 import typing
 
 from . import credentials, errors, util
-from ._compat import properties
-from .py312compat import metadata
+from .compat import properties
+from .compat.py312 import metadata
 
 log = logging.getLogger(__name__)
 

diff --git a/keyring/backends/SecretService.py b/keyring/backends/SecretService.py
@@ -2,8 +2,8 @@
 from contextlib import closing
 
 from .. import backend
-from .._compat import properties
 from ..backend import KeyringBackend
+from ..compat import properties
 from ..credentials import SimpleCredential
 from ..errors import (
     ExceptionRaisedContext,

diff --git a/keyring/backends/Windows.py b/keyring/backends/Windows.py
@@ -1,7 +1,7 @@
 import logging
 
-from .._compat import properties
 from ..backend import KeyringBackend
+from ..compat import properties
 from ..credentials import SimpleCredential
 from ..errors import ExceptionRaisedContext, PasswordDeleteError
 

diff --git a/keyring/backends/chainer.py b/keyring/backends/chainer.py
@@ -4,7 +4,7 @@
 """
 
 from .. import backend
-from .._compat import properties
+from ..compat import properties
 from . import fail
 
 

diff --git a/keyring/backends/fail.py b/keyring/backends/fail.py
@@ -1,5 +1,5 @@
-from .._compat import properties
 from ..backend import KeyringBackend
+from ..compat import properties
 from ..errors import NoKeyringError
 
 

diff --git a/keyring/backends/kwallet.py b/keyring/backends/kwallet.py
@@ -2,8 +2,8 @@
 import os
 import sys
 
-from .._compat import properties
 from ..backend import KeyringBackend
+from ..compat import properties
 from ..credentials import SimpleCredential
 from ..errors import InitError, KeyringLocked, PasswordDeleteError, PasswordSetError
 

diff --git a/keyring/backends/libsecret.py b/keyring/backends/libsecret.py
@@ -1,8 +1,8 @@
 import logging
 
 from .. import backend
-from .._compat import properties
 from ..backend import KeyringBackend
+from ..compat import properties
 from ..credentials import SimpleCredential
 from ..errors import (
     KeyringLocked,

diff --git a/keyring/backends/macOS/__init__.py b/keyring/backends/macOS/__init__.py
@@ -3,8 +3,8 @@
 import platform
 import warnings
 
-from ..._compat import properties
 from ...backend import KeyringBackend
+from ...compat import properties
 from ...errors import KeyringError, KeyringLocked, PasswordDeleteError, PasswordSetError
 
 try:

diff --git a/keyring/backends/null.py b/keyring/backends/null.py
@@ -1,5 +1,5 @@
-from .._compat import properties
 from ..backend import KeyringBackend
+from ..compat import properties
 
 
 class Keyring(KeyringBackend):

diff --git a/keyring/_compat.py → keyring/compat/__init__.py b/keyring/_compat.py → keyring/compat/__init__.py
@@ -4,4 +4,4 @@
 try:
     from jaraco.classes import properties
 except ImportError:  # pragma: no cover
-    from . import _properties_compat as properties  # type: ignore[no-redef]
+    from . import properties  # type: ignore[no-redef]
diff --git a/keyring/_properties_compat.py → keyring/compat/properties.py b/keyring/_properties_compat.py → keyring/compat/properties.py
diff --git a/keyring/py312compat.py → keyring/compat/py312.py b/keyring/py312compat.py → keyring/compat/py312.py
diff --git a/tests/test_packaging.py b/tests/test_packaging.py
@@ -1,5 +1,5 @@
 from keyring import backend
-from keyring.py312compat import metadata
+from keyring.compat.py312 import metadata
 
 
 def test_entry_point():