enigmapython 1.2.0__tar.gz → 1.2.2__tar.gz

{enigmapython-1.2.0 → enigmapython-1.2.2}/PKG-INFO

@@ -1,10 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: enigmapython
-Version: 1.2.0
+Version: 1.2.2
 Summary: A simple yet faithful library to emulate different Enigma machines models using Python
 Home-page: https://github.com/denismaggior8/enigma-python
 Author: Denis Maggiorotto
 Description-Content-Type: text/markdown
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: summary
 
 # Enigma Python library
 

{enigmapython-1.2.0 → enigmapython-1.2.2}/enigmapython/Clonable.py

@@ -1,6 +1,10 @@
 import copy
 
 class Clonable:
+
+    def __init__(self):
+        super().__init__()
+
     def clone(self):
         """
         Creates a deep copy of the current instance.

{enigmapython-1.2.0 → enigmapython-1.2.2}/enigmapython/SwappablePlugboard.py

@@ -1,5 +1,4 @@
 from .Plugboard import Plugboard
-from .Utils import Utils
 from .Alphabets import Alphabets
 from .Swappable import Swappable
 

enigmapython-1.2.2/enigmapython/Utils.py

@@ -0,0 +1,51 @@
+
+class Utils:
+
+
+    @staticmethod
+    def find_divergence(str1, str2):
+        """
+        Finds the index where two strings first diverge, 
+        and the characters at that index in both strings.
+        
+        Parameters:
+        str1 (str): The first string.
+        str2 (str): The second string.
+        
+        Returns:
+        tuple: (index, char1, char2) where index is the position of divergence,
+            char1 is the character in str1 at the divergence,
+            and char2 is the character in str2 at the divergence.
+            If the strings only diverge in length, char1 and char2 will be None.
+            If the strings are identical, returns None.
+        """
+        # Iterate through both strings up to the length of the shorter string
+        for i in range(min(len(str1), len(str2))):
+            if str1[i] != str2[i]:
+                return i, str1[i], str2[i]  # Return the index and differing characters
+        
+        # If the strings differ in length
+        if len(str1) != len(str2):
+            return min(len(str1), len(str2)), None, None
+        
+        # If the strings are identical
+        return None
+
+    @staticmethod
+    def find_all_subclasses(cls):
+        return set(cls.__subclasses__()).union(
+            [s for c in cls.__subclasses__() for s in Utils.find_all_subclasses(c)])
+
+    @staticmethod    
+    def swap_chars(string, ch1, ch2):
+        if ch1 == ch2: return string
+        str_list = []
+        for char in string:
+            if char == ch1:
+                str_list.append(ch2)
+            elif char == ch2:
+                str_list.append(ch1)
+            else:
+                str_list.append(char)
+        return ''.join(str_list)
+    

enigmapython-1.2.0/enigmapython/Utils.py → enigmapython-1.2.2/enigmapython/XRay.py

@@ -1,13 +1,10 @@
-from importlib import import_module
 from rich.console import Console
 from rich.text import Text
-from enigmapython.RotatingReflector import RotatingReflector
-
-
-class Utils:
+from enigmapython.RotatingReflector import RotatingReflector    
 
+class XRay():
     @staticmethod
-    def render_enigma_diagram(enigma):
+    def render_enigma_xray(enigma):
         """
         Render the Enigma Z ASCII diagram with a variable number of rotors.
         UKW, ETW and Plugboard are always visible. The rotor numbers start from 0.
@@ -58,61 +55,4 @@ class Utils:
         Ring:                {rotors_rings}
         """
         console.print(Text(diagram, style="bold"))
-        return Text(diagram, style="bold")
-
-    @staticmethod
-    def find_divergence(str1, str2):
-        """
-        Finds the index where two strings first diverge, 
-        and the characters at that index in both strings.
-        
-        Parameters:
-        str1 (str): The first string.
-        str2 (str): The second string.
-        
-        Returns:
-        tuple: (index, char1, char2) where index is the position of divergence,
-            char1 is the character in str1 at the divergence,
-            and char2 is the character in str2 at the divergence.
-            If the strings only diverge in length, char1 and char2 will be None.
-            If the strings are identical, returns None.
-        """
-        # Iterate through both strings up to the length of the shorter string
-        for i in range(min(len(str1), len(str2))):
-            if str1[i] != str2[i]:
-                return i, str1[i], str2[i]  # Return the index and differing characters
-        
-        # If the strings differ in length
-        if len(str1) != len(str2):
-            return min(len(str1), len(str2)), None, None
-        
-        # If the strings are identical
-        return None
-
-    @staticmethod
-    def find_all_subclasses(cls):
-        return set(cls.__subclasses__()).union(
-            [s for c in cls.__subclasses__() for s in Utils.find_all_subclasses(c)])
-
-    @staticmethod
-    def get_class_instance(cls):
-        try:
-            module_path, class_name = cls.rsplit('.', 1)
-            module = import_module(module_path)
-            return getattr(module, class_name)
-        except (ImportError, AttributeError) as e:
-            raise ImportError(cls)
-
-    @staticmethod    
-    def swap_chars(string, ch1, ch2):
-        if ch1 == ch2: return string
-        str_list = []
-        for char in string:
-            if char == ch1:
-                str_list.append(ch2)
-            elif char == ch2:
-                str_list.append(ch1)
-            else:
-                str_list.append(char)
-        return ''.join(str_list)
-    
+        return Text(diagram, style="bold")

{enigmapython-1.2.0 → enigmapython-1.2.2}/enigmapython.egg-info/PKG-INFO

@@ -1,10 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: enigmapython
-Version: 1.2.0
+Version: 1.2.2
 Summary: A simple yet faithful library to emulate different Enigma machines models using Python
 Home-page: https://github.com/denismaggior8/enigma-python
 Author: Denis Maggiorotto
 Description-Content-Type: text/markdown
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: summary
 
 # Enigma Python library
 

{enigmapython-1.2.0 → enigmapython-1.2.2}/enigmapython.egg-info/SOURCES.txt

@@ -78,6 +78,7 @@ enigmapython/Scrambler.py
 enigmapython/Swappable.py
 enigmapython/SwappablePlugboard.py
 enigmapython/Utils.py
+enigmapython/XRay.py
 enigmapython/__init__.py
 enigmapython.egg-info/PKG-INFO
 enigmapython.egg-info/SOURCES.txt

{enigmapython-1.2.0 → enigmapython-1.2.2}/setup.py

@@ -12,7 +12,7 @@ setup(
     long_description_content_type='text/markdown',
     url="https://github.com/denismaggior8/enigma-python",
     name="enigmapython",
-    version="1.2.0",
+    version="1.2.2",
     packages=find_packages(
         # All keyword arguments below are optional:
         where='.',  # '.' by default