Merge pull request #666 from dimbleby/priority-typing

simplify and fix typing of priority()

keyring/_compat.py

@@ -2,6 +2,6 @@
 
 
 try:
-    from jaraco.classes import properties  # type: ignore  # pragma: no-cover
+    from jaraco.classes import properties  # pragma: no-cover
 except ImportError:
-    from . import _properties_compat as properties  # type: ignore  # pragma: no-cover
+    from . import _properties_compat as properties  # type: ignore[no-redef] # pragma: no-cover

keyring/backend.py

@@ -21,7 +21,6 @@
 
 by_priority = operator.attrgetter('priority')
 _limit: typing.Optional[typing.Callable[[KeyringBackend], bool]] = None
-Number = typing.Union[int, float]
 
 
 class KeyringBackendMeta(abc.ABCMeta):
@@ -48,7 +47,7 @@ def __init__(self):
         self.set_properties_from_env()
 
     @properties.classproperty
-    def priority(self) -> Number:
+    def priority(self) -> float:
         """
         Each backend class must supply a priority, a number (float or integer)
         indicating the priority of the backend relative to all other backends.

keyring/backends/SecretService.py

@@ -30,7 +30,7 @@ class Keyring(backend.SchemeSelectable, KeyringBackend):
     appid = 'Python keyring library'
 
     @properties.classproperty
-    def priority(cls):
+    def priority(cls) -> float:
         with ExceptionRaisedContext() as exc:
             secretstorage.__name__
         if exc:

keyring/backends/Windows.py

@@ -81,7 +81,7 @@ class WinVaultKeyring(KeyringBackend):
     persist = Persistence()
 
     @properties.classproperty
-    def priority(cls):
+    def priority(cls) -> float:
         """
         If available, the preferred backend on Windows.
         """

keyring/backends/chainer.py

@@ -19,7 +19,7 @@ class ChainerBackend(backend.KeyringBackend):
     viable = True
 
     @properties.classproperty
-    def priority(cls):
+    def priority(cls) -> float:
         """
         If there are backends to chain, high priority
         Otherwise very low priority since our operation when empty

keyring/backends/fail.py

@@ -15,7 +15,7 @@ class Keyring(KeyringBackend):
     """
 
     @properties.classproperty
-    def priority(cls):
+    def priority(cls) -> float:
         return 0
 
     def get_password(self, service, username, password=None):

keyring/backends/null.py

@@ -11,7 +11,7 @@ class Keyring(KeyringBackend):
     """
 
     @properties.classproperty
-    def priority(cls):
+    def priority(cls) -> float:
         return -1
 
     def get_password(self, service, username, password=None):