Skip to content

Commit 7d9892e

Browse files
committed
Scrambler __str__
1 parent 3339989 commit 7d9892e

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

examples/render_enigma.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ def render_enigma_diagram(enigma):
100100
etw = EnigmaZEtw()
101101
enigma = EnigmaZ(rotor3, rotor2, rotor1, reflector, etw, True)
102102
enigma.input_string('0'*41)
103-
Utils.render_enigma_diagram(enigma)
103+
print(enigma.reflector)
104+
#Utils.render_enigma_diagram(enigma)
104105
#render_enigma_diagram(enigma)
105106

106107
plugboard = PlugboardPassthrough()
@@ -113,8 +114,9 @@ def render_enigma_diagram(enigma):
113114
reflector = ReflectorUKWBThin()
114115
etw = EtwPassthrough()
115116
enigma = EnigmaM4(plugboard, rotor1, rotor2, rotor3, rotor4, reflector, etw, True)
116-
print(enigma.input_string('d'))
117-
Utils.render_enigma_diagram(enigma)
117+
#print(enigma.input_string('d'))
118+
print(enigma.reflector)
119+
#Utils.render_enigma_diagram(enigma)
118120
#render_enigma_diagram(enigma)
119121

120122
# Setup logging
@@ -130,8 +132,8 @@ def render_enigma_diagram(enigma):
130132
enigma = EnigmaM3(plugboard,rotor3, rotor2, rotor1,reflector,etw,True)
131133
other_enigma = copy.deepcopy(enigma)
132134
enigma.input_string('d')
133-
print(enigma.plugboard.journal)
134-
Utils.render_enigma_diagram(enigma)
135+
print(enigma.reflector)
136+
#Utils.render_enigma_diagram(enigma)
135137
#render_enigma_diagram(enigma)
136138
#render_enigma_diagram(other_enigma)
137139
#Utils.render_enigma_diagram(enigma)

src/enigma/enigmapython/Scrambler.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,7 @@ def set_scrambler_ring(self, ring):
5757
def __shift(letter, shift, alphabet_list):
5858
for i in range(0, len(alphabet_list)):
5959
if alphabet_list[i] == letter:
60-
return alphabet_list[(i + shift) % len(alphabet_list)]
60+
return alphabet_list[(i + shift) % len(alphabet_list)]
61+
62+
def __str__(self):
63+
return self.wiring

0 commit comments

Comments
 (0)