Skip to content

Commit 133505d

Browse files
Remove less common alphabets.
1 parent 4444158 commit 133505d

3 files changed

Lines changed: 3 additions & 39 deletions

File tree

Doc/library/binascii.rst

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -291,27 +291,15 @@ The :mod:`!binascii` module defines the following functions:
291291

292292
.. versionadded:: next
293293

294-
.. data:: CRYPT_ALPHABET
295-
296-
The Base 64 alphabet used in the :manpage:`crypt(3)` routine and in the GEDCOM format.
297-
298-
.. versionadded:: next
299-
300-
.. data:: BCRYPT_ALPHABET
301-
302-
The Base 64 alphabet used in the ``bcrypt`` hashing function.
303-
304-
.. versionadded:: next
305-
306294
.. data:: UU_ALPHABET
307295

308296
The uuencoding alphabet.
309297

310298
.. versionadded:: next
311299

312-
.. data:: XX_ALPHABET
300+
.. data:: CRYPT_ALPHABET
313301

314-
The xxencoding alphabet.
302+
The Base 64 alphabet used in the :manpage:`crypt(3)` routine and in the GEDCOM format.
315303

316304
.. versionadded:: next
317305

Lib/test/test_binascii.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,11 @@ def test_constants(self):
5353
b'0123456789+/')
5454
self.assertEqual(binascii.URLSAFE_BASE64_ALPHABET,
5555
binascii.BASE64_ALPHABET[:-2] + b'-_')
56+
self.assertEqual(binascii.UU_ALPHABET, bytes(range(32, 32+64)))
5657
self.assertEqual(binascii.CRYPT_ALPHABET,
5758
b'./0123456789'
5859
b'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
5960
b'abcdefghijklmnopqrstuvwxyz')
60-
self.assertEqual(binascii.BCRYPT_ALPHABET,
61-
b'./'
62-
b'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
63-
b'abcdefghijklmnopqrstuvwxyz'
64-
b'0123456789')
65-
self.assertEqual(binascii.UU_ALPHABET, bytes(range(32, 32+64)))
66-
self.assertEqual(binascii.XX_ALPHABET,
67-
b'+-0123456789'
68-
b'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
69-
b'abcdefghijklmnopqrstuvwxyz')
7061
self.assertEqual(binascii.BINHEX_ALPHABET,
7162
b'!"#$%&\'()*+,-012345689'
7263
b'@ABCDEFGHIJKLMNPQRSTUVXYZ['

Modules/binascii.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2082,14 +2082,6 @@ binascii_exec(PyObject *module)
20822082
{
20832083
return -1;
20842084
}
2085-
if (PyModule_Add(module, "BCRYPT_ALPHABET",
2086-
PyBytes_FromString("./"
2087-
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
2088-
"abcdefghijklmnopqrstuvwxyz"
2089-
"0123456789")) < 0)
2090-
{
2091-
return -1;
2092-
}
20932085
if (PyModule_Add(module, "UU_ALPHABET",
20942086
PyBytes_FromString(" !\"#$%&'()*+,-./"
20952087
"0123456789:;<=>?@"
@@ -2098,13 +2090,6 @@ binascii_exec(PyObject *module)
20982090
{
20992091
return -1;
21002092
}
2101-
if (PyModule_Add(module, "XX_ALPHABET",
2102-
PyBytes_FromString("+-0123456789"
2103-
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
2104-
"abcdefghijklmnopqrstuvwxyz")) < 0)
2105-
{
2106-
return -1;
2107-
}
21082093
if (PyModule_Add(module, "BINHEX_ALPHABET",
21092094
PyBytes_FromString("!\"#$%&'()*+,-012345689@"
21102095
"ABCDEFGHIJKLMNPQRSTUVXYZ[`"

0 commit comments

Comments
 (0)