Skip to content

Commit b0b178f

Browse files
dhondtadhondta
committed
Removed case-insensitive specifier from regex
1 parent 82afcf6 commit b0b178f

13 files changed

Lines changed: 34 additions & 32 deletions

File tree

‎codext/__common__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ class StreamReader(Codec, codecs.StreamReader):
145145
ci.parameters['add_to_codecs'] = add_to_codecs
146146
ci.parameters['pattern'] = pattern
147147
ci.parameters['text'] = text
148-
ci.parameters['type'] = kwargs.get('type', glob['__file__'].split(os.path.sep)[-2].rstrip("s"))
148+
f = glob.get('__file__', os.path.join("custom", "_"))
149+
ci.parameters['type'] = kwargs.get('type', f.split(os.path.sep)[-2].rstrip("s"))
149150
ci.parameters['examples'] = kwargs.get('examples', glob.get('__examples__'))
150151
return ci
151152

‎codext/base/_base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,5 @@ def _decode(input, errors="strict"):
163163
return base_decode(input, a, errors), len(input)
164164
return _decode
165165

166-
add("base", encode, decode, r"(?i)^base[-_]?([2-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(?:[-_]generic)?$")
166+
add("base", encode, decode, r"^base[-_]?([2-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(?:[-_]generic)?$")
167167

‎codext/base/ascii85.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ def ascii85_encode(input, errors='strict'):
2424
def ascii85_decode(input, errors='strict'):
2525
return base64.a85decode(b(input)), len(input)
2626

27-
add("ascii85", ascii85_encode, ascii85_decode, r"(?i)^ascii[-_]?85$")
27+
add("ascii85", ascii85_encode, ascii85_decode, r"^ascii[-_]?85$")
2828

‎codext/base/base100.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ def base100_decode(input, errors='strict'):
4343
return bytes(r), len(input)
4444

4545

46-
add("base100", base100_encode, base100_decode, r"(?i)^(?:base[-_]?100|emoji)$")
46+
add("base100", base100_encode, base100_decode, r"^(?:base[-_]?100|emoji)$")
4747

‎codext/base/base122.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ def base122_decode(input, errors="strict"):
1818
raise NotImplementedError
1919

2020

21-
add("base122", base122_encode, base122_decode, r"(?i)^base[-_]?122$")
21+
add("base122", base122_encode, base122_decode, r"^base[-_]?122$")
2222

‎codext/base/base85.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ def base85_encode(input, errors='strict'):
2121
def base85_decode(input, errors='strict'):
2222
return base64.b85decode(b(input)), len(input)
2323

24-
add("base85", base85_encode, base85_decode, r"(?i)^base[-_]?85$")
24+
add("base85", base85_encode, base85_decode, r"^base[-_]?85$")
2525

‎codext/base/baseN.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@
1515

1616

1717
B2 = {r'': "01", r'[-_]inv(erted)?': "10"}
18-
base2n(B2, r"(?i)^(?:base[-_]?2|bin)(|[-_]inv(?:erted)?|[-_][a-zA-Z0-9]{2})$")
18+
base2n(B2, r"^(?:base[-_]?2|bin)(|[-_]inv(?:erted)?|[-_][a-zA-Z0-9]{2})$")
1919

2020

2121
B3 = {r'': "123", r'[-_]inv(erted)?': "321"}
22-
base(B3, r"(?i)^base[-_]?3(|[-_]inv(?:erted)?|[-_][a-zA-Z0-9]{3})$")
22+
base(B3, r"^base[-_]?3(|[-_]inv(?:erted)?|[-_][a-zA-Z0-9]{3})$")
2323

2424

2525
B4 = {r'': "1234", r'[-_]inv(erted)?': "4321"}
26-
base2n(B4, r"(?i)^base[-_]?4(|[-_]inv(?:erted)?|[-_][a-zA-Z0-9]{4})$")
26+
base2n(B4, r"^base[-_]?4(|[-_]inv(?:erted)?|[-_][a-zA-Z0-9]{4})$")
2727

2828

2929
B8 = {r'': "abcdefgh", r'[-_]inv(erted)?': "hgfedcba"}
30-
base2n(B8, r"(?i)^base[-_]?8(|[-_]inv(?:erted)?|[-_][a-zA-Z0-9]{8})$")
30+
base2n(B8, r"^base[-_]?8(|[-_]inv(?:erted)?|[-_][a-zA-Z0-9]{8})$")
3131

3232

3333
B16 = {'': digits + "ABCDEF", 'inv': "ABCDEF" + digits}
34-
base2n(B16, r"(?i)^(?:base[-_]?16|hex)(|[-_]inv(?:erted)?)$")
34+
base2n(B16, r"^(?:base[-_]?16|hex)(|[-_]inv(?:erted)?)$")
3535

3636

3737
B32 = {
@@ -40,33 +40,33 @@
4040
r'(?:[-_]ext(?:ended)?)?[-_]hex$': digits + upper[:22],
4141
r'[-_]geohash': digits + "bcdefghjkmnpqrstuvwxyz",
4242
}
43-
base2n(B32, r"(?i)^base[-_]?32(|[-_]inv(?:erted)?|(?:[-_]ext(?:ended)?)?[-_]hex|[-_]geohash)$")
43+
base2n(B32, r"^base[-_]?32(|[-_]inv(?:erted)?|(?:[-_]ext(?:ended)?)?[-_]hex|[-_]geohash)$")
4444
ZB32 = {'': "ybndrfg8ejkmcpqxot1uwisza345h769"}
45-
base2n(ZB32, r"(?i)^z[-_]?base[-_]?32$")
45+
base2n(ZB32, r"^z[-_]?base[-_]?32$")
4646

4747

4848
B36 = {'': digits + upper, 'inv': upper + digits}
49-
base(B36, r"(?i)^base[-_]?36(|[-_]inv(?:erted)?)$")
49+
base(B36, r"^base[-_]?36(|[-_]inv(?:erted)?)$")
5050

5151

5252
B58 = {
5353
r'(|[-_](bc|bitcoin))$': "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz",
5454
r'[-_](rp|ripple)$': "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz",
5555
r'[-_](fl|flickr|short[-]?url|url)$': "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ",
5656
}
57-
base(B58, r"(?i)^base[-_]?58(|[-_](bc|bitcoin|rp|ripple|fl|flickr|short[-]?url|url))$")
57+
base(B58, r"^base[-_]?58(|[-_](bc|bitcoin|rp|ripple|fl|flickr|short[-]?url|url))$")
5858

5959

6060
B62 = {'': digits + upper + lower, 'inv': digits + lower + upper}
61-
base(B62, r"(?i)^base[-_]?62(|[-_]inv(?:erted)?)$")
61+
base(B62, r"^base[-_]?62(|[-_]inv(?:erted)?)$")
6262

6363

6464
B64 = {
6565
r'': upper + lower + digits + "+/",
6666
r'[-_]inv(erted)?$': lower + upper + digits + "+/",
6767
r'[-_](file|url)(safe)?$': upper + lower + digits + "-_",
6868
}
69-
base2n(B64, r"(?i)^base[-_]?64(|[-_]inv(?:erted)?|[-_](?:file|url)(?:safe)?)$")
69+
base2n(B64, r"^base[-_]?64(|[-_]inv(?:erted)?|[-_](?:file|url)(?:safe)?)$")
7070

7171

7272
#FIXME
@@ -75,14 +75,14 @@
7575
# r'[-_]z(eromq)?$': digits + upper + lower + ".-:+=^!/*?&<>()[]{}@%$#",
7676
# r'[-_]rfc1924$': digits + upper + lower + "!#$%&()*+-;<=>?@^_`{|}~",
7777
#}
78-
#base(B85, r"(?i)^(?:ascii|base)[-_]?85(|[-_](?:z(?:eromq)?|rfc1924))$")
78+
#base(B85, r"^(?:ascii|base)[-_]?85(|[-_](?:z(?:eromq)?|rfc1924))$")
7979

8080

8181
B91 = {
8282
'': upper + lower + digits + "!#$%&()*+,./:;<=>?@[]^_`{|}~\"",
8383
'inv': lower + upper + digits + "!#$%&()*+,./:;<=>?@[]^_`{|}~\"",
8484
}
85-
base(B91, r"(?i)^base[-_]?91(|[-_]inv(?:erted)?)$")
85+
base(B91, r"^base[-_]?91(|[-_]inv(?:erted)?)$")
8686

8787

8888
# generic base encodings, to be added after all others as they have the precedence

‎codext/binary/baudot.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
'enc(baudot-ita1)': {'TEST 1234': "10101000101010010101100000100000001000100010000101"},
1717
'enc(baudot_ita2_msb)': {'TEST 1234': "10000000010010110000001001101110111100110000101010"},
1818
'enc(baudot-ita2-us)': {'TEST 1234': "10000000010010110000001001101110111100110000101010"},
19-
'enc(baudot)': {'abc': None},
20-
'enc(baudot_ccitt1-lsb)': {'TEST ': None},
19+
'enc(baudot)': {'\x01\x02': None},
20+
'enc(baudot_ccitt1-lsb)': {'TEST ': None},
2121
}
2222
__examples2__ = {
2323
'enc(baudot_spaced-BAD_ALPHABET)': None,
@@ -190,6 +190,7 @@ def baudot_encode(alphabet=None, spaced=False, tape=False):
190190
ename = "baudot" + ("-spaced" if spaced else "-tape" if tape else "")
191191
alphabet, states, func = _handle_alphabet(alphabet)
192192
def encode(text, errors="strict"):
193+
text = text.upper()
193194
s, l, state, seen_states = "", len(b(text)), None, []
194195
for i, c in enumerate(text):
195196
# if the state is undefined yet, find the relevant alphabet

‎codext/crypto/rot.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414

1515
__examples__ = {
16-
'enc(rot0|rot--10|rot100)': None,
17-
'enc(rot1|rot-1|rot_1|ROT1|ROT-1|ROT_1)': {'this is a test': "uijt jt b uftu"},
18-
'enc(rot3)': {'this is a test': "wklv lv d whvw"},
16+
'enc(rot0|rot--10|rot100)': None,
17+
'enc(rot1|rot-1|rot_1)': {'this is a test': "uijt jt b uftu"},
18+
'enc(rot3)': {'this is a test': "wklv lv d whvw"},
1919
}
2020

2121

@@ -39,5 +39,5 @@ def decode(text, errors="strict"):
3939
return decode
4040

4141

42-
add("rot", rot_encode, rot_decode, r"(?i)rot[-_]?([1-9]|1[0-9]|2[0-5])$")
42+
add("rot", rot_encode, rot_decode, r"rot[-_]?([1-9]|1[0-9]|2[0-5])$")
4343

‎codext/crypto/scytale.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ def decode(text, errors="strict"):
4949
return decode
5050

5151

52-
add("scytale", scytale_encode, scytale_decode, r"(?i)scytale[-_]?([1-9]\d*)$")
52+
add("scytale", scytale_encode, scytale_decode, r"^scytale[-_]?([1-9]\d*)$")
5353

0 commit comments

Comments
 (0)