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

Merge heads.

This commit is contained in:
Trent Nelson 2012-10-17 18:08:40 -04:00
parent c78649873f 743e0cd6b5
commit f17512f67e
19 changed files with 4503 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/tutorial/inputoutput.rst
View File

@ -184,7 +184,7 @@ square brackets ``'[]'`` to access the keys ::
>>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678} >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678}
>>> print('Jack: {0[Jack]:d}; Sjoerd: {0[Sjoerd]:d}; ' >>> print('Jack: {0[Jack]:d}; Sjoerd: {0[Sjoerd]:d}; '
'Dcab: {0[Dcab]:d}'.format(table)) ... 'Dcab: {0[Dcab]:d}'.format(table))
Jack: 4098; Sjoerd: 4127; Dcab: 8637678 Jack: 4098; Sjoerd: 4127; Dcab: 8637678
This could also be done by passing the table as keyword arguments with the '**' This could also be done by passing the table as keyword arguments with the '**'

6
Doc/using/cmdline.rst
View File

@ -380,7 +380,10 @@ Options you shouldn't use
Environment variables Environment variables
--------------------- ---------------------
These environment variables influence Python's behavior. These environment variables influence Python's behavior, they are processed
before the command-line switches other than -E. It is customary that
command-line switches override environmental variables where there is a
conflict.
.. envvar:: PYTHONHOME .. envvar:: PYTHONHOME
@ -577,4 +580,3 @@ if Python was configured with the ``--with-pydebug`` build option.
If set, Python will print memory allocation statistics every time a new If set, Python will print memory allocation statistics every time a new
object arena is created, and on shutdown. object arena is created, and on shutdown.

14
Include/pyport.h
View File

@ -865,4 +865,18 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
#endif #endif
#endif #endif
/*
* Convenient macros to deal with endianess of the platform. WORDS_BIGENDIAN is
* detected by configure and defined in pyconfig.h. The code in pyconfig.h
* also also takes care of Apple's universal builds.
*/
#ifdef WORDS_BIGENDIAN
#define PY_BIG_ENDIAN 1
#define PY_LITTLE_ENDIAN 0
#else
#define PY_BIG_ENDIAN 0
#define PY_LITTLE_ENDIAN 1
#endif
#endif /* Py_PYPORT_H */ #endif /* Py_PYPORT_H */

1
Misc/ACKS
View File

@ -997,6 +997,7 @@ Hugo van Rossum
Saskia van Rossum Saskia van Rossum
Donald Wallace Rouse II Donald Wallace Rouse II
Liam Routt Liam Routt
Todd Rovito
Craig Rowland Craig Rowland
Clinton Roy Clinton Roy
Paul Rubin Paul Rubin

4421
Misc/NEWS
View File

File diff suppressed because it is too large Load Diff

18
Modules/_io/textio.c
View File

@ -747,7 +747,7 @@ utf16_encode(textio *self, PyObject *text)
{ {
if (!self->encoding_start_of_stream) { if (!self->encoding_start_of_stream) {
/* Skip the BOM and use native byte ordering */ /* Skip the BOM and use native byte ordering */
#if defined(WORDS_BIGENDIAN) #if PY_BIG_ENDIAN
return utf16be_encode(self, text); return utf16be_encode(self, text);
#else #else
return utf16le_encode(self, text); return utf16le_encode(self, text);
@ -776,7 +776,7 @@ utf32_encode(textio *self, PyObject *text)
{ {
if (!self->encoding_start_of_stream) { if (!self->encoding_start_of_stream) {
/* Skip the BOM and use native byte ordering */ /* Skip the BOM and use native byte ordering */
#if defined(WORDS_BIGENDIAN) #if PY_BIG_ENDIAN
return utf32be_encode(self, text); return utf32be_encode(self, text);
#else #else
return utf32le_encode(self, text); return utf32le_encode(self, text);
@ -1913,10 +1913,7 @@ typedef struct {
#define COOKIE_BUF_LEN (sizeof(Py_off_t) + 3 * sizeof(int) + sizeof(char)) #define COOKIE_BUF_LEN (sizeof(Py_off_t) + 3 * sizeof(int) + sizeof(char))
#if defined(WORDS_BIGENDIAN) #if PY_BIG_ENDIAN
# define IS_LITTLE_ENDIAN 0
/* We want the least significant byte of start_pos to also be the least /* We want the least significant byte of start_pos to also be the least
significant byte of the cookie, which means that in big-endian mode we significant byte of the cookie, which means that in big-endian mode we
must copy the fields in reverse order. */ must copy the fields in reverse order. */
@ -1928,9 +1925,6 @@ typedef struct {
# define OFF_NEED_EOF 0 # define OFF_NEED_EOF 0
#else #else
# define IS_LITTLE_ENDIAN 1
/* Little-endian mode: the least significant byte of start_pos will /* Little-endian mode: the least significant byte of start_pos will
naturally end up the least significant byte of the cookie. */ naturally end up the least significant byte of the cookie. */
@ -1951,7 +1945,7 @@ textiowrapper_parse_cookie(cookie_type *cookie, PyObject *cookieObj)
return -1; return -1;
if (_PyLong_AsByteArray(cookieLong, buffer, sizeof(buffer), if (_PyLong_AsByteArray(cookieLong, buffer, sizeof(buffer),
IS_LITTLE_ENDIAN, 0) < 0) { PY_LITTLE_ENDIAN, 0) < 0) {
Py_DECREF(cookieLong); Py_DECREF(cookieLong);
return -1; return -1;
} }
@ -1977,9 +1971,9 @@ textiowrapper_build_cookie(cookie_type *cookie)
memcpy(buffer + OFF_CHARS_TO_SKIP, &cookie->chars_to_skip, sizeof(cookie->chars_to_skip)); memcpy(buffer + OFF_CHARS_TO_SKIP, &cookie->chars_to_skip, sizeof(cookie->chars_to_skip));
memcpy(buffer + OFF_NEED_EOF, &cookie->need_eof, sizeof(cookie->need_eof)); memcpy(buffer + OFF_NEED_EOF, &cookie->need_eof, sizeof(cookie->need_eof));
return _PyLong_FromByteArray(buffer, sizeof(buffer), IS_LITTLE_ENDIAN, 0); return _PyLong_FromByteArray(buffer, sizeof(buffer),
PY_LITTLE_ENDIAN, 0);
} }
#undef IS_LITTLE_ENDIAN
static int static int
_textiowrapper_decoder_setstate(textio *self, cookie_type *cookie) _textiowrapper_decoder_setstate(textio *self, cookie_type *cookie)

8
Modules/_sha3/cleanup.py
View File

@ -32,10 +32,10 @@ def cleanup(f):
if line.startswith("typedef unsigned long long int"): if line.startswith("typedef unsigned long long int"):
buf.append("/* %s */\n" % line.strip()) buf.append("/* %s */\n" % line.strip())
continue continue
## remove #include "brg_endian.h" # remove #include "brg_endian.h"
#if "brg_endian.h" in line: if "brg_endian.h" in line:
# buf.append("/* %s */\n" % line.strip()) buf.append("/* %s */\n" % line.strip())
# continue continue
# transform C++ comments into ANSI C comments # transform C++ comments into ANSI C comments
line = CPP1.sub(r"/* \1 */", line) line = CPP1.sub(r"/* \1 */", line)
line = CPP2.sub(r" /* \1 */", line) line = CPP2.sub(r" /* \1 */", line)

2
Modules/_sha3/keccak/KeccakF-1600-opt32.c
View File

@ -12,7 +12,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
*/ */
#include <string.h> #include <string.h>
#include "brg_endian.h" /* #include "brg_endian.h" */
#include "KeccakF-1600-opt32-settings.h" #include "KeccakF-1600-opt32-settings.h"
#include "KeccakF-1600-interface.h" #include "KeccakF-1600-interface.h"

2
Modules/_sha3/keccak/KeccakF-1600-opt64.c
View File

@ -12,7 +12,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
*/ */
#include <string.h> #include <string.h>
#include "brg_endian.h" /* #include "brg_endian.h" */
#include "KeccakF-1600-opt64-settings.h" #include "KeccakF-1600-opt64-settings.h"
#include "KeccakF-1600-interface.h" #include "KeccakF-1600-interface.h"

13
Modules/_sha3/sha3module.c
View File

@ -124,11 +124,14 @@
#define UseInterleaveTables #define UseInterleaveTables
#endif #endif
/* replacement for brg_endian.h /* replacement for brg_endian.h */
#define IS_BIG_ENDIAN BIG_ENDIAN #define IS_BIG_ENDIAN 4321
#define IS_LITTLE_ENDIAN LITTLE_ENDIAN #define IS_LITTLE_ENDIAN 1234
#define PLATFORM_BYTE_ORDER BYTE_ORDER #if PY_BIG_ENDIAN
*/ # define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN
#else
# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN
#endif
/* inline all Keccak dependencies */ /* inline all Keccak dependencies */
#include "keccak/KeccakNISTInterface.h" #include "keccak/KeccakNISTInterface.h"

13
Modules/_struct.c
View File

@ -1199,12 +1199,11 @@ whichtable(char **pfmt)
case '!': /* Network byte order is big-endian */ case '!': /* Network byte order is big-endian */
return bigendian_table; return bigendian_table;
case '=': { /* Host byte order -- different from native in alignment! */ case '=': { /* Host byte order -- different from native in alignment! */
int n = 1; #if PY_LITTLE_ENDIAN
char *p = (char *) &n;
if (*p == 1)
return lilendian_table; return lilendian_table;
else #else
return bigendian_table; return bigendian_table;
#endif
} }
default: default:
--*pfmt; /* Back out of pointer increment */ --*pfmt; /* Back out of pointer increment */
@ -2088,13 +2087,13 @@ PyInit__struct(void)
/* Check endian and swap in faster functions */ /* Check endian and swap in faster functions */
{ {
int one = 1;
formatdef *native = native_table; formatdef *native = native_table;
formatdef *other, *ptr; formatdef *other, *ptr;
if ((int)*(unsigned char*)&one) #if PY_LITTLE_ENDIAN
other = lilendian_table; other = lilendian_table;
else #else
other = bigendian_table; other = bigendian_table;
#endif
/* Scan through the native table, find a matching /* Scan through the native table, find a matching
entry in the endian table and swap in the entry in the endian table and swap in the
native implementations whenever possible native implementations whenever possible

7
Modules/arraymodule.c
View File

@ -1664,11 +1664,8 @@ static const struct mformatdescr {
static enum machine_format_code static enum machine_format_code
typecode_to_mformat_code(char typecode) typecode_to_mformat_code(char typecode)
{ {
#ifdef WORDS_BIGENDIAN const int is_big_endian = PY_BIG_ENDIAN;
const int is_big_endian = 1;
#else
const int is_big_endian = 0;
#endif
size_t intsize; size_t intsize;
int is_signed; int is_signed;

22
Modules/sha256module.c
View File

@ -21,13 +21,6 @@
#include "hashlib.h" #include "hashlib.h"
/* Endianness testing and definitions */
#define TestEndianness(variable) {int i=1; variable=PCT_BIG_ENDIAN;\
if (*((char*)&i)==1) variable=PCT_LITTLE_ENDIAN;}
#define PCT_LITTLE_ENDIAN 1
#define PCT_BIG_ENDIAN 0
/* Some useful types */ /* Some useful types */
typedef unsigned char SHA_BYTE; typedef unsigned char SHA_BYTE;
@ -50,7 +43,6 @@ typedef struct {
SHA_INT32 digest[8]; /* Message digest */ SHA_INT32 digest[8]; /* Message digest */
SHA_INT32 count_lo, count_hi; /* 64-bit bit count */ SHA_INT32 count_lo, count_hi; /* 64-bit bit count */
SHA_BYTE data[SHA_BLOCKSIZE]; /* SHA data buffer */ SHA_BYTE data[SHA_BLOCKSIZE]; /* SHA data buffer */
int Endianness;
int local; /* unprocessed amount in data */ int local; /* unprocessed amount in data */
int digestsize; int digestsize;
} SHAobject; } SHAobject;
@ -58,13 +50,11 @@ typedef struct {
/* When run on a little-endian CPU we need to perform byte reversal on an /* When run on a little-endian CPU we need to perform byte reversal on an
array of longwords. */ array of longwords. */
static void longReverse(SHA_INT32 *buffer, int byteCount, int Endianness) #if PY_LITTLE_ENDIAN
static void longReverse(SHA_INT32 *buffer, int byteCount)
{ {
SHA_INT32 value; SHA_INT32 value;
if ( Endianness == PCT_BIG_ENDIAN )
return;
byteCount /= sizeof(*buffer); byteCount /= sizeof(*buffer);
while (byteCount--) { while (byteCount--) {
value = *buffer; value = *buffer;
@ -73,10 +63,10 @@ static void longReverse(SHA_INT32 *buffer, int byteCount, int Endianness)
*buffer++ = ( value << 16 ) | ( value >> 16 ); *buffer++ = ( value << 16 ) | ( value >> 16 );
} }
} }
#endif
static void SHAcopy(SHAobject *src, SHAobject *dest) static void SHAcopy(SHAobject *src, SHAobject *dest)
{ {
dest->Endianness = src->Endianness;
dest->local = src->local; dest->local = src->local;
dest->digestsize = src->digestsize; dest->digestsize = src->digestsize;
dest->count_lo = src->count_lo; dest->count_lo = src->count_lo;
@ -131,7 +121,9 @@ sha_transform(SHAobject *sha_info)
SHA_INT32 S[8], W[64], t0, t1; SHA_INT32 S[8], W[64], t0, t1;
memcpy(W, sha_info->data, sizeof(sha_info->data)); memcpy(W, sha_info->data, sizeof(sha_info->data));
longReverse(W, (int)sizeof(sha_info->data), sha_info->Endianness); #if PY_LITTLE_ENDIAN
longReverse(W, (int)sizeof(sha_info->data));
#endif
for (i = 16; i < 64; ++i) { for (i = 16; i < 64; ++i) {
W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]; W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16];
@ -228,7 +220,6 @@ sha_transform(SHAobject *sha_info)
static void static void
sha_init(SHAobject *sha_info) sha_init(SHAobject *sha_info)
{ {
TestEndianness(sha_info->Endianness)
sha_info->digest[0] = 0x6A09E667L; sha_info->digest[0] = 0x6A09E667L;
sha_info->digest[1] = 0xBB67AE85L; sha_info->digest[1] = 0xBB67AE85L;
sha_info->digest[2] = 0x3C6EF372L; sha_info->digest[2] = 0x3C6EF372L;
@ -246,7 +237,6 @@ sha_init(SHAobject *sha_info)
static void static void
sha224_init(SHAobject *sha_info) sha224_init(SHAobject *sha_info)
{ {
TestEndianness(sha_info->Endianness)
sha_info->digest[0] = 0xc1059ed8L; sha_info->digest[0] = 0xc1059ed8L;
sha_info->digest[1] = 0x367cd507L; sha_info->digest[1] = 0x367cd507L;
sha_info->digest[2] = 0x3070dd17L; sha_info->digest[2] = 0x3070dd17L;

22
Modules/sha512module.c
View File

@ -22,13 +22,6 @@
#ifdef PY_LONG_LONG /* If no PY_LONG_LONG, don't compile anything! */ #ifdef PY_LONG_LONG /* If no PY_LONG_LONG, don't compile anything! */
/* Endianness testing and definitions */
#define TestEndianness(variable) {int i=1; variable=PCT_BIG_ENDIAN;\
if (*((char*)&i)==1) variable=PCT_LITTLE_ENDIAN;}
#define PCT_LITTLE_ENDIAN 1
#define PCT_BIG_ENDIAN 0
/* Some useful types */ /* Some useful types */
typedef unsigned char SHA_BYTE; typedef unsigned char SHA_BYTE;
@ -52,7 +45,6 @@ typedef struct {
SHA_INT64 digest[8]; /* Message digest */ SHA_INT64 digest[8]; /* Message digest */
SHA_INT32 count_lo, count_hi; /* 64-bit bit count */ SHA_INT32 count_lo, count_hi; /* 64-bit bit count */
SHA_BYTE data[SHA_BLOCKSIZE]; /* SHA data buffer */ SHA_BYTE data[SHA_BLOCKSIZE]; /* SHA data buffer */
int Endianness;
int local; /* unprocessed amount in data */ int local; /* unprocessed amount in data */
int digestsize; int digestsize;
} SHAobject; } SHAobject;
@ -60,13 +52,11 @@ typedef struct {
/* When run on a little-endian CPU we need to perform byte reversal on an /* When run on a little-endian CPU we need to perform byte reversal on an
array of longwords. */ array of longwords. */
static void longReverse(SHA_INT64 *buffer, int byteCount, int Endianness) #if PY_LITTLE_ENDIAN
static void longReverse(SHA_INT64 *buffer, int byteCount)
{ {
SHA_INT64 value; SHA_INT64 value;
if ( Endianness == PCT_BIG_ENDIAN )
return;
byteCount /= sizeof(*buffer); byteCount /= sizeof(*buffer);
while (byteCount--) { while (byteCount--) {
value = *buffer; value = *buffer;
@ -83,10 +73,10 @@ static void longReverse(SHA_INT64 *buffer, int byteCount, int Endianness)
buffer++; buffer++;
} }
} }
#endif
static void SHAcopy(SHAobject *src, SHAobject *dest) static void SHAcopy(SHAobject *src, SHAobject *dest)
{ {
dest->Endianness = src->Endianness;
dest->local = src->local; dest->local = src->local;
dest->digestsize = src->digestsize; dest->digestsize = src->digestsize;
dest->count_lo = src->count_lo; dest->count_lo = src->count_lo;
@ -141,7 +131,9 @@ sha512_transform(SHAobject *sha_info)
SHA_INT64 S[8], W[80], t0, t1; SHA_INT64 S[8], W[80], t0, t1;
memcpy(W, sha_info->data, sizeof(sha_info->data)); memcpy(W, sha_info->data, sizeof(sha_info->data));
longReverse(W, (int)sizeof(sha_info->data), sha_info->Endianness); #if PY_LITTLE_ENDIAN
longReverse(W, (int)sizeof(sha_info->data));
#endif
for (i = 16; i < 80; ++i) { for (i = 16; i < 80; ++i) {
W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]; W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16];
@ -254,7 +246,6 @@ sha512_transform(SHAobject *sha_info)
static void static void
sha512_init(SHAobject *sha_info) sha512_init(SHAobject *sha_info)
{ {
TestEndianness(sha_info->Endianness)
sha_info->digest[0] = Py_ULL(0x6a09e667f3bcc908); sha_info->digest[0] = Py_ULL(0x6a09e667f3bcc908);
sha_info->digest[1] = Py_ULL(0xbb67ae8584caa73b); sha_info->digest[1] = Py_ULL(0xbb67ae8584caa73b);
sha_info->digest[2] = Py_ULL(0x3c6ef372fe94f82b); sha_info->digest[2] = Py_ULL(0x3c6ef372fe94f82b);
@ -272,7 +263,6 @@ sha512_init(SHAobject *sha_info)
static void static void
sha384_init(SHAobject *sha_info) sha384_init(SHAobject *sha_info)
{ {
TestEndianness(sha_info->Endianness)
sha_info->digest[0] = Py_ULL(0xcbbb9d5dc1059ed8); sha_info->digest[0] = Py_ULL(0xcbbb9d5dc1059ed8);
sha_info->digest[1] = Py_ULL(0x629a292a367cd507); sha_info->digest[1] = Py_ULL(0x629a292a367cd507);
sha_info->digest[2] = Py_ULL(0x9159015a3070dd17); sha_info->digest[2] = Py_ULL(0x9159015a3070dd17);

8
Objects/longobject.c
View File

@ -988,7 +988,6 @@ PyLong_AsVoidPtr(PyObject *vv)
* rewritten to use the newer PyLong_{As,From}ByteArray API. * rewritten to use the newer PyLong_{As,From}ByteArray API.
*/ */
#define IS_LITTLE_ENDIAN (int)*(unsigned char*)&one
#define PY_ABS_LLONG_MIN (0-(unsigned PY_LONG_LONG)PY_LLONG_MIN) #define PY_ABS_LLONG_MIN (0-(unsigned PY_LONG_LONG)PY_LLONG_MIN)
/* Create a new long int object from a C PY_LONG_LONG int. */ /* Create a new long int object from a C PY_LONG_LONG int. */
@ -1141,7 +1140,6 @@ PyLong_AsLongLong(PyObject *vv)
{ {
PyLongObject *v; PyLongObject *v;
PY_LONG_LONG bytes; PY_LONG_LONG bytes;
int one = 1;
int res; int res;
if (vv == NULL) { if (vv == NULL) {
@ -1176,7 +1174,7 @@ PyLong_AsLongLong(PyObject *vv)
case 1: return v->ob_digit[0]; case 1: return v->ob_digit[0];
} }
res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes,
SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1); SIZEOF_LONG_LONG, PY_LITTLE_ENDIAN, 1);
/* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */
if (res < 0) if (res < 0)
@ -1193,7 +1191,6 @@ PyLong_AsUnsignedLongLong(PyObject *vv)
{ {
PyLongObject *v; PyLongObject *v;
unsigned PY_LONG_LONG bytes; unsigned PY_LONG_LONG bytes;
int one = 1;
int res; int res;
if (vv == NULL) { if (vv == NULL) {
@ -1212,7 +1209,7 @@ PyLong_AsUnsignedLongLong(PyObject *vv)
} }
res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes,
SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0); SIZEOF_LONG_LONG, PY_LITTLE_ENDIAN, 0);
/* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */
if (res < 0) if (res < 0)
@ -1288,7 +1285,6 @@ PyLong_AsUnsignedLongLongMask(register PyObject *op)
return (unsigned PY_LONG_LONG)-1; return (unsigned PY_LONG_LONG)-1;
} }
} }
#undef IS_LITTLE_ENDIAN
/* Get a C long long int from a long int object or any object that has an /* Get a C long long int from a long int object or any object that has an
__int__ method. __int__ method.

6
Objects/stringlib/codecs.h
View File

@ -47,7 +47,7 @@ STRINGLIB(utf8_decode)(const char **inptr, const char *end,
unsigned long value = *(unsigned long *) _s; unsigned long value = *(unsigned long *) _s;
if (value & ASCII_CHAR_MASK) if (value & ASCII_CHAR_MASK)
break; break;
#ifdef BYTEORDER_IS_LITTLE_ENDIAN #if PY_LITTLE_ENDIAN
_p[0] = (STRINGLIB_CHAR)(value & 0xFFu); _p[0] = (STRINGLIB_CHAR)(value & 0xFFu);
_p[1] = (STRINGLIB_CHAR)((value >> 8) & 0xFFu); _p[1] = (STRINGLIB_CHAR)((value >> 8) & 0xFFu);
_p[2] = (STRINGLIB_CHAR)((value >> 16) & 0xFFu); _p[2] = (STRINGLIB_CHAR)((value >> 16) & 0xFFu);
@ -454,7 +454,7 @@ STRINGLIB(utf16_decode)(const unsigned char **inptr, const unsigned char *e,
const unsigned char *q = *inptr; const unsigned char *q = *inptr;
STRINGLIB_CHAR *p = dest + *outpos; STRINGLIB_CHAR *p = dest + *outpos;
/* Offsets from q for retrieving byte pairs in the right order. */ /* Offsets from q for retrieving byte pairs in the right order. */
#ifdef BYTEORDER_IS_LITTLE_ENDIAN #if PY_LITTLE_ENDIAN
int ihi = !!native_ordering, ilo = !native_ordering; int ihi = !!native_ordering, ilo = !native_ordering;
#else #else
int ihi = !native_ordering, ilo = !!native_ordering; int ihi = !native_ordering, ilo = !!native_ordering;
@ -485,7 +485,7 @@ STRINGLIB(utf16_decode)(const unsigned char **inptr, const unsigned char *e,
block = SWAB(block); block = SWAB(block);
#endif #endif
} }
#ifdef BYTEORDER_IS_LITTLE_ENDIAN #if PY_LITTLE_ENDIAN
# if SIZEOF_LONG == 4 # if SIZEOF_LONG == 4
p[0] = (STRINGLIB_CHAR)(block & 0xFFFFu); p[0] = (STRINGLIB_CHAR)(block & 0xFFFFu);
p[1] = (STRINGLIB_CHAR)(block >> 16); p[1] = (STRINGLIB_CHAR)(block >> 16);

18
Objects/unicodeobject.c
View File

@ -47,14 +47,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <windows.h> #include <windows.h>
#endif #endif
/* Endianness switches; defaults to little endian */
#ifdef WORDS_BIGENDIAN
# define BYTEORDER_IS_BIG_ENDIAN
#else
# define BYTEORDER_IS_LITTLE_ENDIAN
#endif
/* --- Globals ------------------------------------------------------------ /* --- Globals ------------------------------------------------------------
The globals are initialized by the _PyUnicode_Init() API and should The globals are initialized by the _PyUnicode_Init() API and should
@ -4813,7 +4805,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
int bo = 0; /* assume native ordering by default */ int bo = 0; /* assume native ordering by default */
const char *errmsg = ""; const char *errmsg = "";
/* Offsets from q for retrieving bytes in the right order. */ /* Offsets from q for retrieving bytes in the right order. */
#ifdef BYTEORDER_IS_LITTLE_ENDIAN #if PY_LITTLE_ENDIAN
int iorder[] = {0, 1, 2, 3}; int iorder[] = {0, 1, 2, 3};
#else #else
int iorder[] = {3, 2, 1, 0}; int iorder[] = {3, 2, 1, 0};
@ -4835,7 +4827,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
if (size >= 4) { if (size >= 4) {
const Py_UCS4 bom = (q[iorder[3]] << 24) | (q[iorder[2]] << 16) | const Py_UCS4 bom = (q[iorder[3]] << 24) | (q[iorder[2]] << 16) |
(q[iorder[1]] << 8) | q[iorder[0]]; (q[iorder[1]] << 8) | q[iorder[0]];
#ifdef BYTEORDER_IS_LITTLE_ENDIAN #if PY_LITTLE_ENDIAN
if (bom == 0x0000FEFF) { if (bom == 0x0000FEFF) {
q += 4; q += 4;
bo = -1; bo = -1;
@ -4949,7 +4941,7 @@ _PyUnicode_EncodeUTF32(PyObject *str,
unsigned char *p; unsigned char *p;
Py_ssize_t nsize, i; Py_ssize_t nsize, i;
/* Offsets from p for storing byte pairs in the right order. */ /* Offsets from p for storing byte pairs in the right order. */
#ifdef BYTEORDER_IS_LITTLE_ENDIAN #if PY_LITTLE_ENDIAN
int iorder[] = {0, 1, 2, 3}; int iorder[] = {0, 1, 2, 3};
#else #else
int iorder[] = {3, 2, 1, 0}; int iorder[] = {3, 2, 1, 0};
@ -5092,7 +5084,7 @@ PyUnicode_DecodeUTF16Stateful(const char *s,
return unicode_empty; return unicode_empty;
} }
#ifdef BYTEORDER_IS_LITTLE_ENDIAN #if PY_LITTLE_ENDIAN
native_ordering = bo <= 0; native_ordering = bo <= 0;
#else #else
native_ordering = bo >= 0; native_ordering = bo >= 0;
@ -5209,7 +5201,7 @@ _PyUnicode_EncodeUTF16(PyObject *str,
unsigned short *out; unsigned short *out;
Py_ssize_t bytesize; Py_ssize_t bytesize;
Py_ssize_t pairs; Py_ssize_t pairs;
#ifdef WORDS_BIGENDIAN #if PY_BIG_ENDIAN
int native_ordering = byteorder >= 0; int native_ordering = byteorder >= 0;
#else #else
int native_ordering = byteorder <= 0; int native_ordering = byteorder <= 0;

21
Python/sysmodule.c
View File

@ -1561,7 +1561,6 @@ PyObject *
_PySys_Init(void) _PySys_Init(void)
{ {
PyObject *m, *v, *sysdict, *version_info; PyObject *m, *v, *sysdict, *version_info;
char *s;
m = PyModule_Create(&sysmodule); m = PyModule_Create(&sysmodule);
if (m == NULL) if (m == NULL)
@ -1638,20 +1637,14 @@ _PySys_Init(void)
PyLong_FromLong(0x10FFFF)); PyLong_FromLong(0x10FFFF));
SET_SYS_FROM_STRING("builtin_module_names", SET_SYS_FROM_STRING("builtin_module_names",
list_builtin_module_names()); list_builtin_module_names());
{ #if PY_BIG_ENDIAN
/* Assumes that longs are at least 2 bytes long.
Should be safe! */
unsigned long number = 1;
char *value;
s = (char *) &number;
if (s[0] == 0)
value = "big";
else
value = "little";
SET_SYS_FROM_STRING("byteorder", SET_SYS_FROM_STRING("byteorder",
PyUnicode_FromString(value)); PyUnicode_FromString("big"));
} #else
SET_SYS_FROM_STRING("byteorder",
PyUnicode_FromString("little"));
#endif
#ifdef MS_COREDLL #ifdef MS_COREDLL
SET_SYS_FROM_STRING("dllhandle", SET_SYS_FROM_STRING("dllhandle",
PyLong_FromVoidPtr(PyWin_DLLhModule)); PyLong_FromVoidPtr(PyWin_DLLhModule));

2
Tools/unicode/comparecodecs.py
View File

@ -30,7 +30,7 @@ def compare_codecs(encoding1, encoding2):
mismatch += 1 mismatch += 1
# Check decoding # Check decoding
for i in range(256): for i in range(256):
c = chr(i) c = bytes([i])
try: try:
u1 = c.decode(encoding1) u1 = c.decode(encoding1)
except UnicodeError: except UnicodeError: