fix non-relative imports

django_crypto_fields/apps.py

@@ -4,7 +4,7 @@
 from django.apps import AppConfig as DjangoAppConfig
 from django.core.management.color import color_style
 
-from django_crypto_fields.key_path import KeyPath
+from .key_path import KeyPath
 
 
 class AppConfig(DjangoAppConfig):

django_crypto_fields/key_path/persist_key_path_or_raise.py

@@ -47,15 +47,14 @@ def read_last_used(folder: Path) -> tuple[PurePath | None, Path]:
     """Opens file `django_crypto_fields` and read last path."""
     last_used_path = None
     filepath = Path(folder / "django_crypto_fields")
-    if filepath.exists():
-        if "runtests.py" in sys.argv:
-            filepath.unlink()
-        else:
-            with filepath.open(mode="r") as f:
-                reader = csv.DictReader(f)
-                for row in reader:
-                    last_used_path = PurePath(row.get("path"))
-                    break
+    if "runtests.py" in sys.argv:
+        filepath.unlink(missing_ok=True)
+    elif filepath.exists():
+        with filepath.open(mode="r") as f:
+            reader = csv.DictReader(f)
+            for row in reader:
+                last_used_path = PurePath(row.get("path"))
+                break
     if last_used_path and not Path(last_used_path).exists():
         raise DjangoCryptoFieldsKeyPathError(
             style.ERROR(

django_crypto_fields/keys/keys.py

@@ -10,20 +10,16 @@
 from Cryptodome.Util import number
 from django.core.management.color import color_style
 
-from django_crypto_fields.constants import AES, PRIVATE, PUBLIC, RSA, RSA_KEY_SIZE, SALT
-from django_crypto_fields.exceptions import (
+from ..constants import AES, PRIVATE, PUBLIC, RSA, RSA_KEY_SIZE, SALT
+from ..exceptions import (
     DjangoCryptoFieldsError,
     DjangoCryptoFieldsKeyAlreadyExist,
     DjangoCryptoFieldsKeyError,
     DjangoCryptoFieldsKeysAlreadyLoaded,
     DjangoCryptoFieldsKeysDoNotExist,
 )
-from django_crypto_fields.key_path import KeyPath, persist_key_path_or_raise
-from django_crypto_fields.utils import (
-    get_auto_create_keys_from_settings,
-    get_key_prefix_from_settings,
-)
-
+from ..key_path import KeyPath, persist_key_path_or_raise
+from ..utils import get_auto_create_keys_from_settings, get_key_prefix_from_settings
 from .utils import get_filenames, get_template, key_files_exist, write_msg
 
 style = color_style()

django_crypto_fields/keys/utils.py

@@ -4,15 +4,7 @@
 from pathlib import Path, PurePath
 from typing import Iterator
 
-from django_crypto_fields.constants import (
-    AES,
-    LOCAL_MODE,
-    PRIVATE,
-    PUBLIC,
-    RESTRICTED_MODE,
-    RSA,
-    SALT,
-)
+from ..constants import AES, LOCAL_MODE, PRIVATE, PUBLIC, RESTRICTED_MODE, RSA, SALT
 
 
 def get_template(path: PurePath, key_prefix: str) -> dict[str, dict[str, dict[str, PurePath]]]:

django_crypto_fields/tests/crypto_keys/django_crypto_fields

@@ -1,2 +1,2 @@
 path,date
-/Users/erikvw/source/edc_source/django-crypto-fields/django_crypto_fields/tests/crypto_keys,2024-03-19 04:06:39.385684+00:00
+/Users/erikvw/source/edc_source/django-crypto-fields/django_crypto_fields/tests/crypto_keys,2024-03-19 04:17:34.681606+00:00

django_crypto_fields/utils.py

@@ -151,7 +151,7 @@ def has_valid_value_or_raise(
 
 
 def is_valid_ciphertext_or_raise(ciphertext: bytes, hash_size: int | None = None):
-    """Returns an unchanged ciphertext after verifying format cipher_prefix +
+    """Returns an unchanged ciphertext after verifying format hash_prefix +
     hash + cipher_prefix + secret.
     """
     try: