enigmapython 2.0.2__tar.gz → 3.0.1__tar.gz

{enigmapython-2.0.2 → enigmapython-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: enigmapython
-Version: 2.0.2
+Version: 3.0.1
 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
@@ -67,6 +67,10 @@ This project is listed on [Wikipedia](https://en.wikipedia.org/wiki/List_of_Enig
 - **Flexible Configuration**: **enigmapython** allows customization of the Enigma machine configuration, enabling users to experiment with different rotor settings, reflectors, and ring positions.
 - **Easy Extension**: **enigmapython** is designed to be easily extensible, allowing developers to add new features or enhance the existing implementation.
 - **Simple yet faithful**: don't be fooled by its simplicity; **enigmapython** implements 100% the algorithms of many Enigma machine models, allowing to decode a message that has been encoded by a real Enigma machine and also the contrary.
+    
+## Enigma mechanics
+
+For a detailed description of the rotor movement and stepping logic, including pseudocode, please refer to the [Enigma Mechanics](./docs/mechanics.md) documentation.
 
 ## Historical Accuracy & Verification
 
@@ -82,7 +86,7 @@ The following Enigma machine models (along with their rotors, reflectors and plu
 
 ### Enigma B (Sweden, s/n: A-133)*
 
-| Scrambler 	             | Wiring                    	        | Notch 	| Implemented 	    |
+| Scrambler 	             | Wiring                    	        | Turnover 	| Implemented 	    |
 |-------	                 |----------------------------	        |-------	|-------------      |
 | ETW       (passthrough)    | abcdefghijklmnopqrstuvxyzåäö 	    | N/A     	|   ✅           	|
 | Rotor I                    | psbgöxqjdhoäucfrtezvåinlymka         | ä     	|   ✅           	|
@@ -94,7 +98,7 @@ The following Enigma machine models (along with their rotors, reflectors and plu
 
 ### Enigma K (Commercial Enigma)
 
-| Scrambler 	             | Wiring                    	        | Notch 	| Implemented 	    |
+| Scrambler 	             | Wiring                    	        | Turnover 	| Implemented 	    |
 |-------	                 |----------------------------	        |-------	|-------------      |
 | ETW "QWERTZ"               | qwertzuioasdfghjkpyxcvbnml 	        | N/A     	|   ✅           	|
 | Rotor I                    | lpgszmhaeoqkvxrfybutnicjdw 	        | y     	|   ✅           	|
@@ -102,21 +106,21 @@ The following Enigma machine models (along with their rotors, reflectors and plu
 | Rotor III                  | cjgdpshkturawzxfmynqobvlie 	        | n     	|   ✅           	|
 | Reflector UKW              | imetcgfraysqbzxwlhkdvupojn 	        | N/A     	|   ✅           	|
 
+### Enigma D (Commercial Enigma)
 
-### Enigma D
-
-| Scrambler 	             | Wiring                    	        | Notch 	| Implemented 	    |
+| Scrambler 	             | Wiring                    	        | Turnover 	| Implemented 	    |
 |-------	                 |----------------------------	        |-------	|-------------      |
 | ETW "QWERTZ"               | qwertzuioasdfghjkpyxcvbnml 	        | N/A     	|   ✅           	|
-| Rotor I                    | lpgszmhaeoqkvxrfybutnicjdw 	        | y     	|   ✅           	|
-| Rotor II                   | slvgbtfxjqohewirzyamkpcndu 	        | e     	|   ✅           	|
-| Rotor III                  | bdfhjlcprtxvznyeiwgakmusqo 	        | n     	|   ✅           	|
+| Rotor I                    | lpgszmhaeoqkvxrfybutnicjdw 	        | z*     	|   ✅           	|
+| Rotor II                   | slvgbtfxjqohewirzyamkpcndu 	        | z*    	|   ✅           	|
+| Rotor III                  | cjgdpshkturawzxfmynqobvlie 	        | z*     	|   ✅           	|
 | Reflector UKW              | imetcgfraysqbzxwlhkdvupojn 	        | N/A     	|   ✅           	|
 
+*Enigma D rotor turnover happens at Z when ringstellung is 0 (A), otherwise turnover position is calculated using the formula `turnover = (ringstellung + 1) % 26`.
 
 ### Enigma Z (Z30 Mark I)*
 
-| Scrambler 	             | Wiring                     | Notch | Implemented |
+| Scrambler 	             | Wiring                     | Turnover | Implemented |
 |-------	                 |----------------------------|-------|-------------|
 | ETW       (passthrough)    | 1234567890 	    | N/A     |   ✅  |
 | Rotor I                    | 6418270359       | 9       |   ✅  |
@@ -128,7 +132,7 @@ The following Enigma machine models (along with their rotors, reflectors and plu
 
 ### Enigma I 
 
-| Scrambler 	             | Wiring                    	        | Notch 	| Implemented 	    |
+| Scrambler 	             | Wiring                    	        | Turnover 	| Implemented 	    |
 |-------	                 |----------------------------	        |-------	|-------------      |
 | Plugboard (passthrough+swappable)    | N/A 	        | N/A     	|   ✅           	|
 | ETW       (passthrough)    | abcdefghijklmnopqrstuvwxyz 	        | N/A     	|   ✅           	|
@@ -141,7 +145,7 @@ The following Enigma machine models (along with their rotors, reflectors and plu
 
 ### Enigma I Norway (Norenigma)
 
-| Scrambler 	             | Wiring                    	        | Notch 	| Implemented 	    |
+| Scrambler 	             | Wiring                    	        | Turnover 	| Implemented 	    |
 |-------	                 |----------------------------	        |-------	|-------------      |
 | Plugboard (passthrough+swappable)    | N/A 	        | N/A     	|   ✅           	|
 | ETW       (passthrough)    | abcdefghijklmnopqrstuvwxyz 	        | N/A     	|   ✅           	|
@@ -154,7 +158,7 @@ The following Enigma machine models (along with their rotors, reflectors and plu
 
 ### Enigma I Sondermaschine (special machine)
 
-| Scrambler 	             | Wiring                    	        | Notch 	| Implemented 	    |
+| Scrambler 	             | Wiring                    	        | Turnover 	| Implemented 	    |
 |-------	                 |----------------------------	        |-------	|-------------      |
 | Plugboard (passthrough+swappable)    | N/A 	        | N/A     	|   ✅           	|
 | ETW       (passthrough)    | abcdefghijklmnopqrstuvwxyz 	        | N/A     	|   ✅           	|
@@ -166,7 +170,7 @@ The following Enigma machine models (along with their rotors, reflectors and plu
 
 ### Enigma M3
 
-| Scrambler 	             | Wiring                    	        | Notch 	| Implemented 	    |
+| Scrambler 	             | Wiring                    	        | Turnover 	| Implemented 	    |
 |-------	                 |----------------------------	        |-------	|-------------      |
 | Plugboard (passthrough+swappable)    | N/A 	        | N/A     	|   ✅           	|
 | ETW       (passthrough)    | abcdefghijklmnopqrstuvwxyz 	        | N/A     	|   ✅           	|
@@ -183,7 +187,7 @@ The following Enigma machine models (along with their rotors, reflectors and plu
 
 ### Enigma M4
 
-| Scrambler 	             | Wiring                    	        | Notch 	| Implemented 	    |
+| Scrambler 	             | Wiring                    	        | Turnover 	| Implemented 	    |
 |-------	                 |----------------------------	        |-------	|-------------      |
 | Plugboard (passthrough+swappable)    | N/A 	        | N/A     	|   ✅           	|
 | ETW       (passthrough)    | abcdefghijklmnopqrstuvwxyz 	        | N/A     	|   ✅           	|
@@ -200,6 +204,53 @@ The following Enigma machine models (along with their rotors, reflectors and plu
 | Reflector B Thin           | enkqauywjicopblmdxzvfthrgs 	        | N/A     	|   ✅           	|
 | Reflector C Thin           | rdobjntkvehmlfcwzaxgyipsuq 	        | N/A     	|   ✅           	|
 
+### Custom Machine
+
+| Scrambler 	             | Wiring                    	        | Turnover 	| Implemented 	    |
+|-------	                 |----------------------------	        |-------	|-------------      |
+| Plugboard (passthrough+swappable)    | N/A 	        | N/A     	|   ✅           	|
+| ETW (Entry Wheel)          | Custom 	        | N/A     	|   ✅           	|
+| Rotor                      | Custom 	        | Custom     	|   ✅           	|
+| Reflector                  | Custom 	        | N/A     	|   ✅           	|
+
+
+You can create a fully customized Enigma machine by instantiating the base components manually. This allows you to define custom alphabets, wirings, and turnover positions.
+
+```python
+from enigmapython.Enigma import Enigma
+from enigmapython.Rotor import Rotor
+from enigmapython.Reflector import Reflector
+from enigmapython.SwappablePlugboard import SwappablePlugboard
+from enigmapython.Etw import Etw
+from enigmapython.Alphabets import Alphabets
+
+# 1. Define alphabet
+alphabet = Alphabets.lookup.get("latin_i18n_26chars_lowercase")
+
+# 2. Create custom rotors
+# Parameters: wiring, turnover_indexes, alphabet, initial_position, ring_setting
+rotor1 = Rotor("ekmflgdqvzntowyhxuspaibrcj", [16], alphabet, 0, 0) # Turnover at 'q'
+rotor2 = Rotor("ajdksiruxblhwtmcqgznpyfvoe", [4], alphabet, 0, 0)  # Turnover at 'e'
+rotor3 = Rotor("bdfhjlcprtxvznyeiwgakmusqo", [21], alphabet, 0, 0) # Turnover at 'v'
+
+# 3. Create custom reflector
+reflector = Reflector("yruhqsldpxngokmiebfzcwvjat", alphabet)
+
+# 4. Create other components
+# Swappable plugboard allows you to connect pairs of letters
+plugboard = SwappablePlugboard(alphabet=alphabet)
+plugboard.swap("a", "z") # Example: swap 'a' with 'z'
+
+etw = Etw(alphabet, alphabet) # Passthrough ETW using alphabet as wiring
+
+# 5. Assemble the Enigma machine
+engine = Enigma(plugboard, [rotor1, rotor2, rotor3], reflector, etw, auto_increment_rotors=True, alphabet=alphabet)
+
+# 6. Encrypt/Decrypt
+cipher = engine.input_string("hello")
+print(f"Ciphertext: {cipher}") # Outputs: mfnca
+```
+
 ## Prerequisites
 
 - Python 3.11

enigmapython-3.0.1/enigmapython/DynamicTurnoverRotor.py

@@ -0,0 +1,39 @@
+from .Rotor import Rotor
+
+class DynamicTurnoverRotor(Rotor):
+    """
+    Rotor that updates its notch position based on the ring setting using the formula:
+    effective_notch = (notch + ringstellung) mod 26
+    """
+    original_turnover_indexes = None
+
+    def __init__(self, wiring, turnover_indexes, alphabet, position=0, ring=0, turnover_function=None):
+        # We must save the original notch indexes before calling super().__init__
+        # because super().__init__ calls set_ring (via Settable), which we override.
+        self.original_turnover_indexes = turnover_indexes
+        
+        if turnover_function is None:
+            self.turnover_function = lambda notch, ring, length: (notch + ring) % length
+        else:
+            self.turnover_function = turnover_function
+            
+        super().__init__(wiring, turnover_indexes, alphabet, position, ring)
+        # Rotor.__init__ sets self.turnover_indexes = turnover_indexes at the end, 
+        # overwriting any changes made by our set_ring during init.
+        # So we must call set_ring again to ensure notches are calculated correctly.
+        self.set_ring(ring)
+
+    def reset_ring(self):
+        self.set_ring(0)
+
+    def set_ring(self, ring):
+        # First perform standard ring setting (wiring rotation)
+        super().set_ring(ring)
+        
+        # Now adjust notch positions using the turnover function
+        if self.original_turnover_indexes is not None:
+            length = len(self.wiring)
+            self.turnover_indexes = []
+            for notch in self.original_turnover_indexes:
+                new_notch = self.turnover_function(notch, ring, length)
+                self.turnover_indexes.append(new_notch)

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/Enigma.py

@@ -107,7 +107,6 @@ class Enigma(Observer,Journaled,Clonable):
             iteration -=1
             logging.debug("Scrambled letter from rotor{}: {}".format(str(iteration+1),scrambled_char))   
         
-        # Processing rotor 1 returning signal by ETW
         # Processing rotor 1 returning signal by ETW
         scrambled_char = self.etw.scramble_char(self.alphabet_list,(inverted_wiring.index(self.shift_letter(scrambled_char, (0 - self.rotors[iteration].position),self.alphabet_list))), 0)
         logging.debug("Scrambled letter from ETW: {}".format(scrambled_char))
@@ -123,14 +122,14 @@ class Enigma(Observer,Journaled,Clonable):
             self.rotors[self.rotors.index(observable)+1].increment_position()
             logging.debug("Rotor at index {} has been incremented by 1 position".format(self.rotors.index(observable)+1))
             # Engaging the enigma double step issue, only if the next rotor position is in its notch indexe/s
-            if self.rotors[self.rotors.index(observable)+1].position in self.rotors[self.rotors.index(observable)+1].notch_indexes:
+            if self.rotors[self.rotors.index(observable)+1].position in self.rotors[self.rotors.index(observable)+1].turnover_indexes:
                 self.rotors[self.rotors.index(observable)+1].double_step_triggered = True
         # If the rotor is the last one in the list, but the machine has a rotating reflector, increment its position by 1
         if observable in self.rotors and self.rotors.index(observable) == len(self.rotors)-1 and isinstance(self.reflector, RotatingReflector):
             self.reflector.increment_position()
             logging.debug("Reflector has been incremented by 1 position")
             # Engaging the enigma double step issue, only if the next rotor position is in its notch indexe/s
-            if self.reflector.position in self.reflector.notch_indexes:
+            if self.reflector.position in self.reflector.turnover_indexes:
                 self.reflector.double_step_triggered = True
         
     @staticmethod        

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaB_A133RotorI.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaB_A133RotorI(Rotor):
     
     wiring = 'psbgöxqjdhoäucfrtezvåinlymka'
-    notch_indexes = [11]
+    turnover_indexes = [11]
     tag = "B_A133_I"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,7 @@ class EnigmaB_A133RotorI(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("enigma_b_a133_28chars_lowercase")
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaB_A133RotorII.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaB_A133RotorII(Rotor):
     
     wiring = 'chnsyöadmotrzxbäigåekqupflvj'
-    notch_indexes = [15]
+    turnover_indexes = [15]
     tag = "B_A133_II"
 
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,7 @@ class EnigmaB_A133RotorII(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("enigma_b_a133_28chars_lowercase")
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaB_A133RotorIII.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaB_A133RotorIII(Rotor):
     
     wiring = 'åvqiaäxrjbözspcfyunthdomekgl'
-    notch_indexes = [5]
+    turnover_indexes = [5]
     tag = "B_A133_III"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,7 @@ class EnigmaB_A133RotorIII(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("enigma_b_a133_28chars_lowercase")
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaDRotorI.py

@@ -1,10 +1,11 @@
+from .DynamicTurnoverRotor import DynamicTurnoverRotor
 from .Rotor import Rotor
 from .Alphabets import Alphabets
 
-class EnigmaDRotorI(Rotor):
+class EnigmaDRotorI(DynamicTurnoverRotor):
     
     wiring = 'lpgszmhaeoqkvxrfybutnicjdw'
-    notch_indexes = [24]
+    turnover_indexes = [25]
     tag = "D_I"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +13,8 @@ class EnigmaDRotorI(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes,
-                            alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase')
+                            turnover_indexes=self.turnover_indexes,
+                            alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase'),
+                            turnover_function=lambda n, r, l: (n + r) % l
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaDRotorII.py

@@ -1,10 +1,10 @@
-from .Rotor import Rotor
+from .DynamicTurnoverRotor import DynamicTurnoverRotor
 from .Alphabets import Alphabets
 
-class EnigmaDRotorII(Rotor):
+class EnigmaDRotorII(DynamicTurnoverRotor):
     
     wiring = 'slvgbtfxjqohewirzyamkpcndu'
-    notch_indexes = [4]
+    turnover_indexes = [25]
     tag = "D_II"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,8 @@ class EnigmaDRotorII(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes,
-                            alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase')
+                            turnover_indexes=self.turnover_indexes,
+                            alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase'),
+                            turnover_function=lambda n, r, l: (n + r) % l
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaDRotorIII.py

@@ -1,10 +1,10 @@
-from .Rotor import Rotor
+from .DynamicTurnoverRotor import DynamicTurnoverRotor
 from .Alphabets import Alphabets
 
-class EnigmaDRotorIII(Rotor):
+class EnigmaDRotorIII(DynamicTurnoverRotor):
     
     wiring = 'cjgdpshkturawzxfmynqobvlie'
-    notch_indexes = [13]
+    turnover_indexes = [25]
     tag = "D_III"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,8 @@ class EnigmaDRotorIII(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes,
-                            alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase')
+                            turnover_indexes=self.turnover_indexes,
+                            alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase'),
+                            turnover_function=lambda n, r, l: (n + r) % l
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaINorwayRotorI.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaINorwayRotorI(Rotor):
     
     wiring = 'wtokasuyvrbxjhqcpzefmdinlg'
-    notch_indexes = [16]
+    turnover_indexes = [16]
     tag = "IN_I"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,7 @@ class EnigmaINorwayRotorI(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes,
+                            turnover_indexes=self.turnover_indexes,
                             alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase')
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaINorwayRotorII.py

@@ -5,7 +5,7 @@ from .Alphabets import Alphabets
 class EnigmaINorwayRotorII(Rotor):
     
     wiring = 'gjlpubswemctqvhxaofzdrkyni'
-    notch_indexes = [4]
+    turnover_indexes = [4]
     tag = "IN_II"
     
     def __init__(self, position = 0, ring = 0):
@@ -13,6 +13,6 @@ class EnigmaINorwayRotorII(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes,
+                            turnover_indexes=self.turnover_indexes,
                             alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase')
                         )

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaINorwayRotorIII.py

@@ -5,7 +5,7 @@ from .Alphabets import Alphabets
 class EnigmaINorwayRotorIII(Rotor):
     
     wiring = 'jwfmhnbpusdytixvzgrqlaoekc'
-    notch_indexes = [21]
+    turnover_indexes = [21]
     tag = "IN_III"
 
     def __init__(self, position = 0, ring = 0):
@@ -13,7 +13,7 @@ class EnigmaINorwayRotorIII(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes,
+                            turnover_indexes=self.turnover_indexes,
                             alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase')
                         )
 

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaINorwayRotorIV.py

@@ -5,7 +5,7 @@ from .Alphabets import Alphabets
 class EnigmaINorwayRotorIV(Rotor):
     
     wiring = 'fgzjmvxepbwshqtliudykcnrao'
-    notch_indexes = [21]
+    turnover_indexes = [21]
     tag = "IN_IV"
 
     def __init__(self, position = 0, ring = 0):
@@ -13,7 +13,7 @@ class EnigmaINorwayRotorIV(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes,
+                            turnover_indexes=self.turnover_indexes,
                             alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase')
                         )
 

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaINorwayRotorV.py

@@ -5,7 +5,7 @@ from .Alphabets import Alphabets
 class EnigmaINorwayRotorV(Rotor):
     
     wiring = 'hejxqotzbvfdascilwpgynmurk'
-    notch_indexes = [25]
+    turnover_indexes = [25]
     tag = "IN_V"
 
     def __init__(self, position = 0, ring = 0):
@@ -13,7 +13,7 @@ class EnigmaINorwayRotorV(Rotor):
                             wiring=self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes,
+                            turnover_indexes=self.turnover_indexes,
                             alphabet=Alphabets.lookup.get('latin_i18n_26chars_lowercase')
                         )
 

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaIRotorI.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaIRotorI(Rotor):
     
     wiring = 'ekmflgdqvzntowyhxuspaibrcj'
-    notch_indexes = [16]
+    turnover_indexes = [16]
     tag = "I_I"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,7 @@ class EnigmaIRotorI(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaIRotorII.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaIRotorII(Rotor):
     
     wiring = 'ajdksiruxblhwtmcqgznpyfvoe'
-    notch_indexes = [4]
+    turnover_indexes = [4]
 
     tag = "I_II"
     
@@ -13,7 +13,7 @@ class EnigmaIRotorII(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaIRotorIII.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaIRotorIII(Rotor):
     
     wiring = 'bdfhjlcprtxvznyeiwgakmusqo'
-    notch_indexes = [21]
+    turnover_indexes = [21]
 
     tag = "I_III"
     
@@ -13,7 +13,7 @@ class EnigmaIRotorIII(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaIRotorIV.py

@@ -5,7 +5,7 @@ from .Alphabets import Alphabets
 class EnigmaIRotorIV(Rotor):
     
     wiring = 'esovpzjayquirhxlnftgkdcmwb'
-    notch_indexes = [9]
+    turnover_indexes = [9]
 
     tag = "I_IV"
 
@@ -14,7 +14,7 @@ class EnigmaIRotorIV(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )
 

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaIRotorV.py

@@ -5,7 +5,7 @@ from .Alphabets import Alphabets
 class EnigmaIRotorV(Rotor):
     
     wiring = 'vzbrgityupsdnhlxawmjqofeck'
-    notch_indexes = [25]
+    turnover_indexes = [25]
     tag = "I_V"
 
     def __init__(self, position = 0, ring = 0):
@@ -13,7 +13,7 @@ class EnigmaIRotorV(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )
 

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaISonderRotorI.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaISonderRotorI(Rotor):
     
     wiring = 'veosirzujdqckgwypnxaflthmb'
-    notch_indexes = [16]
+    turnover_indexes = [16]
     tag = "IS_I"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,7 @@ class EnigmaISonderRotorI(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaISonderRotorII.py

@@ -5,7 +5,7 @@ from .Alphabets import Alphabets
 class EnigmaISonderRotorII(Rotor):
     
     wiring = 'uemoatqlshpkcyfwjzbgvxidnr'
-    notch_indexes = [4]
+    turnover_indexes = [4]
     tag = "IS_II"
     
     def __init__(self, position = 0, ring = 0):
@@ -13,6 +13,6 @@ class EnigmaISonderRotorII(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaISonderRotorIII.py

@@ -5,7 +5,7 @@ from .Alphabets import Alphabets
 class EnigmaISonderRotorIII(Rotor):
     
     wiring = 'tzhxmbsipnurjfdkeqvcwglaoy'
-    notch_indexes = [21]
+    turnover_indexes = [21]
     tag = "IS_III"
 
     def __init__(self, position = 0, ring = 0):
@@ -13,7 +13,7 @@ class EnigmaISonderRotorIII(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )
 

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaKRotorI.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaKRotorI(Rotor):
     
     wiring = 'lpgszmhaeoqkvxrfybutnicjdw'
-    notch_indexes = [24]  # Y (notch position)
+    turnover_indexes = [24]  # Y (notch position)
     tag = "K_I"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,7 @@ class EnigmaKRotorI(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )
     

{enigmapython-2.0.2 → enigmapython-3.0.1}/enigmapython/EnigmaKRotorII.py

@@ -4,7 +4,7 @@ from .Alphabets import Alphabets
 class EnigmaKRotorII(Rotor):
     
     wiring = 'slvgbtfxjqohewirzyamkpcndu'
-    notch_indexes = [4]  # E (notch position)
+    turnover_indexes = [4]  # E (notch position)
     tag = "K_II"
     
     def __init__(self, position = 0, ring = 0):
@@ -12,7 +12,7 @@ class EnigmaKRotorII(Rotor):
                             wiring = self.wiring, 
                             position=position, 
                             ring=ring, 
-                            notch_indexes=self.notch_indexes, 
+                            turnover_indexes=self.turnover_indexes, 
                             alphabet=Alphabets.lookup.get("latin_i18n_26chars_lowercase")
                         )