Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #13088: Add shared Py_hexdigits constant to format a number into base 16

This commit is contained in:
Victor Stinner 2011-10-14 02:13:11 +02:00
parent e506437b52
commit f5cff56a1b
16 changed files with 118 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/codecs.h
View File

@ -174,6 +174,8 @@ PyAPI_FUNC(PyObject *) PyCodec_XMLCharRefReplaceErrors(PyObject *exc);
/* replace the unicode encode error with backslash escapes (\x, \u and \U) */ /* replace the unicode encode error with backslash escapes (\x, \u and \U) */
PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc); PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc);
extern const char *Py_hexdigits;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

5
Modules/_codecsmodule.c
View File

@ -162,7 +162,6 @@ static PyObject *
escape_encode(PyObject *self, escape_encode(PyObject *self,
PyObject *args) PyObject *args)
{ {
static const char *hexdigits = "0123456789abcdef";
PyObject *str; PyObject *str;
Py_ssize_t size; Py_ssize_t size;
Py_ssize_t newsize; Py_ssize_t newsize;
@ -205,8 +204,8 @@ escape_encode(PyObject *self,
else if (c < ' ' || c >= 0x7f) { else if (c < ' ' || c >= 0x7f) {
*p++ = '\\'; *p++ = '\\';
*p++ = 'x'; *p++ = 'x';
*p++ = hexdigits[(c & 0xf0) >> 4]; *p++ = Py_hexdigits[(c & 0xf0) >> 4];
*p++ = hexdigits[c & 0xf]; *p++ = Py_hexdigits[c & 0xf];
} }
else else
*p++ = c; *p++ = c;

8
Modules/_hashopenssl.c
View File

@ -201,13 +201,11 @@ EVP_hexdigest(EVPobject *self, PyObject *unused)
/* Make hex version of the digest */ /* Make hex version of the digest */
for(i=j=0; i<digest_size; i++) { for(i=j=0; i<digest_size; i++) {
char c; unsigned char c;
c = (digest[i] >> 4) & 0xf; c = (digest[i] >> 4) & 0xf;
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
c = (digest[i] & 0xf); c = (digest[i] & 0xf);
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
} }
retval = PyUnicode_FromStringAndSize(hex_digest, digest_size * 2); retval = PyUnicode_FromStringAndSize(hex_digest, digest_size * 2);
PyMem_Free(hex_digest); PyMem_Free(hex_digest);

16
Modules/_json.c
View File

@ -175,18 +175,18 @@ ascii_escape_unichar(Py_UCS4 c, unsigned char *output, Py_ssize_t chars)
Py_UCS4 v = c - 0x10000; Py_UCS4 v = c - 0x10000;
c = 0xd800 | ((v >> 10) & 0x3ff); c = 0xd800 | ((v >> 10) & 0x3ff);
output[chars++] = 'u'; output[chars++] = 'u';
output[chars++] = "0123456789abcdef"[(c >> 12) & 0xf]; output[chars++] = Py_hexdigits[(c >> 12) & 0xf];
output[chars++] = "0123456789abcdef"[(c >> 8) & 0xf]; output[chars++] = Py_hexdigits[(c >> 8) & 0xf];
output[chars++] = "0123456789abcdef"[(c >> 4) & 0xf]; output[chars++] = Py_hexdigits[(c >> 4) & 0xf];
output[chars++] = "0123456789abcdef"[(c ) & 0xf]; output[chars++] = Py_hexdigits[(c ) & 0xf];
c = 0xdc00 | (v & 0x3ff); c = 0xdc00 | (v & 0x3ff);
output[chars++] = '\\'; output[chars++] = '\\';
} }
output[chars++] = 'u'; output[chars++] = 'u';
output[chars++] = "0123456789abcdef"[(c >> 12) & 0xf]; output[chars++] = Py_hexdigits[(c >> 12) & 0xf];
output[chars++] = "0123456789abcdef"[(c >> 8) & 0xf]; output[chars++] = Py_hexdigits[(c >> 8) & 0xf];
output[chars++] = "0123456789abcdef"[(c >> 4) & 0xf]; output[chars++] = Py_hexdigits[(c >> 4) & 0xf];
output[chars++] = "0123456789abcdef"[(c ) & 0xf]; output[chars++] = Py_hexdigits[(c ) & 0xf];
} }
return chars; return chars;
} }

25
Modules/_pickle.c
View File

@ -1776,7 +1776,6 @@ save_bytes(PicklerObject *self, PyObject *obj)
static PyObject * static PyObject *
raw_unicode_escape(PyObject *obj) raw_unicode_escape(PyObject *obj)
{ {
static const char *hexdigits = "0123456789abcdef";
PyObject *repr, *result; PyObject *repr, *result;
char *p; char *p;
Py_ssize_t i, size, expandsize; Py_ssize_t i, size, expandsize;
@ -1809,23 +1808,23 @@ raw_unicode_escape(PyObject *obj)
if (ch >= 0x10000) { if (ch >= 0x10000) {
*p++ = '\\'; *p++ = '\\';
*p++ = 'U'; *p++ = 'U';
*p++ = hexdigits[(ch >> 28) & 0xf]; *p++ = Py_hexdigits[(ch >> 28) & 0xf];
*p++ = hexdigits[(ch >> 24) & 0xf]; *p++ = Py_hexdigits[(ch >> 24) & 0xf];
*p++ = hexdigits[(ch >> 20) & 0xf]; *p++ = Py_hexdigits[(ch >> 20) & 0xf];
*p++ = hexdigits[(ch >> 16) & 0xf]; *p++ = Py_hexdigits[(ch >> 16) & 0xf];
*p++ = hexdigits[(ch >> 12) & 0xf]; *p++ = Py_hexdigits[(ch >> 12) & 0xf];
*p++ = hexdigits[(ch >> 8) & 0xf]; *p++ = Py_hexdigits[(ch >> 8) & 0xf];
*p++ = hexdigits[(ch >> 4) & 0xf]; *p++ = Py_hexdigits[(ch >> 4) & 0xf];
*p++ = hexdigits[ch & 15]; *p++ = Py_hexdigits[ch & 15];
} }
/* Map 16-bit characters to '\uxxxx' */ /* Map 16-bit characters to '\uxxxx' */
else if (ch >= 256 || ch == '\\' || ch == '\n') { else if (ch >= 256 || ch == '\\' || ch == '\n') {
*p++ = '\\'; *p++ = '\\';
*p++ = 'u'; *p++ = 'u';
*p++ = hexdigits[(ch >> 12) & 0xf]; *p++ = Py_hexdigits[(ch >> 12) & 0xf];
*p++ = hexdigits[(ch >> 8) & 0xf]; *p++ = Py_hexdigits[(ch >> 8) & 0xf];
*p++ = hexdigits[(ch >> 4) & 0xf]; *p++ = Py_hexdigits[(ch >> 4) & 0xf];
*p++ = hexdigits[ch & 15]; *p++ = Py_hexdigits[ch & 15];
} }
/* Copy everything else as-is */ /* Copy everything else as-is */
else else

8
Modules/binascii.c
View File

@ -1078,13 +1078,11 @@ binascii_hexlify(PyObject *self, PyObject *args)
/* make hex version of string, taken from shamodule.c */ /* make hex version of string, taken from shamodule.c */
for (i=j=0; i < arglen; i++) { for (i=j=0; i < arglen; i++) {
char c; unsigned char c;
c = (argbuf[i] >> 4) & 0xf; c = (argbuf[i] >> 4) & 0xf;
c = (c>9) ? c+'a'-10 : c + '0'; retbuf[j++] = Py_hexdigits[c];
retbuf[j++] = c;
c = argbuf[i] & 0xf; c = argbuf[i] & 0xf;
c = (c>9) ? c+'a'-10 : c + '0'; retbuf[j++] = Py_hexdigits[c];
retbuf[j++] = c;
} }
PyBuffer_Release(&parg); PyBuffer_Release(&parg);
return retval; return retval;

8
Modules/md5module.c
View File

@ -391,13 +391,11 @@ MD5_hexdigest(MD5object *self, PyObject *unused)
/* Make hex version of the digest */ /* Make hex version of the digest */
for(i=j=0; i<MD5_DIGESTSIZE; i++) { for(i=j=0; i<MD5_DIGESTSIZE; i++) {
char c; unsigned char c;
c = (digest[i] >> 4) & 0xf; c = (digest[i] >> 4) & 0xf;
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
c = (digest[i] & 0xf); c = (digest[i] & 0xf);
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
} }
return retval; return retval;
} }

8
Modules/sha1module.c
View File

@ -367,13 +367,11 @@ SHA1_hexdigest(SHA1object *self, PyObject *unused)
/* Make hex version of the digest */ /* Make hex version of the digest */
for(i=j=0; i<SHA1_DIGESTSIZE; i++) { for(i=j=0; i<SHA1_DIGESTSIZE; i++) {
char c; unsigned char c;
c = (digest[i] >> 4) & 0xf; c = (digest[i] >> 4) & 0xf;
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
c = (digest[i] & 0xf); c = (digest[i] & 0xf);
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
} }
return retval; return retval;
} }

8
Modules/sha256module.c
View File

@ -460,13 +460,11 @@ SHA256_hexdigest(SHAobject *self, PyObject *unused)
/* Make hex version of the digest */ /* Make hex version of the digest */
for(i=j=0; i<self->digestsize; i++) { for(i=j=0; i<self->digestsize; i++) {
char c; unsigned char c;
c = (digest[i] >> 4) & 0xf; c = (digest[i] >> 4) & 0xf;
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
c = (digest[i] & 0xf); c = (digest[i] & 0xf);
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
} }
return retval; return retval;
} }

8
Modules/sha512module.c
View File

@ -526,13 +526,11 @@ SHA512_hexdigest(SHAobject *self, PyObject *unused)
/* Make hex version of the digest */ /* Make hex version of the digest */
for (i=j=0; i<self->digestsize; i++) { for (i=j=0; i<self->digestsize; i++) {
char c; unsigned char c;
c = (digest[i] >> 4) & 0xf; c = (digest[i] >> 4) & 0xf;
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
c = (digest[i] & 0xf); c = (digest[i] & 0xf);
c = (c>9) ? c+'a'-10 : c + '0'; hex_digest[j++] = Py_hexdigits[c];
hex_digest[j++] = c;
} }
return retval; return retval;
} }

5
Objects/bytearrayobject.c
View File

@ -850,7 +850,6 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
static PyObject * static PyObject *
bytearray_repr(PyByteArrayObject *self) bytearray_repr(PyByteArrayObject *self)
{ {
static const char *hexdigits = "0123456789abcdef";
const char *quote_prefix = "bytearray(b"; const char *quote_prefix = "bytearray(b";
const char *quote_postfix = ")"; const char *quote_postfix = ")";
Py_ssize_t length = Py_SIZE(self); Py_ssize_t length = Py_SIZE(self);
@ -912,8 +911,8 @@ bytearray_repr(PyByteArrayObject *self)
else if (c < ' ' || c >= 0x7f) { else if (c < ' ' || c >= 0x7f) {
*p++ = '\\'; *p++ = '\\';
*p++ = 'x'; *p++ = 'x';
*p++ = hexdigits[(c & 0xf0) >> 4]; *p++ = Py_hexdigits[(c & 0xf0) >> 4];
*p++ = hexdigits[c & 0xf]; *p++ = Py_hexdigits[c & 0xf];
} }
else else
*p++ = c; *p++ = c;

5
Objects/bytesobject.c
View File

@ -564,7 +564,6 @@ PyBytes_AsStringAndSize(register PyObject *obj,
PyObject * PyObject *
PyBytes_Repr(PyObject *obj, int smartquotes) PyBytes_Repr(PyObject *obj, int smartquotes)
{ {
static const char *hexdigits = "0123456789abcdef";
register PyBytesObject* op = (PyBytesObject*) obj; register PyBytesObject* op = (PyBytesObject*) obj;
Py_ssize_t i, length = Py_SIZE(op); Py_ssize_t i, length = Py_SIZE(op);
size_t newsize, squotes, dquotes; size_t newsize, squotes, dquotes;
@ -620,8 +619,8 @@ PyBytes_Repr(PyObject *obj, int smartquotes)
else if (c < ' ' || c >= 0x7f) { else if (c < ' ' || c >= 0x7f) {
*p++ = '\\'; *p++ = '\\';
*p++ = 'x'; *p++ = 'x';
*p++ = hexdigits[(c & 0xf0) >> 4]; *p++ = Py_hexdigits[(c & 0xf0) >> 4];
*p++ = hexdigits[c & 0xf]; *p++ = Py_hexdigits[c & 0xf];
} }
else else
*p++ = c; *p++ = c;

2
Objects/floatobject.c
View File

@ -1058,7 +1058,7 @@ static char
char_from_hex(int x) char_from_hex(int x)
{ {
assert(0 <= x && x < 16); assert(0 <= x && x < 16);
return "0123456789abcdef"[x]; return Py_hexdigits[x];
} }
static int static int

118
Objects/unicodeobject.c
View File

@ -5943,8 +5943,6 @@ PyUnicode_DecodeUnicodeEscape(const char *s,
*/ */
static const char *hexdigits = "0123456789abcdef";
PyObject * PyObject *
PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s, PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s,
Py_ssize_t size) Py_ssize_t size)
@ -6006,14 +6004,14 @@ PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s,
else if (ch >= 0x10000) { else if (ch >= 0x10000) {
*p++ = '\\'; *p++ = '\\';
*p++ = 'U'; *p++ = 'U';
*p++ = hexdigits[(ch >> 28) & 0x0000000F]; *p++ = Py_hexdigits[(ch >> 28) & 0x0000000F];
*p++ = hexdigits[(ch >> 24) & 0x0000000F]; *p++ = Py_hexdigits[(ch >> 24) & 0x0000000F];
*p++ = hexdigits[(ch >> 20) & 0x0000000F]; *p++ = Py_hexdigits[(ch >> 20) & 0x0000000F];
*p++ = hexdigits[(ch >> 16) & 0x0000000F]; *p++ = Py_hexdigits[(ch >> 16) & 0x0000000F];
*p++ = hexdigits[(ch >> 12) & 0x0000000F]; *p++ = Py_hexdigits[(ch >> 12) & 0x0000000F];
*p++ = hexdigits[(ch >> 8) & 0x0000000F]; *p++ = Py_hexdigits[(ch >> 8) & 0x0000000F];
*p++ = hexdigits[(ch >> 4) & 0x0000000F]; *p++ = Py_hexdigits[(ch >> 4) & 0x0000000F];
*p++ = hexdigits[ch & 0x0000000F]; *p++ = Py_hexdigits[ch & 0x0000000F];
continue; continue;
} }
#else #else
@ -6028,14 +6026,14 @@ PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s,
ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000; ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000;
*p++ = '\\'; *p++ = '\\';
*p++ = 'U'; *p++ = 'U';
*p++ = hexdigits[(ucs >> 28) & 0x0000000F]; *p++ = Py_hexdigits[(ucs >> 28) & 0x0000000F];
*p++ = hexdigits[(ucs >> 24) & 0x0000000F]; *p++ = Py_hexdigits[(ucs >> 24) & 0x0000000F];
*p++ = hexdigits[(ucs >> 20) & 0x0000000F]; *p++ = Py_hexdigits[(ucs >> 20) & 0x0000000F];
*p++ = hexdigits[(ucs >> 16) & 0x0000000F]; *p++ = Py_hexdigits[(ucs >> 16) & 0x0000000F];
*p++ = hexdigits[(ucs >> 12) & 0x0000000F]; *p++ = Py_hexdigits[(ucs >> 12) & 0x0000000F];
*p++ = hexdigits[(ucs >> 8) & 0x0000000F]; *p++ = Py_hexdigits[(ucs >> 8) & 0x0000000F];
*p++ = hexdigits[(ucs >> 4) & 0x0000000F]; *p++ = Py_hexdigits[(ucs >> 4) & 0x0000000F];
*p++ = hexdigits[ucs & 0x0000000F]; *p++ = Py_hexdigits[ucs & 0x0000000F];
continue; continue;
} }
/* Fall through: isolated surrogates are copied as-is */ /* Fall through: isolated surrogates are copied as-is */
@ -6048,10 +6046,10 @@ PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s,
if (ch >= 256) { if (ch >= 256) {
*p++ = '\\'; *p++ = '\\';
*p++ = 'u'; *p++ = 'u';
*p++ = hexdigits[(ch >> 12) & 0x000F]; *p++ = Py_hexdigits[(ch >> 12) & 0x000F];
*p++ = hexdigits[(ch >> 8) & 0x000F]; *p++ = Py_hexdigits[(ch >> 8) & 0x000F];
*p++ = hexdigits[(ch >> 4) & 0x000F]; *p++ = Py_hexdigits[(ch >> 4) & 0x000F];
*p++ = hexdigits[ch & 0x000F]; *p++ = Py_hexdigits[ch & 0x000F];
} }
/* Map special whitespace to '\t', \n', '\r' */ /* Map special whitespace to '\t', \n', '\r' */
@ -6072,8 +6070,8 @@ PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s,
else if (ch < ' ' || ch >= 0x7F) { else if (ch < ' ' || ch >= 0x7F) {
*p++ = '\\'; *p++ = '\\';
*p++ = 'x'; *p++ = 'x';
*p++ = hexdigits[(ch >> 4) & 0x000F]; *p++ = Py_hexdigits[(ch >> 4) & 0x000F];
*p++ = hexdigits[ch & 0x000F]; *p++ = Py_hexdigits[ch & 0x000F];
} }
/* Copy everything else as-is */ /* Copy everything else as-is */
@ -6258,14 +6256,14 @@ PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE *s,
if (ch >= 0x10000) { if (ch >= 0x10000) {
*p++ = '\\'; *p++ = '\\';
*p++ = 'U'; *p++ = 'U';
*p++ = hexdigits[(ch >> 28) & 0xf]; *p++ = Py_hexdigits[(ch >> 28) & 0xf];
*p++ = hexdigits[(ch >> 24) & 0xf]; *p++ = Py_hexdigits[(ch >> 24) & 0xf];
*p++ = hexdigits[(ch >> 20) & 0xf]; *p++ = Py_hexdigits[(ch >> 20) & 0xf];
*p++ = hexdigits[(ch >> 16) & 0xf]; *p++ = Py_hexdigits[(ch >> 16) & 0xf];
*p++ = hexdigits[(ch >> 12) & 0xf]; *p++ = Py_hexdigits[(ch >> 12) & 0xf];
*p++ = hexdigits[(ch >> 8) & 0xf]; *p++ = Py_hexdigits[(ch >> 8) & 0xf];
*p++ = hexdigits[(ch >> 4) & 0xf]; *p++ = Py_hexdigits[(ch >> 4) & 0xf];
*p++ = hexdigits[ch & 15]; *p++ = Py_hexdigits[ch & 15];
} }
else else
#else #else
@ -6280,14 +6278,14 @@ PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE *s,
ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000; ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000;
*p++ = '\\'; *p++ = '\\';
*p++ = 'U'; *p++ = 'U';
*p++ = hexdigits[(ucs >> 28) & 0xf]; *p++ = Py_hexdigits[(ucs >> 28) & 0xf];
*p++ = hexdigits[(ucs >> 24) & 0xf]; *p++ = Py_hexdigits[(ucs >> 24) & 0xf];
*p++ = hexdigits[(ucs >> 20) & 0xf]; *p++ = Py_hexdigits[(ucs >> 20) & 0xf];
*p++ = hexdigits[(ucs >> 16) & 0xf]; *p++ = Py_hexdigits[(ucs >> 16) & 0xf];
*p++ = hexdigits[(ucs >> 12) & 0xf]; *p++ = Py_hexdigits[(ucs >> 12) & 0xf];
*p++ = hexdigits[(ucs >> 8) & 0xf]; *p++ = Py_hexdigits[(ucs >> 8) & 0xf];
*p++ = hexdigits[(ucs >> 4) & 0xf]; *p++ = Py_hexdigits[(ucs >> 4) & 0xf];
*p++ = hexdigits[ucs & 0xf]; *p++ = Py_hexdigits[ucs & 0xf];
continue; continue;
} }
/* Fall through: isolated surrogates are copied as-is */ /* Fall through: isolated surrogates are copied as-is */
@ -6299,10 +6297,10 @@ PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE *s,
if (ch >= 256) { if (ch >= 256) {
*p++ = '\\'; *p++ = '\\';
*p++ = 'u'; *p++ = 'u';
*p++ = hexdigits[(ch >> 12) & 0xf]; *p++ = Py_hexdigits[(ch >> 12) & 0xf];
*p++ = hexdigits[(ch >> 8) & 0xf]; *p++ = Py_hexdigits[(ch >> 8) & 0xf];
*p++ = hexdigits[(ch >> 4) & 0xf]; *p++ = Py_hexdigits[(ch >> 4) & 0xf];
*p++ = hexdigits[ch & 15]; *p++ = Py_hexdigits[ch & 15];
} }
/* Copy everything else as-is */ /* Copy everything else as-is */
else else
@ -11648,8 +11646,8 @@ unicode_repr(PyObject *unicode)
else if (ch < ' ' || ch == 0x7F) { else if (ch < ' ' || ch == 0x7F) {
PyUnicode_WRITE(okind, odata, o++, '\\'); PyUnicode_WRITE(okind, odata, o++, '\\');
PyUnicode_WRITE(okind, odata, o++, 'x'); PyUnicode_WRITE(okind, odata, o++, 'x');
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 4) & 0x000F]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 4) & 0x000F]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[ch & 0x000F]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[ch & 0x000F]);
} }
/* Copy ASCII characters as-is */ /* Copy ASCII characters as-is */
@ -11667,30 +11665,30 @@ unicode_repr(PyObject *unicode)
if (ch <= 0xff) { if (ch <= 0xff) {
PyUnicode_WRITE(okind, odata, o++, '\\'); PyUnicode_WRITE(okind, odata, o++, '\\');
PyUnicode_WRITE(okind, odata, o++, 'x'); PyUnicode_WRITE(okind, odata, o++, 'x');
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 4) & 0x000F]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 4) & 0x000F]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[ch & 0x000F]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[ch & 0x000F]);
} }
/* Map 21-bit characters to '\U00xxxxxx' */ /* Map 21-bit characters to '\U00xxxxxx' */
else if (ch >= 0x10000) { else if (ch >= 0x10000) {
PyUnicode_WRITE(okind, odata, o++, '\\'); PyUnicode_WRITE(okind, odata, o++, '\\');
PyUnicode_WRITE(okind, odata, o++, 'U'); PyUnicode_WRITE(okind, odata, o++, 'U');
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 28) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 28) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 24) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 24) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 20) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 20) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 16) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 16) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 12) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 12) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 8) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 8) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 4) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 4) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[ch & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[ch & 0xF]);
} }
/* Map 16-bit characters to '\uxxxx' */ /* Map 16-bit characters to '\uxxxx' */
else { else {
PyUnicode_WRITE(okind, odata, o++, '\\'); PyUnicode_WRITE(okind, odata, o++, '\\');
PyUnicode_WRITE(okind, odata, o++, 'u'); PyUnicode_WRITE(okind, odata, o++, 'u');
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 12) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 12) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 8) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 8) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[(ch >> 4) & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[(ch >> 4) & 0xF]);
PyUnicode_WRITE(okind, odata, o++, hexdigits[ch & 0xF]); PyUnicode_WRITE(okind, odata, o++, Py_hexdigits[ch & 0xF]);
} }
} }
/* Copy characters as-is */ /* Copy characters as-is */

24
Python/codecs.c
View File

@ -11,6 +11,8 @@ Copyright (c) Corporation for National Research Initiatives.
#include "Python.h" #include "Python.h"
#include <ctype.h> #include <ctype.h>
const char *Py_hexdigits = "0123456789abcdef";
/* --- Codec Registry ----------------------------------------------------- */ /* --- Codec Registry ----------------------------------------------------- */
/* Import the standard encodings package which will register the first /* Import the standard encodings package which will register the first
@ -673,8 +675,6 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
} }
} }
static const char *hexdigits = "0123456789abcdef";
PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc) PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
{ {
#ifndef Py_UNICODE_WIDE #ifndef Py_UNICODE_WIDE
@ -731,22 +731,22 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
} }
if (c >= 0x00010000) { if (c >= 0x00010000) {
*outp++ = 'U'; *outp++ = 'U';
*outp++ = hexdigits[(c>>28)&0xf]; *outp++ = Py_hexdigits[(c>>28)&0xf];
*outp++ = hexdigits[(c>>24)&0xf]; *outp++ = Py_hexdigits[(c>>24)&0xf];
*outp++ = hexdigits[(c>>20)&0xf]; *outp++ = Py_hexdigits[(c>>20)&0xf];
*outp++ = hexdigits[(c>>16)&0xf]; *outp++ = Py_hexdigits[(c>>16)&0xf];
*outp++ = hexdigits[(c>>12)&0xf]; *outp++ = Py_hexdigits[(c>>12)&0xf];
*outp++ = hexdigits[(c>>8)&0xf]; *outp++ = Py_hexdigits[(c>>8)&0xf];
} }
else if (c >= 0x100) { else if (c >= 0x100) {
*outp++ = 'u'; *outp++ = 'u';
*outp++ = hexdigits[(c>>12)&0xf]; *outp++ = Py_hexdigits[(c>>12)&0xf];
*outp++ = hexdigits[(c>>8)&0xf]; *outp++ = Py_hexdigits[(c>>8)&0xf];
} }
else else
*outp++ = 'x'; *outp++ = 'x';
*outp++ = hexdigits[(c>>4)&0xf]; *outp++ = Py_hexdigits[(c>>4)&0xf];
*outp++ = hexdigits[c&0xf]; *outp++ = Py_hexdigits[c&0xf];
} }
restuple = Py_BuildValue("(On)", res, end); restuple = Py_BuildValue("(On)", res, end);

3
Python/traceback.c
View File

@ -463,12 +463,11 @@ dump_decimal(int fd, int value)
static void static void
dump_hexadecimal(int width, unsigned long value, int fd) dump_hexadecimal(int width, unsigned long value, int fd)
{ {
const char *hexdigits = "0123456789abcdef";
int len; int len;
char buffer[sizeof(unsigned long) * 2 + 1]; char buffer[sizeof(unsigned long) * 2 + 1];
len = 0; len = 0;
do { do {
buffer[len] = hexdigits[value & 15]; buffer[len] = Py_hexdigits[value & 15];
value >>= 4; value >>= 4;
len++; len++;
} while (len < width || value); } while (len < width || value);