projects
/
cipher-training.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2e77bc7
)
Fixed spelling of KeywordWrapAlphabet
author
Neil Smith
<neil.git@njae.me.uk>
Tue, 29 Jul 2014 15:24:12 +0000
(16:24 +0100)
committer
Neil Smith
<neil.git@njae.me.uk>
Tue, 29 Jul 2014 15:24:12 +0000
(16:24 +0100)
cipher.py
patch
|
blob
|
history
diff --git
a/cipher.py
b/cipher.py
index b53ae24184d09ba2b6bcf304c0de8a2f0077f318..f5c5d33f412108c045f47effc1e93c221e90c118 100644
(file)
--- a/
cipher.py
+++ b/
cipher.py
@@
-241,31
+241,31
@@
def affine_decipher(message, multiplier=1, adder=0, one_based=True):
return ''.join(enciphered)
return ''.join(enciphered)
-class Keyword
_wrap_a
lphabet(Enum):
+class Keyword
WrapA
lphabet(Enum):
from_a = 1
from_last = 2
from_largest = 3
from_a = 1
from_last = 2
from_largest = 3
-def keyword_cipher_alphabet_of(keyword, wrap_alphabet=Keyword
_wrap_a
lphabet.from_a):
+def keyword_cipher_alphabet_of(keyword, wrap_alphabet=Keyword
WrapA
lphabet.from_a):
"""Find the cipher alphabet given a keyword.
wrap_alphabet controls how the rest of the alphabet is added
after the keyword.
>>> keyword_cipher_alphabet_of('bayes')
'bayescdfghijklmnopqrtuvwxz'
"""Find the cipher alphabet given a keyword.
wrap_alphabet controls how the rest of the alphabet is added
after the keyword.
>>> keyword_cipher_alphabet_of('bayes')
'bayescdfghijklmnopqrtuvwxz'
- >>> keyword_cipher_alphabet_of('bayes', Keyword
_wrap_a
lphabet.from_a)
+ >>> keyword_cipher_alphabet_of('bayes', Keyword
WrapA
lphabet.from_a)
'bayescdfghijklmnopqrtuvwxz'
'bayescdfghijklmnopqrtuvwxz'
- >>> keyword_cipher_alphabet_of('bayes', Keyword
_wrap_a
lphabet.from_last)
+ >>> keyword_cipher_alphabet_of('bayes', Keyword
WrapA
lphabet.from_last)
'bayestuvwxzcdfghijklmnopqr'
'bayestuvwxzcdfghijklmnopqr'
- >>> keyword_cipher_alphabet_of('bayes', Keyword
_wrap_a
lphabet.from_largest)
+ >>> keyword_cipher_alphabet_of('bayes', Keyword
WrapA
lphabet.from_largest)
'bayeszcdfghijklmnopqrtuvwx'
"""
'bayeszcdfghijklmnopqrtuvwx'
"""
- if wrap_alphabet == Keyword
_wrap_a
lphabet.from_a:
+ if wrap_alphabet == Keyword
WrapA
lphabet.from_a:
cipher_alphabet = ''.join(deduplicate(sanitise(keyword) +
string.ascii_lowercase))
else:
cipher_alphabet = ''.join(deduplicate(sanitise(keyword) +
string.ascii_lowercase))
else:
- if wrap_alphabet == Keyword
_wrap_a
lphabet.from_last:
+ if wrap_alphabet == Keyword
WrapA
lphabet.from_last:
last_keyword_letter = deduplicate(sanitise(keyword))[-1]
else:
last_keyword_letter = sorted(sanitise(keyword))[-1]
last_keyword_letter = deduplicate(sanitise(keyword))[-1]
else:
last_keyword_letter = sorted(sanitise(keyword))[-1]
@@
-278,7
+278,7
@@
def keyword_cipher_alphabet_of(keyword, wrap_alphabet=Keyword_wrap_alphabet.from
return cipher_alphabet
return cipher_alphabet
-def keyword_encipher(message, keyword, wrap_alphabet=Keyword
_wrap_a
lphabet.from_a):
+def keyword_encipher(message, keyword, wrap_alphabet=Keyword
WrapA
lphabet.from_a):
"""Enciphers a message with a keyword substitution cipher.
wrap_alphabet controls how the rest of the alphabet is added
after the keyword.
"""Enciphers a message with a keyword substitution cipher.
wrap_alphabet controls how the rest of the alphabet is added
after the keyword.
@@
-288,18
+288,18
@@
def keyword_encipher(message, keyword, wrap_alphabet=Keyword_wrap_alphabet.from_
>>> keyword_encipher('test message', 'bayes')
'rsqr ksqqbds'
>>> keyword_encipher('test message', 'bayes')
'rsqr ksqqbds'
- >>> keyword_encipher('test message', 'bayes', Keyword
_wrap_a
lphabet.from_a)
+ >>> keyword_encipher('test message', 'bayes', Keyword
WrapA
lphabet.from_a)
'rsqr ksqqbds'
'rsqr ksqqbds'
- >>> keyword_encipher('test message', 'bayes', Keyword
_wrap_a
lphabet.from_last)
+ >>> keyword_encipher('test message', 'bayes', Keyword
WrapA
lphabet.from_last)
'lskl dskkbus'
'lskl dskkbus'
- >>> keyword_encipher('test message', 'bayes', Keyword
_wrap_a
lphabet.from_largest)
+ >>> keyword_encipher('test message', 'bayes', Keyword
WrapA
lphabet.from_largest)
'qspq jsppbcs'
"""
cipher_alphabet = keyword_cipher_alphabet_of(keyword, wrap_alphabet)
cipher_translation = ''.maketrans(string.ascii_lowercase, cipher_alphabet)
return unaccent(message).lower().translate(cipher_translation)
'qspq jsppbcs'
"""
cipher_alphabet = keyword_cipher_alphabet_of(keyword, wrap_alphabet)
cipher_translation = ''.maketrans(string.ascii_lowercase, cipher_alphabet)
return unaccent(message).lower().translate(cipher_translation)
-def keyword_decipher(message, keyword, wrap_alphabet=Keyword
_wrap_a
lphabet.from_a):
+def keyword_decipher(message, keyword, wrap_alphabet=Keyword
WrapA
lphabet.from_a):
"""Deciphers a message with a keyword substitution cipher.
wrap_alphabet controls how the rest of the alphabet is added
after the keyword.
"""Deciphers a message with a keyword substitution cipher.
wrap_alphabet controls how the rest of the alphabet is added
after the keyword.
@@
-309,11
+309,11
@@
def keyword_decipher(message, keyword, wrap_alphabet=Keyword_wrap_alphabet.from_
>>> keyword_decipher('rsqr ksqqbds', 'bayes')
'test message'
>>> keyword_decipher('rsqr ksqqbds', 'bayes')
'test message'
- >>> keyword_decipher('rsqr ksqqbds', 'bayes', Keyword
_wrap_a
lphabet.from_a)
+ >>> keyword_decipher('rsqr ksqqbds', 'bayes', Keyword
WrapA
lphabet.from_a)
'test message'
'test message'
- >>> keyword_decipher('lskl dskkbus', 'bayes', Keyword
_wrap_a
lphabet.from_last)
+ >>> keyword_decipher('lskl dskkbus', 'bayes', Keyword
WrapA
lphabet.from_last)
'test message'
'test message'
- >>> keyword_decipher('qspq jsppbcs', 'bayes', Keyword
_wrap_a
lphabet.from_largest)
+ >>> keyword_decipher('qspq jsppbcs', 'bayes', Keyword
WrapA
lphabet.from_largest)
'test message'
"""
cipher_alphabet = keyword_cipher_alphabet_of(keyword, wrap_alphabet)
'test message'
"""
cipher_alphabet = keyword_cipher_alphabet_of(keyword, wrap_alphabet)