Skip to content

Commit 628c139

Browse files
dhondtadhondta
committed
Fixed issues with whitespace handling
1 parent 874cb6d commit 628c139

3 files changed

Lines changed: 13 additions & 11 deletions

File tree

‎codext/__common__.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ def _wrapper(param):
244244
for t in c:
245245
if t not in base_tokens:
246246
base_tokens += t
247+
base_tokens = base_tokens.strip()
247248
if len(p) > 0 and p[0] in "-_" and len(p[1:]) == len(set(p[1:])) == len(base_tokens):
248249
p = p[1:]
249250
if len(p) == len(set(p)) == len(base_tokens):
@@ -477,8 +478,7 @@ def _wrapper(*args, **kwargs):
477478
a0 = args[0]
478479
a0 = ensure_str(a0) if iss(a0) or isb(a0) else a0
479480
r = f(a0, *args[1:], **kwargs)
480-
return (fix(r[0], args[0]), ) + r[1:] if isinstance(r, (tuple, list)) \
481-
else fix(r, args[0])
481+
return (fix(r[0], args[0]), ) + r[1:] if isinstance(r, (tuple, list)) else fix(r, args[0])
482482
return _wrapper
483483

484484

@@ -504,8 +504,8 @@ def get_alphabet_from_mask(mask):
504504
def handle_error(ename, errors, exc=ValueError, sep="", repl_char="?", repl_minlen=1, decode=False, item="position"):
505505
def _handle_error(token, position):
506506
if errors == "strict":
507-
raise exc("'{}' codec can't {}code character '{}' in {} {}"
508-
.format(ename, ["en", "de"][decode], token, item, position))
507+
msg = "'{}' codec can't {}code character '{}' in {} {}"
508+
raise exc(msg.format(ename, ["en", "de"][decode], token, item, position))
509509
elif errors == "leave":
510510
return token + sep
511511
elif errors == "replace":

‎codext/crypto/bacon.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@
1313

1414

1515
__examples__ = {
16-
'enc(bacon|bacon_cipher|baconian-cipher|bacon-ab|bacon-AB)': {
17-
'this is a test': "baaba aabbb abaaa baaab abaaa baaab aaaaa baaba aabaa baaab baaba",
16+
'enc(bacon|bacon_cipher|baconian-cipher|bacon-ab|bacon_AB)': {
17+
'this is a test': "baabaaabbbabaaabaaab abaaabaaab aaaaa baabaaabaabaaabbaaba",
18+
},
19+
'enc(bacon-01|bacon_01)': {
20+
'this is a test': "10010001110100010001 0100010001 00000 10010001001000110010",
1821
},
19-
'enc(bacon-01)': {'this is a test': "10010 00111 01000 10001 01000 10001 00000 10010 00100 10001 10010"},
2022
}
2123

2224

2325
ENCMAP = {
2426
'A': "aaaaa", 'B': "aaaab", 'C': "aaaba", 'D': "aaabb", 'E': "aabaa", 'F': "aabab", 'G': "aabba", 'H': "aabbb",
2527
'I': "abaaa", 'J': "abaaa", 'K': "abaab", 'L': "ababa", 'M': "ababb", 'N': "abbaa", 'O': "abbab", 'P': "abbba",
2628
'Q': "abbbb", 'R': "baaaa", 'S': "baaab", 'T': "baaba", 'U': "baabb", 'V': "baabb", 'W': "babaa", 'X': "babab",
27-
'Y': "babba", 'Z': "babbb", ' ': "",
29+
'Y': "babba", 'Z': "babbb", ' ': " ",
2830
}
2931

3032

31-
add_map("bacon", ENCMAP, sep=" ", ignore_case="both", pattern=r"bacon(?:(?:ian)?[-_]cipher)?([\-_].{2})?$")
33+
add_map("bacon", ENCMAP, ignore_case="both", pattern=r"bacon(?:(?:ian)?[-_]cipher)?([\-_].{2})?$")
3234

‎tests/test_generated.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def _template(self):
7777
with codecs.open(tfile, 'wb', encoding=ename) as f:
7878
f.write(b(s))
7979
with codecs.open(tfile, 'rb', encoding=ename) as f:
80-
s2 = f.read().strip(b(" \x00"))
80+
s2 = f.read().strip(b("\x00"))
8181
self.assertEqual(b(icdec(s2)), b(icdec(s)))
8282
os.remove(tfile)
8383
else:
@@ -101,7 +101,7 @@ def _template(self):
101101
with codecs.open(tfile, 'wb', encoding=ename) as f:
102102
f.write(b(s1))
103103
with codecs.open(tfile, 'rb', encoding=ename) as f:
104-
s = f.read().strip(b(" \x00"))
104+
s = f.read().strip(b("\x00"))
105105
self.assertEqual(b(icdec(f2(s2, ename))), b(icdec(s)))
106106
os.remove(tfile)
107107
return _template

0 commit comments

Comments
 (0)