projects
/
cipher-training.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a976454
)
Tweaks to pocket enigma
author
Neil Smith
<neil.git@njae.me.uk>
Thu, 10 Jul 2014 21:24:53 +0000
(22:24 +0100)
committer
Neil Smith
<neil.git@njae.me.uk>
Thu, 10 Jul 2014 21:24:53 +0000
(22:24 +0100)
cipher.py
patch
|
blob
|
history
diff --git
a/cipher.py
b/cipher.py
index 0fb6dc255d4ce42656783b1e28f7c2caa379a0b0..713db294846eece6c2ae72c9d1cfc5502836132f 100644
(file)
--- a/
cipher.py
+++ b/
cipher.py
@@
-540,7
+540,10
@@
class PocketEnigma(object):
else:
self.validate_wheel_spec(wheel)
self.make_wheel_map(wheel)
else:
self.validate_wheel_spec(wheel)
self.make_wheel_map(wheel)
- self.position = ord(position) - ord('a')
+ if position in string.ascii_lowercase:
+ self.position = ord(position) - ord('a')
+ else:
+ self.position = position
def make_wheel_map(self, wheel_spec):
"""Expands a wheel specification from a list of letter-letter pairs
def make_wheel_map(self, wheel_spec):
"""Expands a wheel specification from a list of letter-letter pairs
@@
-574,7
+577,7
@@
class PocketEnigma(object):
ValueError: Wheel specification does not contain 26 letters
"""
if len(wheel_spec) != 13:
ValueError: Wheel specification does not contain 26 letters
"""
if len(wheel_spec) != 13:
- raise ValueError("Wheel specification has {} pairs, require 13".
+ raise ValueError("Wheel specification has {} pairs, require
s
13".
format(len(wheel_spec)))
for p in wheel_spec:
if len(p) != 2:
format(len(wheel_spec)))
for p in wheel_spec:
if len(p) != 2:
@@
-604,8
+607,16
@@
class PocketEnigma(object):
5
>>> ''.join([pe.lookup(l) for l in string.ascii_lowercase])
'udhbfejcpgmokrliwntsayqzvx'
5
>>> ''.join([pe.lookup(l) for l in string.ascii_lowercase])
'udhbfejcpgmokrliwntsayqzvx'
+ >>> pe.lookup('A')
+ ''
"""
"""
- return chr((self.wheel_map[(ord(letter) - ord('a') - self.position) % 26] + self.position) % 26 + ord('a'))
+ if letter in string.ascii_lowercase:
+ return chr(
+ (self.wheel_map[(ord(letter) - ord('a') - self.position) % 26] +
+ self.position) % 26 +
+ ord('a'))
+ else:
+ return ''
def advance(self):
"""Advances the wheel one position.
def advance(self):
"""Advances the wheel one position.
@@
-618,7
+629,7
@@
class PocketEnigma(object):
self.position = (self.position + 1) % 26
return self.position
self.position = (self.position + 1) % 26
return self.position
- def encipher(self, message):
+ def encipher(self, message
, starting_position=None
):
"""Enciphers a whole message.
>>> pe.set_position('f')
"""Enciphers a whole message.
>>> pe.set_position('f')
@@
-629,7
+640,11
@@
class PocketEnigma(object):
5
>>> pe.encipher('kjsglcjoqc')
'helloworld'
5
>>> pe.encipher('kjsglcjoqc')
'helloworld'
+ >>> pe.encipher('helloworld', starting_position = 'x')
+ 'egrekthnnf'
"""
"""
+ if starting_position:
+ self.set_position(starting_position)
transformed = ''
for l in message:
transformed += self.encipher_letter(l)
transformed = ''
for l in message:
transformed += self.encipher_letter(l)