moved .util to .core

Author: Barakudum

src/passwordlib/__init__.py

@@ -35,5 +35,5 @@
 __version__ = '.'.join(str(_) for _ in __version_info__)
 
 from . import config
-from . import util
-from .util import hash_password, compare_password
+from . import core
+from .core import hash_password, compare_password

src/passwordlib/attr/attribute_class.py

@@ -3,7 +3,7 @@
 
 """
 import typing as t
-from .. import util
+from ..core import hash_password
 
 
 class PasswordAttribute:
@@ -54,8 +54,8 @@ def __set__(self, instance, value):
         if self._allow_reset and value is None:
             self.__delete__(instance=instance)
         elif isinstance(value, (str, bytes)):
-            dumped = util.hash_password(password=value, algorithm=self._algorithm,
-                                        iterations=self._iterations, salt=self._salt)
+            dumped = hash_password(password=value, algorithm=self._algorithm,
+                                   iterations=self._iterations, salt=self._salt)
             setattr(instance, self._instance_attribute_name, dumped)
         else:
             raise TypeError(f"Value of type {type(value)} is not password-hashable")

src/passwordlib/util/__init__.py src/passwordlib/core/__init__.py

@@ -1,7 +1,6 @@
-#!/usr/bin/python3
 # -*- coding=utf-8 -*-
 r"""
-various utility functions to generate hashed from password and compare them
+core functions
 """
 from .functions import (
     generate_salt,

src/passwordlib/util/dumping.py src/passwordlib/core/dumping.py

@@ -6,7 +6,7 @@
 import os
 import hashlib
 import typing as t
-from .. import config
+from passwordlib import config
 
 
 __all__ = ['generate_salt', 'get_password_bytes', 'get_algorithm', 'get_iterations', 'get_salt']

src/passwordlib/util/functions.py src/passwordlib/core/functions.py

@@ -6,7 +6,7 @@
 import hmac
 import hashlib
 import typing as t
-from . import functions as fn
+from ..core import functions as fn
 from .dumping import dumps, loads
 
 

src/passwordlib/util/hashing.py src/passwordlib/core/hashing.py

@@ -11,7 +11,7 @@ def test_import(self):
         import passwordlib.attr # noqa
 
     def test_set(self):
-        from passwordlib.util import compare_password
+        from passwordlib.core import compare_password
         from passwordlib.attr import PasswordAttribute
 
         class User:

tests/test_attribute.py

@@ -8,16 +8,17 @@
 
 class TestUtil(unittest.TestCase):
     def test_import_util(self):
-        import passwordlib.util  # noqa
+        # noinspection PyUnresolvedReferences
+        import passwordlib.core
 
     def test_salt_generation(self):
-        from passwordlib.util import generate_salt
+        from passwordlib.core import generate_salt
         self.assertIsInstance(generate_salt(), bytes)
         self.assertEqual(len(generate_salt(length=32)), 32)
         self.assertEqual(len(generate_salt(length=64)), 64)
 
     def test_dumping(self):
-        from passwordlib.util import (
+        from passwordlib.core import (
             dumps,
             get_algorithm, get_iterations, get_salt
         )
@@ -31,7 +32,7 @@ def test_dumping(self):
         self.assertIsInstance(dumped, bytes)
 
     def test_loading(self):
-        from passwordlib.util import (
+        from passwordlib.core import (
             dumps, loads,
             get_algorithm, get_iterations, get_salt
         )
@@ -49,7 +50,7 @@ def test_loading(self):
         self.assertEqual(loaded.hashed, hashed)
 
     def test_redumping(self):
-        from passwordlib.util import (
+        from passwordlib.core import (
             dumps, loads,
             get_algorithm, get_iterations, get_salt,
         )
@@ -67,7 +68,7 @@ def test_redumping(self):
         self.assertEqual(dumped, dumped2)
 
     def test_extraction(self):
-        from passwordlib.util import (
+        from passwordlib.core import (
             dumps,
             extract_algorythm, extract_iterations, extract_salt, extract_hashed,
             get_algorithm, get_iterations, get_salt,