Skip to content

Commit 1a6387e

Browse files
tirantiran
committed
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray ........ r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line Copied files from py3k w/o modifications ........ r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines Take One * Added initialization code, warnings, flags etc. to the appropriate places * Added new buffer interface to string type * Modified tests * Modified Makefile.pre.in to compile the new files * Added bytesobject.c to Python.h ........ r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines Disabled bytearray.extend for now since it causes an infinite recursion Fixed serveral unit tests ........ r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines Added PyBytes support to several places: str + bytearray ord(bytearray) bytearray(str, encoding) ........ r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line Fixed more unit tests related to type('') is not unicode ........ r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines Fixed more unit tests Fixed bytearray.extend ........ r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line Implemented old buffer interface for bytearray ........ r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line Added backport of the io module ........ r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte ........ r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines Fixed more tests Fixed bytearray() comparsion with unicode() Fixed iterator assignment of bytearray ........ r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines str(bytesarray()) now returns the bytes and not the representation of the bytearray object Enabled and fixed more unit tests ........ r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines Clear error PyNumber_AsSsize_t() fails Use CHARMASK for ob_svall access disabled a test with memoryview again ........ r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line Untested updates to the PCBuild directory ........ r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed. ........ r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines Disabled last failing test I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out. ........ r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line Re-enabled bytes warning code ........ r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass. ........ r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line Re-enabled bytearray subclassing - all tests are passing. ........
1 parent 630b57a commit 1a6387e

28 files changed

+8702
-8
lines changed

‎Include/Python.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
#include "stringobject.h"
9393
/* #include "memoryobject.h" */
9494
#include "bufferobject.h"
95+
#include "bytesobject.h"
9596
#include "tupleobject.h"
9697
#include "listobject.h"
9798
#include "dictobject.h"

‎Include/bytes_methods.h‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
#ifndef Py_BYTES_CTYPE_H
2+
#define Py_BYTES_CTYPE_H
3+
4+
/*
5+
* The internal implementation behind PyString (bytes) and PyBytes (buffer)
6+
* methods of the given names, they operate on ASCII byte strings.
7+
*/
8+
extern PyObject* _Py_bytes_isspace(const char *cptr, Py_ssize_t len);
9+
extern PyObject* _Py_bytes_isalpha(const char *cptr, Py_ssize_t len);
10+
extern PyObject* _Py_bytes_isalnum(const char *cptr, Py_ssize_t len);
11+
extern PyObject* _Py_bytes_isdigit(const char *cptr, Py_ssize_t len);
12+
extern PyObject* _Py_bytes_islower(const char *cptr, Py_ssize_t len);
13+
extern PyObject* _Py_bytes_isupper(const char *cptr, Py_ssize_t len);
14+
extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len);
15+
16+
/* These store their len sized answer in the given preallocated *result arg. */
17+
extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len);
18+
extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len);
19+
extern void _Py_bytes_title(char *result, char *s, Py_ssize_t len);
20+
extern void _Py_bytes_capitalize(char *result, char *s, Py_ssize_t len);
21+
extern void _Py_bytes_swapcase(char *result, char *s, Py_ssize_t len);
22+
23+
/* Shared __doc__ strings. */
24+
extern const char _Py_isspace__doc__[];
25+
extern const char _Py_isalpha__doc__[];
26+
extern const char _Py_isalnum__doc__[];
27+
extern const char _Py_isdigit__doc__[];
28+
extern const char _Py_islower__doc__[];
29+
extern const char _Py_isupper__doc__[];
30+
extern const char _Py_istitle__doc__[];
31+
extern const char _Py_lower__doc__[];
32+
extern const char _Py_upper__doc__[];
33+
extern const char _Py_title__doc__[];
34+
extern const char _Py_capitalize__doc__[];
35+
extern const char _Py_swapcase__doc__[];
36+
37+
#define FLAG_LOWER 0x01
38+
#define FLAG_UPPER 0x02
39+
#define FLAG_ALPHA (FLAG_LOWER|FLAG_UPPER)
40+
#define FLAG_DIGIT 0x04
41+
#define FLAG_ALNUM (FLAG_ALPHA|FLAG_DIGIT)
42+
#define FLAG_SPACE 0x08
43+
#define FLAG_XDIGIT 0x10
44+
45+
extern const unsigned int _Py_ctype_table[256];
46+
47+
#define ISLOWER(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_LOWER)
48+
#define ISUPPER(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_UPPER)
49+
#define ISALPHA(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_ALPHA)
50+
#define ISDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_DIGIT)
51+
#define ISXDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_XDIGIT)
52+
#define ISALNUM(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_ALNUM)
53+
#define ISSPACE(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_SPACE)
54+
55+
#undef islower
56+
#define islower(c) undefined_islower(c)
57+
#undef isupper
58+
#define isupper(c) undefined_isupper(c)
59+
#undef isalpha
60+
#define isalpha(c) undefined_isalpha(c)
61+
#undef isdigit
62+
#define isdigit(c) undefined_isdigit(c)
63+
#undef isxdigit
64+
#define isxdigit(c) undefined_isxdigit(c)
65+
#undef isalnum
66+
#define isalnum(c) undefined_isalnum(c)
67+
#undef isspace
68+
#define isspace(c) undefined_isspace(c)
69+
70+
extern const unsigned char _Py_ctype_tolower[256];
71+
extern const unsigned char _Py_ctype_toupper[256];
72+
73+
#define TOLOWER(c) (_Py_ctype_tolower[Py_CHARMASK(c)])
74+
#define TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)])
75+
76+
#undef tolower
77+
#define tolower(c) undefined_tolower(c)
78+
#undef toupper
79+
#define toupper(c) undefined_toupper(c)
80+
81+
/* this is needed because some docs are shared from the .o, not static */
82+
#define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str)
83+
84+
#endif /* !Py_BYTES_CTYPE_H */

‎Include/bytesobject.h‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/* Bytes object interface */
2+
3+
#ifndef Py_BYTESOBJECT_H
4+
#define Py_BYTESOBJECT_H
5+
#ifdef __cplusplus
6+
extern "C" {
7+
#endif
8+
9+
#include <stdarg.h>
10+
11+
/* Type PyBytesObject represents a mutable array of bytes.
12+
* The Python API is that of a sequence;
13+
* the bytes are mapped to ints in [0, 256).
14+
* Bytes are not characters; they may be used to encode characters.
15+
* The only way to go between bytes and str/unicode is via encoding
16+
* and decoding.
17+
* For the convenience of C programmers, the bytes type is considered
18+
* to contain a char pointer, not an unsigned char pointer.
19+
*/
20+
21+
/* Object layout */
22+
typedef struct {
23+
PyObject_VAR_HEAD
24+
/* XXX(nnorwitz): should ob_exports be Py_ssize_t? */
25+
int ob_exports; /* how many buffer exports */
26+
Py_ssize_t ob_alloc; /* How many bytes allocated */
27+
char *ob_bytes;
28+
} PyBytesObject;
29+
30+
/* Type object */
31+
PyAPI_DATA(PyTypeObject) PyBytes_Type;
32+
PyAPI_DATA(PyTypeObject) PyBytesIter_Type;
33+
34+
/* Type check macros */
35+
#define PyBytes_Check(self) PyObject_TypeCheck(self, &PyBytes_Type)
36+
#define PyBytes_CheckExact(self) (Py_TYPE(self) == &PyBytes_Type)
37+
38+
/* Direct API functions */
39+
PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *);
40+
PyAPI_FUNC(PyObject *) PyBytes_Concat(PyObject *, PyObject *);
41+
PyAPI_FUNC(PyObject *) PyBytes_FromStringAndSize(const char *, Py_ssize_t);
42+
PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *);
43+
PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);
44+
PyAPI_FUNC(int) PyBytes_Resize(PyObject *, Py_ssize_t);
45+
46+
/* Macros, trading safety for speed */
47+
#define PyBytes_AS_STRING(self) (assert(PyBytes_Check(self)),((PyBytesObject *)(self))->ob_bytes)
48+
#define PyBytes_GET_SIZE(self) (assert(PyBytes_Check(self)),Py_SIZE(self))
49+
50+
#ifdef __cplusplus
51+
}
52+
#endif
53+
#endif /* !Py_BYTESOBJECT_H */

‎Include/pydebug.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ PyAPI_DATA(int) Py_InteractiveFlag;
1111
PyAPI_DATA(int) Py_InspectFlag;
1212
PyAPI_DATA(int) Py_OptimizeFlag;
1313
PyAPI_DATA(int) Py_NoSiteFlag;
14+
PyAPI_DATA(int) Py_BytesWarningFlag;
1415
PyAPI_DATA(int) Py_UseClassExceptionsFlag;
1516
PyAPI_DATA(int) Py_FrozenFlag;
1617
PyAPI_DATA(int) Py_TabcheckFlag;

‎Include/pyerrors.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ PyAPI_DATA(PyObject *) PyExc_RuntimeWarning;
175175
PyAPI_DATA(PyObject *) PyExc_FutureWarning;
176176
PyAPI_DATA(PyObject *) PyExc_ImportWarning;
177177
PyAPI_DATA(PyObject *) PyExc_UnicodeWarning;
178+
PyAPI_DATA(PyObject *) PyExc_BytesWarning;
178179

179180

180181
/* Convenience functions */

‎Include/pythonrun.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ PyAPI_FUNC(void) _PyImportHooks_Init(void);
123123
PyAPI_FUNC(int) _PyFrame_Init(void);
124124
PyAPI_FUNC(int) _PyInt_Init(void);
125125
PyAPI_FUNC(void) _PyFloat_Init(void);
126+
PyAPI_FUNC(int) PyBytes_Init(void);
126127

127128
/* Various internal finalizers */
128129
PyAPI_FUNC(void) _PyExc_Fini(void);
@@ -138,6 +139,7 @@ PyAPI_FUNC(void) PyString_Fini(void);
138139
PyAPI_FUNC(void) PyInt_Fini(void);
139140
PyAPI_FUNC(void) PyFloat_Fini(void);
140141
PyAPI_FUNC(void) PyOS_FiniInterrupts(void);
142+
PyAPI_FUNC(void) PyBytes_Fini(void);
141143

142144
/* Stuff with no proper home (yet) */
143145
PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *);

‎Lib/codecs.py‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,18 @@ def reset(self):
181181
Resets the encoder to the initial state.
182182
"""
183183

184+
def getstate(self):
185+
"""
186+
Return the current state of the encoder.
187+
"""
188+
return 0
189+
190+
def setstate(self, state):
191+
"""
192+
Set the current state of the encoder. state must have been
193+
returned by getstate().
194+
"""
195+
184196
class BufferedIncrementalEncoder(IncrementalEncoder):
185197
"""
186198
This subclass of IncrementalEncoder can be used as the baseclass for an
@@ -208,6 +220,12 @@ def reset(self):
208220
IncrementalEncoder.reset(self)
209221
self.buffer = ""
210222

223+
def getstate(self):
224+
return self.buffer or 0
225+
226+
def setstate(self, state):
227+
self.buffer = state or ""
228+
211229
class IncrementalDecoder(object):
212230
"""
213231
An IncrementalDecoder decodes an input in multiple steps. The input can be
@@ -235,6 +253,28 @@ def reset(self):
235253
Resets the decoder to the initial state.
236254
"""
237255

256+
def getstate(self):
257+
"""
258+
Return the current state of the decoder.
259+
260+
This must be a (buffered_input, additional_state_info) tuple.
261+
buffered_input must be a bytes object containing bytes that
262+
were passed to decode() that have not yet been converted.
263+
additional_state_info must be a non-negative integer
264+
representing the state of the decoder WITHOUT yet having
265+
processed the contents of buffered_input. In the initial state
266+
and after reset(), getstate() must return (b"", 0).
267+
"""
268+
return (b"", 0)
269+
270+
def setstate(self, state):
271+
"""
272+
Set the current state of the decoder.
273+
274+
state must have been returned by getstate(). The effect of
275+
setstate((b"", 0)) must be equivalent to reset().
276+
"""
277+
238278
class BufferedIncrementalDecoder(IncrementalDecoder):
239279
"""
240280
This subclass of IncrementalDecoder can be used as the baseclass for an
@@ -262,6 +302,14 @@ def reset(self):
262302
IncrementalDecoder.reset(self)
263303
self.buffer = ""
264304

305+
def getstate(self):
306+
# additional state info is always 0
307+
return (self.buffer, 0)
308+
309+
def setstate(self, state):
310+
# ignore additional state info
311+
self.buffer = state[0]
312+
265313
#
266314
# The StreamWriter and StreamReader class provide generic working
267315
# interfaces which can be used to implement new encoding submodules

0 commit comments

Comments
 (0)