You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

222 lines
8.2 KiB

Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63829 | mark.summerfield | 2008-05-31 15:05:34 +0200 (Sat, 31 May 2008) | 4 lines Added a note to [] that special forms & special chars lose their meaning and backrefs can't be used inside [] ........ r63830 | georg.brandl | 2008-05-31 16:40:09 +0200 (Sat, 31 May 2008) | 2 lines #3010: clarification about stdin/use_rawinput. ........ r63831 | georg.brandl | 2008-05-31 16:45:55 +0200 (Sat, 31 May 2008) | 2 lines #3005: add explaining sentence to easydialogs docs. ........ r63858 | georg.brandl | 2008-06-01 18:41:31 +0200 (Sun, 01 Jun 2008) | 2 lines Add plain text make target. ........ r63865 | georg.brandl | 2008-06-01 21:24:36 +0200 (Sun, 01 Jun 2008) | 2 lines Spaces vs. tabs. ........ r63879 | gregory.p.smith | 2008-06-02 00:57:47 +0200 (Mon, 02 Jun 2008) | 3 lines Make the _H #define's match the header file names. Fix comments to mention the correct type names. ........ r63882 | gregory.p.smith | 2008-06-02 01:48:47 +0200 (Mon, 02 Jun 2008) | 3 lines Adds a Thread.getIdent() method to provide the _get_ident() value for any given threading.Thread object. feature request issue 2871. ........ r63948 | alexandre.vassalotti | 2008-06-04 22:41:44 +0200 (Wed, 04 Jun 2008) | 2 lines Fixed complex.__getnewargs__() to not emit another complex object. ........ r63970 | andrew.kuchling | 2008-06-06 01:33:54 +0200 (Fri, 06 Jun 2008) | 1 line Document 'utc' parameter ........ r63971 | andrew.kuchling | 2008-06-06 01:35:31 +0200 (Fri, 06 Jun 2008) | 1 line Add various items ........ r63972 | andrew.kuchling | 2008-06-06 01:35:48 +0200 (Fri, 06 Jun 2008) | 1 line Grammar fix ........ r63976 | georg.brandl | 2008-06-06 09:34:50 +0200 (Fri, 06 Jun 2008) | 2 lines Markup fix. ........ r63989 | thomas.heller | 2008-06-06 20:42:11 +0200 (Fri, 06 Jun 2008) | 2 lines Add a reminder for the maintainer of whatsnew. ........ r64014 | georg.brandl | 2008-06-07 17:59:10 +0200 (Sat, 07 Jun 2008) | 3 lines Factor out docstring dedenting from inspect.getdoc() into inspect.cleandoc() to ease standalone use of the algorithm. ........ r64015 | georg.brandl | 2008-06-07 18:04:01 +0200 (Sat, 07 Jun 2008) | 2 lines Revert unwanted changes. ........ r64021 | georg.brandl | 2008-06-07 20:16:12 +0200 (Sat, 07 Jun 2008) | 2 lines X-ref to numbers module. ........ r64022 | georg.brandl | 2008-06-07 20:17:37 +0200 (Sat, 07 Jun 2008) | 3 lines Document the "st" API, to avoid confusion with the "new" AST. Add a note about using the new AST module. ........ r64063 | martin.v.loewis | 2008-06-10 07:03:35 +0200 (Tue, 10 Jun 2008) | 2 lines Add Gregor Lingl. ........ r64064 | georg.brandl | 2008-06-10 09:45:28 +0200 (Tue, 10 Jun 2008) | 2 lines Add the "ast" module, containing helpers to ease use of the "_ast" classes. ........ r64065 | raymond.hettinger | 2008-06-10 09:57:15 +0200 (Tue, 10 Jun 2008) | 1 line Add Arnaud for his efforts on multi-arg set operations. ........ r64067 | georg.brandl | 2008-06-10 14:46:39 +0200 (Tue, 10 Jun 2008) | 2 lines #2536: fix itertools.permutations and itertools.combinations docstrings. ........
18 years ago
Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63829 | mark.summerfield | 2008-05-31 15:05:34 +0200 (Sat, 31 May 2008) | 4 lines Added a note to [] that special forms & special chars lose their meaning and backrefs can't be used inside [] ........ r63830 | georg.brandl | 2008-05-31 16:40:09 +0200 (Sat, 31 May 2008) | 2 lines #3010: clarification about stdin/use_rawinput. ........ r63831 | georg.brandl | 2008-05-31 16:45:55 +0200 (Sat, 31 May 2008) | 2 lines #3005: add explaining sentence to easydialogs docs. ........ r63858 | georg.brandl | 2008-06-01 18:41:31 +0200 (Sun, 01 Jun 2008) | 2 lines Add plain text make target. ........ r63865 | georg.brandl | 2008-06-01 21:24:36 +0200 (Sun, 01 Jun 2008) | 2 lines Spaces vs. tabs. ........ r63879 | gregory.p.smith | 2008-06-02 00:57:47 +0200 (Mon, 02 Jun 2008) | 3 lines Make the _H #define's match the header file names. Fix comments to mention the correct type names. ........ r63882 | gregory.p.smith | 2008-06-02 01:48:47 +0200 (Mon, 02 Jun 2008) | 3 lines Adds a Thread.getIdent() method to provide the _get_ident() value for any given threading.Thread object. feature request issue 2871. ........ r63948 | alexandre.vassalotti | 2008-06-04 22:41:44 +0200 (Wed, 04 Jun 2008) | 2 lines Fixed complex.__getnewargs__() to not emit another complex object. ........ r63970 | andrew.kuchling | 2008-06-06 01:33:54 +0200 (Fri, 06 Jun 2008) | 1 line Document 'utc' parameter ........ r63971 | andrew.kuchling | 2008-06-06 01:35:31 +0200 (Fri, 06 Jun 2008) | 1 line Add various items ........ r63972 | andrew.kuchling | 2008-06-06 01:35:48 +0200 (Fri, 06 Jun 2008) | 1 line Grammar fix ........ r63976 | georg.brandl | 2008-06-06 09:34:50 +0200 (Fri, 06 Jun 2008) | 2 lines Markup fix. ........ r63989 | thomas.heller | 2008-06-06 20:42:11 +0200 (Fri, 06 Jun 2008) | 2 lines Add a reminder for the maintainer of whatsnew. ........ r64014 | georg.brandl | 2008-06-07 17:59:10 +0200 (Sat, 07 Jun 2008) | 3 lines Factor out docstring dedenting from inspect.getdoc() into inspect.cleandoc() to ease standalone use of the algorithm. ........ r64015 | georg.brandl | 2008-06-07 18:04:01 +0200 (Sat, 07 Jun 2008) | 2 lines Revert unwanted changes. ........ r64021 | georg.brandl | 2008-06-07 20:16:12 +0200 (Sat, 07 Jun 2008) | 2 lines X-ref to numbers module. ........ r64022 | georg.brandl | 2008-06-07 20:17:37 +0200 (Sat, 07 Jun 2008) | 3 lines Document the "st" API, to avoid confusion with the "new" AST. Add a note about using the new AST module. ........ r64063 | martin.v.loewis | 2008-06-10 07:03:35 +0200 (Tue, 10 Jun 2008) | 2 lines Add Gregor Lingl. ........ r64064 | georg.brandl | 2008-06-10 09:45:28 +0200 (Tue, 10 Jun 2008) | 2 lines Add the "ast" module, containing helpers to ease use of the "_ast" classes. ........ r64065 | raymond.hettinger | 2008-06-10 09:57:15 +0200 (Tue, 10 Jun 2008) | 1 line Add Arnaud for his efforts on multi-arg set operations. ........ r64067 | georg.brandl | 2008-06-10 14:46:39 +0200 (Tue, 10 Jun 2008) | 2 lines #2536: fix itertools.permutations and itertools.combinations docstrings. ........
18 years ago
Merged revisions 63829-63831,63858,63865,63879,63882,63948,63970-63972,63976,63989,64014-64015,64021-64022,64063-64065,64067 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63829 | mark.summerfield | 2008-05-31 15:05:34 +0200 (Sat, 31 May 2008) | 4 lines Added a note to [] that special forms & special chars lose their meaning and backrefs can't be used inside [] ........ r63830 | georg.brandl | 2008-05-31 16:40:09 +0200 (Sat, 31 May 2008) | 2 lines #3010: clarification about stdin/use_rawinput. ........ r63831 | georg.brandl | 2008-05-31 16:45:55 +0200 (Sat, 31 May 2008) | 2 lines #3005: add explaining sentence to easydialogs docs. ........ r63858 | georg.brandl | 2008-06-01 18:41:31 +0200 (Sun, 01 Jun 2008) | 2 lines Add plain text make target. ........ r63865 | georg.brandl | 2008-06-01 21:24:36 +0200 (Sun, 01 Jun 2008) | 2 lines Spaces vs. tabs. ........ r63879 | gregory.p.smith | 2008-06-02 00:57:47 +0200 (Mon, 02 Jun 2008) | 3 lines Make the _H #define's match the header file names. Fix comments to mention the correct type names. ........ r63882 | gregory.p.smith | 2008-06-02 01:48:47 +0200 (Mon, 02 Jun 2008) | 3 lines Adds a Thread.getIdent() method to provide the _get_ident() value for any given threading.Thread object. feature request issue 2871. ........ r63948 | alexandre.vassalotti | 2008-06-04 22:41:44 +0200 (Wed, 04 Jun 2008) | 2 lines Fixed complex.__getnewargs__() to not emit another complex object. ........ r63970 | andrew.kuchling | 2008-06-06 01:33:54 +0200 (Fri, 06 Jun 2008) | 1 line Document 'utc' parameter ........ r63971 | andrew.kuchling | 2008-06-06 01:35:31 +0200 (Fri, 06 Jun 2008) | 1 line Add various items ........ r63972 | andrew.kuchling | 2008-06-06 01:35:48 +0200 (Fri, 06 Jun 2008) | 1 line Grammar fix ........ r63976 | georg.brandl | 2008-06-06 09:34:50 +0200 (Fri, 06 Jun 2008) | 2 lines Markup fix. ........ r63989 | thomas.heller | 2008-06-06 20:42:11 +0200 (Fri, 06 Jun 2008) | 2 lines Add a reminder for the maintainer of whatsnew. ........ r64014 | georg.brandl | 2008-06-07 17:59:10 +0200 (Sat, 07 Jun 2008) | 3 lines Factor out docstring dedenting from inspect.getdoc() into inspect.cleandoc() to ease standalone use of the algorithm. ........ r64015 | georg.brandl | 2008-06-07 18:04:01 +0200 (Sat, 07 Jun 2008) | 2 lines Revert unwanted changes. ........ r64021 | georg.brandl | 2008-06-07 20:16:12 +0200 (Sat, 07 Jun 2008) | 2 lines X-ref to numbers module. ........ r64022 | georg.brandl | 2008-06-07 20:17:37 +0200 (Sat, 07 Jun 2008) | 3 lines Document the "st" API, to avoid confusion with the "new" AST. Add a note about using the new AST module. ........ r64063 | martin.v.loewis | 2008-06-10 07:03:35 +0200 (Tue, 10 Jun 2008) | 2 lines Add Gregor Lingl. ........ r64064 | georg.brandl | 2008-06-10 09:45:28 +0200 (Tue, 10 Jun 2008) | 2 lines Add the "ast" module, containing helpers to ease use of the "_ast" classes. ........ r64065 | raymond.hettinger | 2008-06-10 09:57:15 +0200 (Tue, 10 Jun 2008) | 1 line Add Arnaud for his efforts on multi-arg set operations. ........ r64067 | georg.brandl | 2008-06-10 14:46:39 +0200 (Tue, 10 Jun 2008) | 2 lines #2536: fix itertools.permutations and itertools.combinations docstrings. ........
18 years ago
  1. /* Bytes (String) object interface */
  2. #ifndef Py_BYTESOBJECT_H
  3. #define Py_BYTESOBJECT_H
  4. #ifdef __cplusplus
  5. extern "C" {
  6. #endif
  7. #include <stdarg.h>
  8. /*
  9. Type PyBytesObject represents a character string. An extra zero byte is
  10. reserved at the end to ensure it is zero-terminated, but a size is
  11. present so strings with null bytes in them can be represented. This
  12. is an immutable object type.
  13. There are functions to create new string objects, to test
  14. an object for string-ness, and to get the
  15. string value. The latter function returns a null pointer
  16. if the object is not of the proper type.
  17. There is a variant that takes an explicit size as well as a
  18. variant that assumes a zero-terminated string. Note that none of the
  19. functions should be applied to nil objects.
  20. */
  21. /* Caching the hash (ob_shash) saves recalculation of a string's hash value.
  22. This significantly speeds up dict lookups. */
  23. #ifndef Py_LIMITED_API
  24. typedef struct {
  25. PyObject_VAR_HEAD
  26. Py_hash_t ob_shash;
  27. char ob_sval[1];
  28. /* Invariants:
  29. * ob_sval contains space for 'ob_size+1' elements.
  30. * ob_sval[ob_size] == 0.
  31. * ob_shash is the hash of the string or -1 if not computed yet.
  32. */
  33. } PyBytesObject;
  34. #endif
  35. PyAPI_DATA(PyTypeObject) PyBytes_Type;
  36. PyAPI_DATA(PyTypeObject) PyBytesIter_Type;
  37. #define PyBytes_Check(op) \
  38. PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_BYTES_SUBCLASS)
  39. #define PyBytes_CheckExact(op) (Py_TYPE(op) == &PyBytes_Type)
  40. PyAPI_FUNC(PyObject *) PyBytes_FromStringAndSize(const char *, Py_ssize_t);
  41. PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *);
  42. PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *);
  43. PyAPI_FUNC(PyObject *) PyBytes_FromFormatV(const char*, va_list)
  44. Py_GCC_ATTRIBUTE((format(printf, 1, 0)));
  45. PyAPI_FUNC(PyObject *) PyBytes_FromFormat(const char*, ...)
  46. Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
  47. PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *);
  48. PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);
  49. PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int);
  50. PyAPI_FUNC(void) PyBytes_Concat(PyObject **, PyObject *);
  51. PyAPI_FUNC(void) PyBytes_ConcatAndDel(PyObject **, PyObject *);
  52. #ifndef Py_LIMITED_API
  53. PyAPI_FUNC(int) _PyBytes_Resize(PyObject **, Py_ssize_t);
  54. PyAPI_FUNC(PyObject*) _PyBytes_FormatEx(
  55. const char *format,
  56. Py_ssize_t format_len,
  57. PyObject *args,
  58. int use_bytearray);
  59. PyAPI_FUNC(PyObject*) _PyBytes_FromHex(
  60. PyObject *string,
  61. int use_bytearray);
  62. #endif
  63. PyAPI_FUNC(PyObject *) PyBytes_DecodeEscape(const char *, Py_ssize_t,
  64. const char *, Py_ssize_t,
  65. const char *);
  66. #ifndef Py_LIMITED_API
  67. /* Helper for PyBytes_DecodeEscape that detects invalid escape chars. */
  68. PyAPI_FUNC(PyObject *) _PyBytes_DecodeEscape(const char *, Py_ssize_t,
  69. const char *, const char **);
  70. #endif
  71. /* Macro, trading safety for speed */
  72. #ifndef Py_LIMITED_API
  73. #define PyBytes_AS_STRING(op) (assert(PyBytes_Check(op)), \
  74. (((PyBytesObject *)(op))->ob_sval))
  75. #define PyBytes_GET_SIZE(op) (assert(PyBytes_Check(op)),Py_SIZE(op))
  76. #endif
  77. /* _PyBytes_Join(sep, x) is like sep.join(x). sep must be PyBytesObject*,
  78. x must be an iterable object. */
  79. #ifndef Py_LIMITED_API
  80. PyAPI_FUNC(PyObject *) _PyBytes_Join(PyObject *sep, PyObject *x);
  81. #endif
  82. /* Provides access to the internal data buffer and size of a string
  83. object or the default encoded version of a Unicode object. Passing
  84. NULL as *len parameter will force the string buffer to be
  85. 0-terminated (passing a string with embedded NULL characters will
  86. cause an exception). */
  87. PyAPI_FUNC(int) PyBytes_AsStringAndSize(
  88. PyObject *obj, /* string or Unicode object */
  89. char **s, /* pointer to buffer variable */
  90. Py_ssize_t *len /* pointer to length variable or NULL
  91. (only possible for 0-terminated
  92. strings) */
  93. );
  94. /* Using the current locale, insert the thousands grouping
  95. into the string pointed to by buffer. For the argument descriptions,
  96. see Objects/stringlib/localeutil.h */
  97. #ifndef Py_LIMITED_API
  98. PyAPI_FUNC(Py_ssize_t) _PyBytes_InsertThousandsGroupingLocale(char *buffer,
  99. Py_ssize_t n_buffer,
  100. char *digits,
  101. Py_ssize_t n_digits,
  102. Py_ssize_t min_width);
  103. /* Using explicit passed-in values, insert the thousands grouping
  104. into the string pointed to by buffer. For the argument descriptions,
  105. see Objects/stringlib/localeutil.h */
  106. PyAPI_FUNC(Py_ssize_t) _PyBytes_InsertThousandsGrouping(char *buffer,
  107. Py_ssize_t n_buffer,
  108. char *digits,
  109. Py_ssize_t n_digits,
  110. Py_ssize_t min_width,
  111. const char *grouping,
  112. const char *thousands_sep);
  113. #endif
  114. /* Flags used by string formatting */
  115. #define F_LJUST (1<<0)
  116. #define F_SIGN (1<<1)
  117. #define F_BLANK (1<<2)
  118. #define F_ALT (1<<3)
  119. #define F_ZERO (1<<4)
  120. #ifndef Py_LIMITED_API
  121. /* The _PyBytesWriter structure is big: it contains an embedded "stack buffer".
  122. A _PyBytesWriter variable must be declared at the end of variables in a
  123. function to optimize the memory allocation on the stack. */
  124. typedef struct {
  125. /* bytes, bytearray or NULL (when the small buffer is used) */
  126. PyObject *buffer;
  127. /* Number of allocated size. */
  128. Py_ssize_t allocated;
  129. /* Minimum number of allocated bytes,
  130. incremented by _PyBytesWriter_Prepare() */
  131. Py_ssize_t min_size;
  132. /* If non-zero, use a bytearray instead of a bytes object for buffer. */
  133. int use_bytearray;
  134. /* If non-zero, overallocate the buffer (default: 0).
  135. This flag must be zero if use_bytearray is non-zero. */
  136. int overallocate;
  137. /* Stack buffer */
  138. int use_small_buffer;
  139. char small_buffer[512];
  140. } _PyBytesWriter;
  141. /* Initialize a bytes writer
  142. By default, the overallocation is disabled. Set the overallocate attribute
  143. to control the allocation of the buffer. */
  144. PyAPI_FUNC(void) _PyBytesWriter_Init(_PyBytesWriter *writer);
  145. /* Get the buffer content and reset the writer.
  146. Return a bytes object, or a bytearray object if use_bytearray is non-zero.
  147. Raise an exception and return NULL on error. */
  148. PyAPI_FUNC(PyObject *) _PyBytesWriter_Finish(_PyBytesWriter *writer,
  149. void *str);
  150. /* Deallocate memory of a writer (clear its internal buffer). */
  151. PyAPI_FUNC(void) _PyBytesWriter_Dealloc(_PyBytesWriter *writer);
  152. /* Allocate the buffer to write size bytes.
  153. Return the pointer to the beginning of buffer data.
  154. Raise an exception and return NULL on error. */
  155. PyAPI_FUNC(void*) _PyBytesWriter_Alloc(_PyBytesWriter *writer,
  156. Py_ssize_t size);
  157. /* Ensure that the buffer is large enough to write *size* bytes.
  158. Add size to the writer minimum size (min_size attribute).
  159. str is the current pointer inside the buffer.
  160. Return the updated current pointer inside the buffer.
  161. Raise an exception and return NULL on error. */
  162. PyAPI_FUNC(void*) _PyBytesWriter_Prepare(_PyBytesWriter *writer,
  163. void *str,
  164. Py_ssize_t size);
  165. /* Resize the buffer to make it larger.
  166. The new buffer may be larger than size bytes because of overallocation.
  167. Return the updated current pointer inside the buffer.
  168. Raise an exception and return NULL on error.
  169. Note: size must be greater than the number of allocated bytes in the writer.
  170. This function doesn't use the writer minimum size (min_size attribute).
  171. See also _PyBytesWriter_Prepare().
  172. */
  173. PyAPI_FUNC(void*) _PyBytesWriter_Resize(_PyBytesWriter *writer,
  174. void *str,
  175. Py_ssize_t size);
  176. /* Write bytes.
  177. Raise an exception and return NULL on error. */
  178. PyAPI_FUNC(void*) _PyBytesWriter_WriteBytes(_PyBytesWriter *writer,
  179. void *str,
  180. const void *bytes,
  181. Py_ssize_t size);
  182. #endif /* Py_LIMITED_API */
  183. #ifdef __cplusplus
  184. }
  185. #endif
  186. #endif /* !Py_BYTESOBJECT_H */