mirror of
https://github.com/python/cpython.git
synced 2024-11-26 03:14:27 +08:00
4d70c3d9dd
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.) Merged revisions 46495-46605 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines Added missing svn:eol-style property to text files. ........ r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste bug in both: `className` was referenced before being checked for NULL. ........ r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), and use it for string copy operations. this gives a 20% speedup on some string benchmarks. ........ r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines Quality control, meet exceptions.c. Fix a number of problems with the need for speed code: One is doing this sort of thing: Py_DECREF(self->field); self->field = newval; Py_INCREF(self->field); without being very sure that self->field doesn't start with a value that has a __del__, because that almost certainly can lead to segfaults. As self->args is constrained to be an exact tuple we may as well exploit this fact consistently. This leads to quite a lot of simplification (and, hey, probably better performance). Add some error checking in places lacking it. Fix some rather strange indentation in the Unicode code. Delete some trailing whitespace. More to come, I haven't fixed all the reference leaks yet... ........ r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines Patch #1080727: add "encoding" parameter to doctest.DocFileSuite Contributed by Bjorn Tillenius. ........ r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines Rest of patch #1490384: Commit icon source, remove claim that Erik von Blokland is the author of the installer picture. ........ r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines Quality control, meet exceptions.c, round two. Make some functions that should have been static static. Fix a bunch of refleaks by fixing the definition of MiddlingExtendsException. Remove all the __new__ implementations apart from BaseException_new. Rewrite most code that needs it to cope with NULL fields (such code could get excercised anyway, the __new__-removal just makes it more likely). This involved editing the code for WindowsError, which I can't test. This fixes all the refleaks in at least the start of a regrtest -R :: run. ........ r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines Initial version of systimes - a module to provide platform dependent performance measurements. The module is currently just a proof-of-concept implementation, but will integrated into pybench once it is stable enough. License: pybench license. Author: Marc-Andre Lemburg. ........ r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines ("Forward-port" of r46506) Remove various dependencies on dictionary order in the standard library tests, and one (clearly an oversight, potentially critical) in the standard library itself - base64.py. Remaining open issues: * test_extcall is an output test, messy to make robust * tarfile.py has a potential bug here, but I'm not familiar enough with this code. Filed in as SF bug #1496501. * urllib2.HTTPPasswordMgr() returns a random result if there is more than one matching root path. I'm asking python-dev for clarification... ........ r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines The empty string is a valid import path. (fixes #1496539) ........ r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines Patch #1496206: urllib2 PasswordMgr ./. default ports ........ r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines Fix refleaks in UnicodeError get and set methods. ........ r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines use the UnicodeError traversal and clearing functions in UnicodeError subclasses. ........ r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines Make last patch valid C89 so Windows compilers can deal with it. ........ r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines Fix ref-antileak in _struct.c which eventually lead to deallocating None. ........ r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines Correct None refcount issue in Mac modules. (Are they still used?) ........ r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines A clearer error message when passing -R to regrtest.py with release builds of Python. ........ r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines Fix C function calling conventions in _sre module. ........ r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines Convert audioop over to METH_VARARGS. ........ r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines METH_NOARGS functions do get called with two args. ........ r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines Fix refleak in socketmodule. Replace bogus Py_BuildValue calls. Fix refleak in exceptions. ........ r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines Apply modified version of Collin Winter's patch #1478788 Renames functional extension module to _functools and adds a Python functools module so that utility functions like update_wrapper can be added easily. ........ r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines Convert fmmodule to METH_VARARGS. ........ r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines Fix #1494605. ........ r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671. ........ r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines Fix compiler warning. ........ r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines Fix #1494787 (pyclbr counts whitespace as superclass name) ........ r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line simplify the struct code a bit (no functional changes) ........ r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines Silence a warning. ........ r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines Correct some value converting strangenesses. ........ r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line When adding a module like functools, it helps to let SVN know about the file. ........ r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines Patches #1497027 and #972322: try HTTP digest auth first, and watch out for handler name collisions. ........ r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines Add News entry for last commit. ........ r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines Make use of METH_O and METH_NOARGS where possible. Use Py_UnpackTuple instead of PyArg_ParseTuple where possible. ........ r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines Convert more modules to METH_VARARGS. ........ r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines Whoops. ........ r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on the current behaviour ;-) ........ r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) ........ r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line Add a length check to aifc to ensure it doesn't write a bogus file ........ r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines deprecated_err(): Stop bizarre warning messages when the tests are run in the order: test_genexps (or any other doctest-based test) test_struct test_doctest The `warnings` module needs an advertised way to save/restore its internal filter list. ........ r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines Whitespace normalization. ........ r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines Set a binary svn:mime-type property on this UTF-8 encoded file. ........ r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line Simplify further by using AddStringConstant ........ r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines Convert relevant dict internals to Py_ssize_t. I don't have a box with nearly enough RAM, or an OS, that could get close to tickling this, though (requires a dict w/ at least 2**31 entries). ........ r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line Remove stray | in comment ........ r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment ........ r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int ........ r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines dict_print(): Explicitly narrow the return value from a (possibly) wider variable. ........ r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines dict_print(): So that Neal & I don't spend the rest of our lives taking turns rewriting code that works ;-), get rid of casting illusions by declaring a new variable with the obvious type. ........ r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines Restore exception pickle support. #1497319. ........ r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines Add a test case for exception pickling. args is never NULL. ........ r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line Don't fail if the (sub)pkgname already exist. ........ r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines Disallow keyword args for exceptions. ........ r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines I'm impatient. I think this will fix a few more problems with the buildbots. I'm not sure this is the best approach, but I can't think of anything better. If this creates problems, feel free to revert, but I think it's safe and should make things a little better. ........ r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines Do the check for no keyword arguments in __init__ so that subclasses of Exception can be supplied keyword args ........ r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines Convert test_exceptions to unittest. ........ r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line Add SoC name, and reorganize this section a bit ........ r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines PyLong_FromString(): Continued fraction analysis (explained in a new comment) suggests there are almost certainly large input integers in all non-binary input bases for which one Python digit too few is initally allocated to hold the final result. Instead of assert-failing when that happens, allocate more space. Alas, I estimate it would take a few days to find a specific such case, so this isn't backed up by a new test (not to mention that such a case may take hours to run, since conversion time is quadratic in the number of digits, and preliminary attempts suggested that the smallest such inputs contain at least a million digits). ........ r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines changed find/rfind to return -1 for matches outside the source string ........ r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line Change wrapping terminology to overflow masking ........ r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines changed count to return 0 for slices outside the source string ........ r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines Whitespace normalization. ........ r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines Clarify wording on default values for strptime(); defaults are used when better values cannot be inferred. Closes bug #1496315. ........ r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64 ........ r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line Revert last checkin, it is better to do make distclean ........ r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines On 64-bit platforms running test_struct after test_tarfile would fail since the deprecation warning wouldn't be raised. ........ r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines PyTuple_Pack is not available in Python 2.3, but ctypes must stay compatible with that. ........ r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line 'functional' module was renamed to 'functools' ........ r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation ........ r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines [Bug #1473048] SimpleXMLRPCServer and DocXMLRPCServer don't look at the path of the HTTP request at all; you can POST or GET from / or /RPC2 or /blahblahblah with the same results. Security scanners that look for /cgi-bin/phf will therefore report lots of vulnerabilities. Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class, and report a 404 error if the path isn't on the allowed list. Possibly-controversial aspect of this change: the default makes only '/' and '/RPC2' legal. Maybe this will break people's applications (though I doubt it). We could just set the default to an empty tuple, which would exactly match the current behaviour. ........ r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line Mention SimpleXMLRPCServer change ........ r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines Trimmed trailing whitespace. ........ r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines _range_error(): Speed and simplify (there's no real need for loops here). Assert that size_t is actually big enough, and that f->size is at least one. Wrap a long line. ........ r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines Repaired error in new comment. ........ r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines Remove ; at end of macro. There was a compiler recently that warned about extra semi-colons. It may have been the HP C compiler. This file will trigger a bunch of those warnings now. ........ r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571) ........ r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines Correctly allocate complex types with tp_alloc. (bug #1498638) ........ r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines Correctly dispatch Faults in loads (patch #1498627) ........ r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines Some code style tweaks, and remove apply. ........ r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). [ 1456209 ] dictresize() vulnerability ( <- backport candidate ). ........ r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines Whitespace normalization. ........ r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines Record bugs 1275608 and 1456209 as being fixed. ........ r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines Re-enable a new empty-string test added during the NFS sprint, but disabled then because str and unicode strings gave different results. The implementations were repaired later during the sprint, but the new test remained disabled. ........ r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines Armin committed his patch while I was reviewing it (I'm sure he didn't know this), so merged in some changes I made during review. Nothing material apart from changing a new `mask` local from int to Py_ssize_t. Mostly this is repairing comments that were made incorrect, and adding new comments. Also a few minor code rewrites for clarity or helpful succinctness. ........ r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line Convert docstrings to comments so regrtest -v prints method names ........ r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines Fix memory leak found by valgrind. ........ r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line More memory leaks from valgrind ........ r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines Patch #1357836: Prevent an invalid memory read from test_coding in case the done flag is set. In that case, the loop isn't entered. I wonder if rather than setting the done flag in the cases before the loop, if they should just exit early. This code looks like it should be refactored. Backport candidate (also the early break above if decoding_fgets fails) ........ r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line Fixed struct test to not use unittest. ........ r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines pprint functions used to sort a dict (by key) if and only if the output required more than one line. "Small" dicts got displayed in seemingly random order (the hash-induced order produced by dict.__repr__). None of this was documented. Now pprint functions always sort dicts by key, and the docs promise it. This was proposed and agreed to during the PyCon 2006 core sprint -- I just didn't have time for it before now. ........
360 lines
11 KiB
Python
Executable File
360 lines
11 KiB
Python
Executable File
#! /usr/bin/env python
|
||
|
||
"""RFC 3548: Base16, Base32, Base64 Data Encodings"""
|
||
|
||
# Modified 04-Oct-1995 by Jack Jansen to use binascii module
|
||
# Modified 30-Dec-2003 by Barry Warsaw to add full RFC 3548 support
|
||
|
||
import re
|
||
import struct
|
||
import binascii
|
||
|
||
|
||
__all__ = [
|
||
# Legacy interface exports traditional RFC 1521 Base64 encodings
|
||
'encode', 'decode', 'encodestring', 'decodestring',
|
||
# Generalized interface for other encodings
|
||
'b64encode', 'b64decode', 'b32encode', 'b32decode',
|
||
'b16encode', 'b16decode',
|
||
# Standard Base64 encoding
|
||
'standard_b64encode', 'standard_b64decode',
|
||
# Some common Base64 alternatives. As referenced by RFC 3458, see thread
|
||
# starting at:
|
||
#
|
||
# http://zgp.org/pipermail/p2p-hackers/2001-September/000316.html
|
||
'urlsafe_b64encode', 'urlsafe_b64decode',
|
||
]
|
||
|
||
_translation = [chr(_x) for _x in range(256)]
|
||
EMPTYSTRING = ''
|
||
|
||
|
||
def _translate(s, altchars):
|
||
translation = _translation[:]
|
||
for k, v in altchars.items():
|
||
translation[ord(k)] = v
|
||
return s.translate(''.join(translation))
|
||
|
||
|
||
|
||
# Base64 encoding/decoding uses binascii
|
||
|
||
def b64encode(s, altchars=None):
|
||
"""Encode a string using Base64.
|
||
|
||
s is the string to encode. Optional altchars must be a string of at least
|
||
length 2 (additional characters are ignored) which specifies an
|
||
alternative alphabet for the '+' and '/' characters. This allows an
|
||
application to e.g. generate url or filesystem safe Base64 strings.
|
||
|
||
The encoded string is returned.
|
||
"""
|
||
# Strip off the trailing newline
|
||
encoded = binascii.b2a_base64(s)[:-1]
|
||
if altchars is not None:
|
||
return _translate(encoded, {'+': altchars[0], '/': altchars[1]})
|
||
return encoded
|
||
|
||
|
||
def b64decode(s, altchars=None):
|
||
"""Decode a Base64 encoded string.
|
||
|
||
s is the string to decode. Optional altchars must be a string of at least
|
||
length 2 (additional characters are ignored) which specifies the
|
||
alternative alphabet used instead of the '+' and '/' characters.
|
||
|
||
The decoded string is returned. A TypeError is raised if s were
|
||
incorrectly padded or if there are non-alphabet characters present in the
|
||
string.
|
||
"""
|
||
if altchars is not None:
|
||
s = _translate(s, {altchars[0]: '+', altchars[1]: '/'})
|
||
try:
|
||
return binascii.a2b_base64(s)
|
||
except binascii.Error, msg:
|
||
# Transform this exception for consistency
|
||
raise TypeError(msg)
|
||
|
||
|
||
def standard_b64encode(s):
|
||
"""Encode a string using the standard Base64 alphabet.
|
||
|
||
s is the string to encode. The encoded string is returned.
|
||
"""
|
||
return b64encode(s)
|
||
|
||
def standard_b64decode(s):
|
||
"""Decode a string encoded with the standard Base64 alphabet.
|
||
|
||
s is the string to decode. The decoded string is returned. A TypeError
|
||
is raised if the string is incorrectly padded or if there are non-alphabet
|
||
characters present in the string.
|
||
"""
|
||
return b64decode(s)
|
||
|
||
def urlsafe_b64encode(s):
|
||
"""Encode a string using a url-safe Base64 alphabet.
|
||
|
||
s is the string to encode. The encoded string is returned. The alphabet
|
||
uses '-' instead of '+' and '_' instead of '/'.
|
||
"""
|
||
return b64encode(s, '-_')
|
||
|
||
def urlsafe_b64decode(s):
|
||
"""Decode a string encoded with the standard Base64 alphabet.
|
||
|
||
s is the string to decode. The decoded string is returned. A TypeError
|
||
is raised if the string is incorrectly padded or if there are non-alphabet
|
||
characters present in the string.
|
||
|
||
The alphabet uses '-' instead of '+' and '_' instead of '/'.
|
||
"""
|
||
return b64decode(s, '-_')
|
||
|
||
|
||
|
||
# Base32 encoding/decoding must be done in Python
|
||
_b32alphabet = {
|
||
0: 'A', 9: 'J', 18: 'S', 27: '3',
|
||
1: 'B', 10: 'K', 19: 'T', 28: '4',
|
||
2: 'C', 11: 'L', 20: 'U', 29: '5',
|
||
3: 'D', 12: 'M', 21: 'V', 30: '6',
|
||
4: 'E', 13: 'N', 22: 'W', 31: '7',
|
||
5: 'F', 14: 'O', 23: 'X',
|
||
6: 'G', 15: 'P', 24: 'Y',
|
||
7: 'H', 16: 'Q', 25: 'Z',
|
||
8: 'I', 17: 'R', 26: '2',
|
||
}
|
||
|
||
_b32tab = _b32alphabet.items()
|
||
_b32tab.sort()
|
||
_b32tab = [v for k, v in _b32tab]
|
||
_b32rev = dict([(v, long(k)) for k, v in _b32alphabet.items()])
|
||
|
||
|
||
def b32encode(s):
|
||
"""Encode a string using Base32.
|
||
|
||
s is the string to encode. The encoded string is returned.
|
||
"""
|
||
parts = []
|
||
quanta, leftover = divmod(len(s), 5)
|
||
# Pad the last quantum with zero bits if necessary
|
||
if leftover:
|
||
s += ('\0' * (5 - leftover))
|
||
quanta += 1
|
||
for i in range(quanta):
|
||
# c1 and c2 are 16 bits wide, c3 is 8 bits wide. The intent of this
|
||
# code is to process the 40 bits in units of 5 bits. So we take the 1
|
||
# leftover bit of c1 and tack it onto c2. Then we take the 2 leftover
|
||
# bits of c2 and tack them onto c3. The shifts and masks are intended
|
||
# to give us values of exactly 5 bits in width.
|
||
c1, c2, c3 = struct.unpack('!HHB', s[i*5:(i+1)*5])
|
||
c2 += (c1 & 1) << 16 # 17 bits wide
|
||
c3 += (c2 & 3) << 8 # 10 bits wide
|
||
parts.extend([_b32tab[c1 >> 11], # bits 1 - 5
|
||
_b32tab[(c1 >> 6) & 0x1f], # bits 6 - 10
|
||
_b32tab[(c1 >> 1) & 0x1f], # bits 11 - 15
|
||
_b32tab[c2 >> 12], # bits 16 - 20 (1 - 5)
|
||
_b32tab[(c2 >> 7) & 0x1f], # bits 21 - 25 (6 - 10)
|
||
_b32tab[(c2 >> 2) & 0x1f], # bits 26 - 30 (11 - 15)
|
||
_b32tab[c3 >> 5], # bits 31 - 35 (1 - 5)
|
||
_b32tab[c3 & 0x1f], # bits 36 - 40 (1 - 5)
|
||
])
|
||
encoded = EMPTYSTRING.join(parts)
|
||
# Adjust for any leftover partial quanta
|
||
if leftover == 1:
|
||
return encoded[:-6] + '======'
|
||
elif leftover == 2:
|
||
return encoded[:-4] + '===='
|
||
elif leftover == 3:
|
||
return encoded[:-3] + '==='
|
||
elif leftover == 4:
|
||
return encoded[:-1] + '='
|
||
return encoded
|
||
|
||
|
||
def b32decode(s, casefold=False, map01=None):
|
||
"""Decode a Base32 encoded string.
|
||
|
||
s is the string to decode. Optional casefold is a flag specifying whether
|
||
a lowercase alphabet is acceptable as input. For security purposes, the
|
||
default is False.
|
||
|
||
RFC 3548 allows for optional mapping of the digit 0 (zero) to the letter O
|
||
(oh), and for optional mapping of the digit 1 (one) to either the letter I
|
||
(eye) or letter L (el). The optional argument map01 when not None,
|
||
specifies which letter the digit 1 should be mapped to (when map01 is not
|
||
None, the digit 0 is always mapped to the letter O). For security
|
||
purposes the default is None, so that 0 and 1 are not allowed in the
|
||
input.
|
||
|
||
The decoded string is returned. A TypeError is raised if s were
|
||
incorrectly padded or if there are non-alphabet characters present in the
|
||
string.
|
||
"""
|
||
quanta, leftover = divmod(len(s), 8)
|
||
if leftover:
|
||
raise TypeError('Incorrect padding')
|
||
# Handle section 2.4 zero and one mapping. The flag map01 will be either
|
||
# False, or the character to map the digit 1 (one) to. It should be
|
||
# either L (el) or I (eye).
|
||
if map01:
|
||
s = _translate(s, {'0': 'O', '1': map01})
|
||
if casefold:
|
||
s = s.upper()
|
||
# Strip off pad characters from the right. We need to count the pad
|
||
# characters because this will tell us how many null bytes to remove from
|
||
# the end of the decoded string.
|
||
padchars = 0
|
||
mo = re.search('(?P<pad>[=]*)$', s)
|
||
if mo:
|
||
padchars = len(mo.group('pad'))
|
||
if padchars > 0:
|
||
s = s[:-padchars]
|
||
# Now decode the full quanta
|
||
parts = []
|
||
acc = 0
|
||
shift = 35
|
||
for c in s:
|
||
val = _b32rev.get(c)
|
||
if val is None:
|
||
raise TypeError('Non-base32 digit found')
|
||
acc += _b32rev[c] << shift
|
||
shift -= 5
|
||
if shift < 0:
|
||
parts.append(binascii.unhexlify('%010x' % acc))
|
||
acc = 0
|
||
shift = 35
|
||
# Process the last, partial quanta
|
||
last = binascii.unhexlify('%010x' % acc)
|
||
if padchars == 0:
|
||
last = '' # No characters
|
||
elif padchars == 1:
|
||
last = last[:-1]
|
||
elif padchars == 3:
|
||
last = last[:-2]
|
||
elif padchars == 4:
|
||
last = last[:-3]
|
||
elif padchars == 6:
|
||
last = last[:-4]
|
||
else:
|
||
raise TypeError('Incorrect padding')
|
||
parts.append(last)
|
||
return EMPTYSTRING.join(parts)
|
||
|
||
|
||
|
||
# RFC 3548, Base 16 Alphabet specifies uppercase, but hexlify() returns
|
||
# lowercase. The RFC also recommends against accepting input case
|
||
# insensitively.
|
||
def b16encode(s):
|
||
"""Encode a string using Base16.
|
||
|
||
s is the string to encode. The encoded string is returned.
|
||
"""
|
||
return binascii.hexlify(s).upper()
|
||
|
||
|
||
def b16decode(s, casefold=False):
|
||
"""Decode a Base16 encoded string.
|
||
|
||
s is the string to decode. Optional casefold is a flag specifying whether
|
||
a lowercase alphabet is acceptable as input. For security purposes, the
|
||
default is False.
|
||
|
||
The decoded string is returned. A TypeError is raised if s were
|
||
incorrectly padded or if there are non-alphabet characters present in the
|
||
string.
|
||
"""
|
||
if casefold:
|
||
s = s.upper()
|
||
if re.search('[^0-9A-F]', s):
|
||
raise TypeError('Non-base16 digit found')
|
||
return binascii.unhexlify(s)
|
||
|
||
|
||
|
||
# Legacy interface. This code could be cleaned up since I don't believe
|
||
# binascii has any line length limitations. It just doesn't seem worth it
|
||
# though.
|
||
|
||
MAXLINESIZE = 76 # Excluding the CRLF
|
||
MAXBINSIZE = (MAXLINESIZE//4)*3
|
||
|
||
def encode(input, output):
|
||
"""Encode a file."""
|
||
while True:
|
||
s = input.read(MAXBINSIZE)
|
||
if not s:
|
||
break
|
||
while len(s) < MAXBINSIZE:
|
||
ns = input.read(MAXBINSIZE-len(s))
|
||
if not ns:
|
||
break
|
||
s += ns
|
||
line = binascii.b2a_base64(s)
|
||
output.write(line)
|
||
|
||
|
||
def decode(input, output):
|
||
"""Decode a file."""
|
||
while True:
|
||
line = input.readline()
|
||
if not line:
|
||
break
|
||
s = binascii.a2b_base64(line)
|
||
output.write(s)
|
||
|
||
|
||
def encodestring(s):
|
||
"""Encode a string."""
|
||
pieces = []
|
||
for i in range(0, len(s), MAXBINSIZE):
|
||
chunk = s[i : i + MAXBINSIZE]
|
||
pieces.append(binascii.b2a_base64(chunk))
|
||
return "".join(pieces)
|
||
|
||
|
||
def decodestring(s):
|
||
"""Decode a string."""
|
||
return binascii.a2b_base64(s)
|
||
|
||
|
||
|
||
# Useable as a script...
|
||
def test():
|
||
"""Small test program"""
|
||
import sys, getopt
|
||
try:
|
||
opts, args = getopt.getopt(sys.argv[1:], 'deut')
|
||
except getopt.error, msg:
|
||
sys.stdout = sys.stderr
|
||
print msg
|
||
print """usage: %s [-d|-e|-u|-t] [file|-]
|
||
-d, -u: decode
|
||
-e: encode (default)
|
||
-t: encode and decode string 'Aladdin:open sesame'"""%sys.argv[0]
|
||
sys.exit(2)
|
||
func = encode
|
||
for o, a in opts:
|
||
if o == '-e': func = encode
|
||
if o == '-d': func = decode
|
||
if o == '-u': func = decode
|
||
if o == '-t': test1(); return
|
||
if args and args[0] != '-':
|
||
func(open(args[0], 'rb'), sys.stdout)
|
||
else:
|
||
func(sys.stdin, sys.stdout)
|
||
|
||
|
||
def test1():
|
||
s0 = "Aladdin:open sesame"
|
||
s1 = encodestring(s0)
|
||
s2 = decodestring(s1)
|
||
print s0, repr(s1), s2
|
||
|
||
|
||
if __name__ == '__main__':
|
||
test()
|