diff options
| author | Eric Smith <eric@trueblade.com> | 2009-11-30 01:01:42 +0000 |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2009-11-30 01:01:42 +0000 |
| commit | 0f78bff646c60cb3f39f3e908f5c7f10ad63f1f2 (patch) | |
| tree | 90200f967879d7a2e466b0a2b7ab9b4336cbbdce /Objects | |
| parent | 7d0bddde5caca7abf41aa3d8763bc99ad8aa8798 (diff) | |
| download | cpython-git-0f78bff646c60cb3f39f3e908f5c7f10ad63f1f2.tar.gz | |
Issue #5748: bytesobject.c should not have its own private defines for stringlib macros. Also removed unused defines and include for localutil.h.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/bytesobject.c | 18 | ||||
| -rw-r--r-- | Objects/stringlib/stringdefs.h | 1 | ||||
| -rw-r--r-- | Objects/stringlib/unicodedefs.h | 1 |
3 files changed, 4 insertions, 16 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 27d4f95f06..41eee40d55 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -563,29 +563,15 @@ PyBytes_AsStringAndSize(register PyObject *obj, /* Methods */ #include "stringlib/stringdefs.h" -#define STRINGLIB_CHAR char - -#define STRINGLIB_CMP memcmp -#define STRINGLIB_LEN PyBytes_GET_SIZE -#define STRINGLIB_NEW PyBytes_FromStringAndSize -#define STRINGLIB_STR PyBytes_AS_STRING -/* #define STRINGLIB_WANT_CONTAINS_OBJ 1 */ - -#define STRINGLIB_EMPTY nullstring -#define STRINGLIB_CHECK_EXACT PyBytes_CheckExact -#define STRINGLIB_MUTABLE 0 #include "stringlib/fastsearch.h" - #include "stringlib/count.h" #include "stringlib/find.h" #include "stringlib/partition.h" #include "stringlib/ctype.h" -#include "stringlib/transmogrify.h" -#define _Py_InsertThousandsGrouping _PyBytes_InsertThousandsGrouping -#define _Py_InsertThousandsGroupingLocale _PyBytes_InsertThousandsGroupingLocale -#include "stringlib/localeutil.h" +#define STRINGLIB_MUTABLE 0 +#include "stringlib/transmogrify.h" PyObject * PyBytes_Repr(PyObject *obj, int smartquotes) diff --git a/Objects/stringlib/stringdefs.h b/Objects/stringlib/stringdefs.h index a5672c7e6b..f85357fb0f 100644 --- a/Objects/stringlib/stringdefs.h +++ b/Objects/stringlib/stringdefs.h @@ -21,6 +21,7 @@ #define STRINGLIB_NEW PyBytes_FromStringAndSize #define STRINGLIB_RESIZE _PyBytes_Resize #define STRINGLIB_CHECK PyBytes_Check +#define STRINGLIB_CHECK_EXACT PyBytes_CheckExact #define STRINGLIB_CMP memcmp #define STRINGLIB_TOSTR PyObject_Str #define STRINGLIB_GROUPING _PyBytes_InsertThousandsGrouping diff --git a/Objects/stringlib/unicodedefs.h b/Objects/stringlib/unicodedefs.h index 366acfe001..c23c392e56 100644 --- a/Objects/stringlib/unicodedefs.h +++ b/Objects/stringlib/unicodedefs.h @@ -21,6 +21,7 @@ #define STRINGLIB_NEW PyUnicode_FromUnicode #define STRINGLIB_RESIZE PyUnicode_Resize #define STRINGLIB_CHECK PyUnicode_Check +#define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact #define STRINGLIB_GROUPING _PyUnicode_InsertThousandsGrouping #define STRINGLIB_GROUPING_LOCALE _PyUnicode_InsertThousandsGroupingLocale |