encommon 0.20.0__tar.gz → 0.20.2__tar.gz

{encommon-0.20.0/encommon.egg-info → encommon-0.20.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: encommon
-Version: 0.20.0
+Version: 0.20.2
 Summary: Enasis Network Common Library
 License: MIT
 Classifier: Programming Language :: Python :: 3

{encommon-0.20.0 → encommon-0.20.2}/encommon/colors/color.py

@@ -84,10 +84,7 @@ class Color:
         :returns: Boolean indicating outcome from the operation.
         """
 
-        color = int(
-            self.__source, 16)
-
-        return int(1e9 + color)
+        return hash(self.__source)
 
 
     def __str__(

{encommon-0.20.0 → encommon-0.20.2}/encommon/colors/test/test_color.py

@@ -31,7 +31,8 @@ def test_Color() -> None:
     assert repr(color) == (
         "Color('#000001')")
 
-    assert hash(color) > 0
+    assert isinstance(
+        hash(color), int)
 
     assert str(color) == '#000001'
 

{encommon-0.20.0 → encommon-0.20.2}/encommon/config/config.py

@@ -185,7 +185,7 @@ class Config:
         :returns: Configuration source loaded from the objects.
         """
 
-        files = self.files
+        files = self.__files
 
         ferged = files.merge
 
@@ -207,8 +207,8 @@ class Config:
         :returns: Configuration source loaded from the objects.
         """
 
-        files = self.files
-        paths = self.paths
+        files = self.__files
+        paths = self.__paths
 
         ferged = files.merge
         perged = paths.merge

{encommon-0.20.0 → encommon-0.20.2}/encommon/config/test/test_config.py

@@ -53,7 +53,8 @@ def test_Config(
         'config.Config object',
         config)
 
-    assert hash(config) > 0
+    assert isinstance(
+        hash(config), int)
 
     assert instr(
         'config.Config object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/config/test/test_files.py

@@ -61,7 +61,8 @@ def test_ConfigFile(
         'files.ConfigFile object',
         file)
 
-    assert hash(file) > 0
+    assert isinstance(
+        hash(file), int)
 
     assert instr(
         'files.ConfigFile object',
@@ -96,7 +97,8 @@ def test_ConfigFiles(
         'files.ConfigFiles object',
         files)
 
-    assert hash(files) > 0
+    assert isinstance(
+        hash(files), int)
 
     assert instr(
         'files.ConfigFiles object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/config/test/test_logger.py

@@ -83,7 +83,8 @@ def test_Message() -> None:
         'Message(level="info"',
         message)
 
-    assert hash(message) > 0
+    assert isinstance(
+        hash(message), int)
 
     assert instr(
         'Message(level="info"',
@@ -157,7 +158,8 @@ def test_Logger(
         'logger.Logger object',
         logger)
 
-    assert hash(logger) > 0
+    assert isinstance(
+        hash(logger), int)
 
     assert instr(
         'logger.Logger object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/config/test/test_paths.py

@@ -64,7 +64,8 @@ def test_ConfigPath(
         'paths.ConfigPath object',
         path)
 
-    assert hash(path) > 0
+    assert isinstance(
+        hash(path), int)
 
     assert instr(
         'paths.ConfigPath object',
@@ -98,7 +99,8 @@ def test_ConfigPaths(
         'paths.ConfigPaths object',
         paths)
 
-    assert hash(paths) > 0
+    assert isinstance(
+        hash(paths), int)
 
     assert instr(
         'paths.ConfigPaths object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/crypts/crypts.py

@@ -62,12 +62,14 @@ class Crypts:
         Initialize instance for class using provided parameters.
         """
 
-        from .params import CryptsParams
+        from .params import (
+            CryptsParams)
 
         if params is None:
             params = CryptsParams()
 
-        self.__params = deepcopy(params)
+        self.__params = (
+            deepcopy(params))
 
 
     @property
@@ -96,16 +98,22 @@ class Crypts:
         :returns: Encrypted value using the relevant passphrase.
         """
 
-        phrases = self.params.phrases
+        phrases = (
+            self.params
+            .phrases)
 
         if unique not in phrases:
             raise ValueError('unique')
 
-        phrase = phrases[unique].phrase
+        phrase = (
+            phrases[unique]
+            .phrase)
+
+        encoded = value.encode()
 
         encrypt = (
             Fernet(phrase)
-            .encrypt(value.encode())
+            .encrypt(encoded)
             .decode())
 
         return (
@@ -124,11 +132,16 @@ class Crypts:
         :returns: Decrypted value using the relevant passphrase.
         """
 
-        phrases = self.params.phrases
+        phrases = (
+            self.params
+            .phrases)
 
         value = crypt_clean(value)
 
-        if not re_match(ENCRYPT, value):
+        match = re_match(
+            ENCRYPT, value)
+
+        if match is None:
             raise ValueError('string')
 
         version, unique, value = (
@@ -137,11 +150,15 @@ class Crypts:
         if version != '1.0':
             raise ValueError('version')
 
-        phrase = phrases[unique].phrase
+        phrase = (
+            phrases[unique]
+            .phrase)
+
+        encoded = value.encode()
 
         return (
             Fernet(phrase)
-            .decrypt(value.encode())
+            .decrypt(encoded)
             .decode())
 
 
@@ -157,7 +174,9 @@ class Crypts:
         :param params: Parameters used to instantiate the class.
         """
 
-        phrases = self.params.phrases
+        phrases = (
+            self.params
+            .phrases)
 
         if unique in phrases:
             raise ValueError('unique')
@@ -175,7 +194,9 @@ class Crypts:
         :param unique: Unique identifier of mapping passphrase.
         """
 
-        phrases = self.params.phrases
+        phrases = (
+            self.params
+            .phrases)
 
         if unique not in phrases:
             raise ValueError('unique')

{encommon-0.20.0 → encommon-0.20.2}/encommon/crypts/test/test_crypts.py

@@ -60,7 +60,8 @@ def test_Crypts(
         'crypts.Crypts object',
         crypts)
 
-    assert hash(crypts) > 0
+    assert isinstance(
+        hash(crypts), int)
 
     assert instr(
         'crypts.Crypts object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/crypts/test/test_hashes.py

@@ -32,7 +32,8 @@ def test_Hashes() -> None:
         'hashes.Hashes object',
         hashes)
 
-    assert hash(hashes) > 0
+    assert isinstance(
+        hash(hashes), int)
 
     assert instr(
         'hashes.Hashes object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/parse/test/test_jinja2.py

@@ -65,7 +65,8 @@ def test_Jinja2(
         'jinja2.Jinja2 object',
         jinja2)
 
-    assert hash(jinja2) > 0
+    assert isinstance(
+        hash(jinja2), int)
 
     assert instr(
         'jinja2.Jinja2 object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/parse/test/test_network.py

@@ -37,7 +37,8 @@ def test_Network() -> None:
         "Network('12.34.",
         naddr)
 
-    assert hash(naddr) > 0
+    assert isinstance(
+        hash(naddr), int)
 
     assert instr(
         '12.34.56.7/32',

{encommon-0.20.0 → encommon-0.20.2}/encommon/times/duration.py

@@ -137,7 +137,7 @@ class Duration:
         :returns: Boolean indicating outcome from the operation.
         """
 
-        return int(self.__source * 100000)
+        return hash(self.__source)
 
 
     def __str__(

{encommon-0.20.0 → encommon-0.20.2}/encommon/times/test/test_duration.py

@@ -34,7 +34,8 @@ def test_Duration() -> None:
         'Duration(seconds=95401',
         durate)
 
-    assert hash(durate) > 0
+    assert isinstance(
+        hash(durate), int)
 
     assert str(durate) == '1d2h30m'
 

{encommon-0.20.0 → encommon-0.20.2}/encommon/times/test/test_time.py

@@ -38,7 +38,8 @@ def test_Time() -> None:
         "Time('1970-01-01T00:00",
         time)
 
-    assert hash(time) > 0
+    assert isinstance(
+        hash(time), int)
 
     assert instr(
         '1970-01-01T00:00:00.000',

{encommon-0.20.0 → encommon-0.20.2}/encommon/times/test/test_timer.py

@@ -52,7 +52,8 @@ def test_Timer(
         'timer.Timer object',
         timer)
 
-    assert hash(timer) > 0
+    assert isinstance(
+        hash(timer), int)
 
     assert instr(
         'timer.Timer object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/times/test/test_timers.py

@@ -109,7 +109,8 @@ def test_Timers(
         'timers.Timers object',
         timers)
 
-    assert hash(timers) > 0
+    assert isinstance(
+        hash(timers), int)
 
     assert instr(
         'timers.Timers object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/times/test/test_window.py

@@ -68,7 +68,8 @@ def test_Window(
         'window.Window object',
         window)
 
-    assert hash(window) > 0
+    assert isinstance(
+        hash(window), int)
 
     assert instr(
         'window.Window object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/times/test/test_windows.py

@@ -122,7 +122,8 @@ def test_Windows(
         'windows.Windows object',
         windows)
 
-    assert hash(windows) > 0
+    assert isinstance(
+        hash(windows), int)
 
     assert instr(
         'windows.Windows object',

{encommon-0.20.0 → encommon-0.20.2}/encommon/times/timers.py

@@ -395,7 +395,9 @@ class Timers:
         :returns: Newly constructed instance of related class.
         """
 
-        config = self.params.timers
+        config = (
+            self.params
+            .timers)
 
         if unique in config:
             raise ValueError('unique')

{encommon-0.20.0 → encommon-0.20.2}/encommon/times/windows.py

@@ -443,7 +443,9 @@ class Windows:
         :returns: Newly constructed instance of related class.
         """
 
-        config = self.params.windows
+        config = (
+            self.params
+            .windows)
 
         if unique in config:
             raise ValueError('unique')

{encommon-0.20.0 → encommon-0.20.2}/encommon/types/test/test_empty.py

@@ -32,7 +32,8 @@ def test_EmptyType() -> None:
 
     assert repr(empty) == 'Empty'
 
-    assert hash(empty) > 0
+    assert isinstance(
+        hash(empty), int)
 
     assert str(empty) == 'Empty'
 

encommon-0.20.2/encommon/version.txt

@@ -0,0 +1 @@
+0.20.2

{encommon-0.20.0 → encommon-0.20.2/encommon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: encommon
-Version: 0.20.0
+Version: 0.20.2
 Summary: Enasis Network Common Library
 License: MIT
 Classifier: Programming Language :: Python :: 3

encommon-0.20.0/encommon/version.txt

@@ -1 +0,0 @@
-0.20.0