mirror of
https://github.com/python/cpython.git
synced 2025-11-28 14:11:15 +00:00
which unfortunately means the errors from the bytes type change somewhat: bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a TypeError (either that, or bytes(1.0) also raises a ValueError -- PyNumber_AsSsize_t() can only raise one type of exception.) Merged revisions 51188-51433 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines Retrieval of previous shell command was not always preserving indentation since 1.2a1) Patch 1528468 Tal Einat. ........ r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. SF bug #1112549. ........ r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines News item for SF bug 1112549. ........ r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines Fix title -- it's rc1, not beta3. ........ r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines Update dangling references to the 3.2 database to mention that this is UCD 4.1 now. ........ r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines Followup to bug #1069160. PyThreadState_SetAsyncExc(): internal correctness changes wrt refcount safety and deadlock avoidance. Also added a basic test case (relying on ctypes) and repaired the docs. ........ r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines Whitespace normalization. ........ r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines Whitespace normalization broke test_cgi, because a line of quoted test data relied on preserving a single trailing blank. Changed the string from raw to regular, and forced in the trailing blank via an explicit \x20 escape. ........ r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines test_PyThreadState_SetAsyncExc(): This is failing on some 64-bit boxes. I have no idea what the ctypes docs mean by "integers", and blind-guessing here that it intended to mean the signed C "int" type, in which case perhaps I can repair this by feeding the thread id argument to type ctypes.c_long(). Also made the worker thread daemonic, so it doesn't hang Python shutdown if the test continues to fail. ........ r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines force_test_exit(): This has been completely ineffective at stopping test_signal from hanging forever on the Tru64 buildbot. That could be because there's no such thing as signal.SIGALARM. Changed to the idiotic (but standard) signal.SIGALRM instead, and added some more debug output. ........ r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines Fix the failures on cygwin (2006-08-10 fixed the actual locking issue). The first hunk changes the colon to an ! like other Windows variants. We need to always wait on the child so the lock gets released and no other tests fail. This is the try/finally in the second hunk. ........ r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines Add Chris McDonough (latest cgi.py patch) ........ r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines logging's atexit hook now runs even if the rest of the module has already been cleaned up. ........ r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines Add ignore of *.pyc and *.pyo to Lib/xml/etree/. ........ r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines When a ctypes C callback function is called, zero out the result storage before converting the result to C data. See the comment in the code for details. Provide a better context for errors when the conversion of a callback function's result cannot be converted. ........ r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines Klocwork made another run and found a bunch more problems. This is the first batch of fixes that should be easy to verify based on context. This fixes problem numbers: 220 (ast), 323-324 (symtable), 321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree). ........ r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines Even though _Py_Mangle() isn't truly public anyone can call it and there was no verification that privateobj was a PyString. If it wasn't a string, this could have allowed a NULL pointer to creep in below and crash. I wonder if this should be PyString_CheckExact? Must identifiers be strings or can they be subclasses? Klocwork #275 ........ r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines It's highly unlikely, though possible for PyEval_Get*() to return NULLs. So be safe and do an XINCREF. Klocwork # 221-222. ........ r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines This code is actually not used unless WITHOUT_COMPLEX is defined. However, there was no error checking that PyFloat_FromDouble returned a valid pointer. I believe this change is correct as it seemed to follow other code in the area. Klocwork # 292. ........ r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines Handle NULL nodes while parsing. I'm not entirely sure this is correct. There might be something else that needs to be done to setup the error. Klocwork #295. ........ r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines If _stat_float_times is false, we will try to INCREF ival which could be NULL. Return early in that case. The caller checks for PyErr_Occurred so this should be ok. Klocwork #297 ........ r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines Move the assert which checks for a NULL pointer first. Klocwork #274. ........ r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines Try to handle a malloc failure. I'm not entirely sure this is correct. There might be something else we need to do to handle the exception. Klocwork # 212-213 ........ r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines I'm not sure why this code allocates this string for the error message. I think it would be better to always use snprintf and have the format limit the size of the name appropriately (like %.200s). Klocwork #340 ........ r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines Check returned pointer is valid. Klocwork #233 ........ r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed ........ r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines Don't deref v if it's NULL. Klocwork #214 ........ r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines Check return of PyMem_MALLOC (garbage) is non-NULL. Check seq in both portions of if/else. Klocwork #289-290. ........ r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines PyModule_GetDict() can fail, produce fatal errors if this happens on startup. Klocwork #298-299. ........ r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines Verify verdat which is returned from malloc is not NULL. Ensure we don't pass NULL to free. Klocwork #306 (at least the first part, checking malloc) ........ r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines test_signal: Signal handling on the Tru64 buildbot appears to be utterly insane. Plug some theoretical insecurities in the test script: - Verify that the SIGALRM handler was actually installed. - Don't call alarm() before the handler is installed. - Move everything that can fail inside the try/finally, so the test cleans up after itself more often. - Try sending all the expected signals in force_test_exit(), not just SIGALRM. Since that was fixed to actually send SIGALRM (instead of invisibly dying with an AttributeError), we've seen that sending SIGALRM alone does not stop this from hanging. - Move the "kill the child" business into the finally clause, so the child doesn't survive test failure to send SIGALRM to other tests later (there are also baffling SIGALRM-related failures in test_socket). - Cancel the alarm in the finally clause -- if the test dies early, we again don't want SIGALRM showing up to confuse a later test. Alas, this still relies on timing luck wrt the spawned script that sends the test signals, but it's hard to see how waiting for seconds can so often be so unlucky. test_threadedsignals: curiously, this test never fails on Tru64, but doesn't normally signal SIGALRM. Anyway, fixed an obvious (but probably inconsequential) logic error. ........ r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines Ah, fudge. One of the prints here actually "shouldn't be" protected by "if verbose:", which caused the test to fail on all non-Windows boxes. Note that I deliberately didn't convert this to unittest yet, because I expect it would be even harder to debug this on Tru64 after conversion. ........ r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines Repair logging test spew caused by rev. 51206. ........ r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines Patch #1538606, Patch to fix __index__() clipping. I modified this patch some by fixing style, some error checking, and adding XXX comments. This patch requires review and some changes are to be expected. I'm checking in now to get the greatest possible review and establish a baseline for moving forward. I don't want this to hold up release if possible. ........ r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots were failing due to inappropriate clipping of numbers larger than 2**31 with new-style classes. (typeobject.c) In reviewing the code for classic classes, there were 2 problems. Any negative value return could be returned. Always return -1 if there was an error. Also make the checks similar with the new-style classes. I believe this is correct for 32 and 64 bit boxes, including Windows64. Add a test of classic classes too. ........ r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line SF bug #1539336, distutils example code missing ........ r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines Move/copy assert for tstate != NULL before first use. Verify that PyEval_Get{Globals,Locals} returned valid pointers. Klocwork 231-232 ........ r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines Handle a whole lot of failures from PyString_FromInternedString(). Should fix most of Klocwork 234-272. ........ r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines cpathname could be NULL if it was longer than MAXPATHLEN. Don't try to write the .pyc to NULL. Check results of PyList_GetItem() and PyModule_GetDict() are not NULL. Klocwork 282, 283, 285 ........ r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines Fix segfault when doing string formatting on subclasses of long if __oct__, __hex__ don't return a string. Klocwork 308 ........ r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines Check return result of PyModule_GetDict(). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines Handle malloc and fopen failures more gracefully. Klocwork 180-181 ........ r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines It's very unlikely, though possible that source is not a string. Verify that PyString_AsString() returns a valid pointer. (The problem can arise when zlib.decompress doesn't return a string.) Klocwork 346 ........ r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines Handle failures from lookup. Klocwork 341-342 ........ r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines Handle failure from PyModule_GetDict() (Klocwork 208). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines Really address the issue of where to place the assert for leftblock. (Followup of Klocwork 274) ........ r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines Handle malloc failure. Klocwork 281 ........ r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines Handle alloca failures. Klocwork 225-228 ........ r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line Get rid of compiler warning ........ r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line Ignore pgen.exe and kill_python.exe for cygwin ........ r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines Can't return NULL from a void function. If there is a memory error, about the best we can do is call PyErr_WriteUnraisable and go on. We won't be able to do the call below either, so verify delstr is valid. ........ r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line Update purify doc some. ........ r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines Remove unused, buggy test function. Fixes klockwork issue #207. ........ r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value from new_CArgObject(). Fixes klockwork issues #183, #184, #185. ........ r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value of GenericCData_new(). Fixes klockwork issues #188, #189. ........ r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines Revert the change that tries to zero out a closure's result storage area because the size if unknown in source/callproc.c. ........ r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines Slightly revised version of patch #1538956: Replace UnicodeDecodeErrors raised during == and != compares of Unicode and other objects with a new UnicodeWarning. All other comparisons continue to raise exceptions. Exceptions other than UnicodeDecodeErrors are also left untouched. ........ r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines Apply the patch #1532975 plus ideas from the patch #1533481. ctypes instances no longer have the internal and undocumented '_as_parameter_' attribute which was used to adapt them to foreign function calls; this mechanism is replaced by a function pointer in the type's stgdict. In the 'from_param' class methods, try the _as_parameter_ attribute if other conversions are not possible. This makes the documented _as_parameter_ mechanism work as intended. Change the ctypes version number to 1.0.1. ........ r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines Readd NEWS items that were accidentally removed by r51276. ........ r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines Improve markup in PyUnicode_RichCompare. ........ r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines Correct an accidentally removed previous patch. ........ r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536908: Add support for AMD64 / OpenBSD. Remove the -no-stack-protector compiler flag for OpenBSD as it has been reported to be unneeded. ........ r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line News item for rev 51281. ........ r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines Fix refleak introduced in rev. 51248. ........ r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines Make tabnanny recognize IndentationErrors raised by tokenize. Add a test to test_inspect to make sure indented source is recognized correctly. (fixes #1224621) ........ r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions. ........ r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines Add an additional test: BZ2File write methods should raise IOError when file is read-only. ........ r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536071: trace.py should now find the full module name of a file correctly even on Windows. ........ r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines Cookie.py shouldn't "bogusly" use string._idmap. ........ r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines Patch #1511317: don't crash on invalid hostname info ........ r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines Whitespace normalization. ........ r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries. Now we're even. :-) ........ r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines Fix the test for SocketServer so it should pass on cygwin and not fail sporadically on other platforms. This is really a band-aid that doesn't fix the underlying issue in SocketServer. It's not clear if it's worth it to fix SocketServer, however, I opened a bug to track it: http://python.org/sf/1540386 ........ r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines Update the docstring to use a version a little newer than 1999. This was taken from a Debian patch. Should we update the version for each release? ........ r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines Subclasses of int/long are allowed to define an __index__. ........ r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line Check for NULL return value from new_CArgObject calls. ........ r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines The 'with' statement is now a Code Context block opener ........ r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 ........ r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 - no, really this time ........ r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines Patch #1540892: site.py Quitter() class attempts to close sys.stdin before raising SystemExit, allowing IDLE to honor quit() and exit(). M Lib/site.py M Lib/idlelib/PyShell.py M Lib/idlelib/CREDITS.txt M Lib/idlelib/NEWS.txt M Misc/NEWS ........ r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines Update code and tests to support the 'bytes_le' attribute (for little-endian byte order on Windows), and to work around clocks with low resolution yielding duplicate UUIDs. Anthony Baxter has approved this change. ........ r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines Get quit() and exit() to work cleanly when not using subprocess. ........ r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines Revert to having static version numbers again. ........ r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines Build _hashlib on Windows. Build OpenSSL with masm assembler code. Fixes #1535502. ........ r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines Add commented assert statements to check that the result of PyObject_stgdict() and PyType_stgdict() calls are non-NULL before dereferencing the result. Hopefully this fixes what klocwork is complaining about. Fix a few other nits as well. ........ r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line news entry for 51307 ........ r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line Add UnicodeWarning ........ r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line Bump document version to 1.0; remove pystone paragraph ........ r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line Link to docs; remove an XXX comment ........ r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line Make cl build step compile-only (/c). Remove libs from source list. ........ r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines The __repr__ method of a NULL py_object does no longer raise an exception. Remove a stray '?' character from the exception text when the value is retrieved of such an object. Includes tests. ........ r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line Update bug/patch counts ........ r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line Wording/typo fixes ........ r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines Remove the special casing of Py_None when converting the return value of the Python part of a callback function to C. If it cannot be converted, call PyErr_WriteUnraisable with the exception we got. Before, arbitrary data has been passed to the calling C code in this case. (I'm not really sure the NEWS entry is understandable, but I cannot find better words) ........ r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines Add NEWS item mentioning the reverted distutils version number patch. ........ r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines SF#1534630 ignore data that arrives before the opening start tag ........ r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line Grammar fix ........ r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines Tutorial: Clarify somewhat how parameters are passed to functions (especially explain what integer means). Correct the table - Python integers and longs can both be used. Further clarification to the table comparing ctypes types, Python types, and C types. Reference: Replace integer by C ``int`` where it makes sense. ........ r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines File menu hotkeys: there were three 'p' assignments. Reassign the 'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the Shell menu hotkey from 's' to 'l'. M Bindings.py M PyShell.py M NEWS.txt ........ r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines Fix a bug in the ``compiler`` package that caused invalid code to be generated for generator expressions. ........ r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines Merge 51340 and 51341 from 2.5 branch: Leave tk build directory to restore original path. Invoke debug mk1mf.pl after running Configure. ........ r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines Bug #1541863: uuid.uuid1 failed to generate unique identifiers on systems with low clock resolution. ........ r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line Add template for 2.6 on HEAD ........ r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line More post-release wibble ........ r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again ........ r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again. Take 2 ........ r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Unix bots install working again. ........ r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line Set version to 2.6a0, seems more consistent. ........ r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line More version wibble ........ r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines Bug #1541682: Fix example in the "Refcount details" API docs. Additionally, remove a faulty example showing PySequence_SetItem applied to a newly created list object and add notes that this isn't a good idea. ........ r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines Updating IDLE's version number to match Python's (as per python-dev discussion). ........ r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line RPM specfile updates ........ r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines Typo in tp_clear docs. ........ r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line Minor edits ........ r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines Add asserts to check for 'impossible' NULL values, with comments. In one place where I'n not 1000% sure about the non-NULL, raise a RuntimeError for safety. This should fix the klocwork issues that Neal sent me. If so, it should be applied to the release25-maint branch also. ........ r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 ........ r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 ........ r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro ........ r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines Move initialization to after the asserts for non-NULL values. Klocwork 286-287. (I'm not backporting this, but if someone wants to, feel free.) ........ r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines Handle PyString_FromInternedString() failing (unlikely, but possible). Klocwork #325 (I'm not backporting this, but if someone wants to, feel free.) ........ r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines Patch #1542948: fix urllib2 header casing issue. With new test. ........ r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines Move peephole optimizer to separate file. ........ r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines Move peephole optimizer to separate file. (Forgot .h in previous checkin.) ........ r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines Fix bug #1543303, tarfile adds padding that breaks gunzip. Patch # 1543897. Will backport to 2.5 ........ r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines Add assert to make Klocwork happy (#276) ........
1265 lines
44 KiB
C
1265 lines
44 KiB
C
#ifndef Py_UNICODEOBJECT_H
|
|
#define Py_UNICODEOBJECT_H
|
|
|
|
/*
|
|
|
|
Unicode implementation based on original code by Fredrik Lundh,
|
|
modified by Marc-Andre Lemburg (mal@lemburg.com) according to the
|
|
Unicode Integration Proposal (see file Misc/unicode.txt).
|
|
|
|
Copyright (c) Corporation for National Research Initiatives.
|
|
|
|
|
|
Original header:
|
|
--------------------------------------------------------------------
|
|
|
|
* Yet another Unicode string type for Python. This type supports the
|
|
* 16-bit Basic Multilingual Plane (BMP) only.
|
|
*
|
|
* Written by Fredrik Lundh, January 1999.
|
|
*
|
|
* Copyright (c) 1999 by Secret Labs AB.
|
|
* Copyright (c) 1999 by Fredrik Lundh.
|
|
*
|
|
* fredrik@pythonware.com
|
|
* http://www.pythonware.com
|
|
*
|
|
* --------------------------------------------------------------------
|
|
* This Unicode String Type is
|
|
*
|
|
* Copyright (c) 1999 by Secret Labs AB
|
|
* Copyright (c) 1999 by Fredrik Lundh
|
|
*
|
|
* By obtaining, using, and/or copying this software and/or its
|
|
* associated documentation, you agree that you have read, understood,
|
|
* and will comply with the following terms and conditions:
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software and its
|
|
* associated documentation for any purpose and without fee is hereby
|
|
* granted, provided that the above copyright notice appears in all
|
|
* copies, and that both that copyright notice and this permission notice
|
|
* appear in supporting documentation, and that the name of Secret Labs
|
|
* AB or the author not be used in advertising or publicity pertaining to
|
|
* distribution of the software without specific, written prior
|
|
* permission.
|
|
*
|
|
* SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
|
|
* THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
* FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
|
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
* -------------------------------------------------------------------- */
|
|
|
|
#include <ctype.h>
|
|
|
|
/* === Internal API ======================================================= */
|
|
|
|
/* --- Internal Unicode Format -------------------------------------------- */
|
|
|
|
#ifndef Py_USING_UNICODE
|
|
|
|
#define PyUnicode_Check(op) 0
|
|
#define PyUnicode_CheckExact(op) 0
|
|
|
|
#else
|
|
|
|
/* FIXME: MvL's new implementation assumes that Py_UNICODE_SIZE is
|
|
properly set, but the default rules below doesn't set it. I'll
|
|
sort this out some other day -- fredrik@pythonware.com */
|
|
|
|
#ifndef Py_UNICODE_SIZE
|
|
#error Must define Py_UNICODE_SIZE
|
|
#endif
|
|
|
|
/* Setting Py_UNICODE_WIDE enables UCS-4 storage. Otherwise, Unicode
|
|
strings are stored as UCS-2 (with limited support for UTF-16) */
|
|
|
|
#if Py_UNICODE_SIZE >= 4
|
|
#define Py_UNICODE_WIDE
|
|
#endif
|
|
|
|
/* Set these flags if the platform has "wchar.h", "wctype.h" and the
|
|
wchar_t type is a 16-bit unsigned type */
|
|
/* #define HAVE_WCHAR_H */
|
|
/* #define HAVE_USABLE_WCHAR_T */
|
|
|
|
/* Defaults for various platforms */
|
|
#ifndef PY_UNICODE_TYPE
|
|
|
|
/* Windows has a usable wchar_t type (unless we're using UCS-4) */
|
|
# if defined(MS_WIN32) && Py_UNICODE_SIZE == 2
|
|
# define HAVE_USABLE_WCHAR_T
|
|
# define PY_UNICODE_TYPE wchar_t
|
|
# endif
|
|
|
|
# if defined(Py_UNICODE_WIDE)
|
|
# define PY_UNICODE_TYPE Py_UCS4
|
|
# endif
|
|
|
|
#endif
|
|
|
|
/* If the compiler provides a wchar_t type we try to support it
|
|
through the interface functions PyUnicode_FromWideChar() and
|
|
PyUnicode_AsWideChar(). */
|
|
|
|
#ifdef HAVE_USABLE_WCHAR_T
|
|
# ifndef HAVE_WCHAR_H
|
|
# define HAVE_WCHAR_H
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef HAVE_WCHAR_H
|
|
/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */
|
|
# ifdef _HAVE_BSDI
|
|
# include <time.h>
|
|
# endif
|
|
# include <wchar.h>
|
|
#endif
|
|
|
|
/*
|
|
* Use this typedef when you need to represent a UTF-16 surrogate pair
|
|
* as single unsigned integer.
|
|
*/
|
|
#if SIZEOF_INT >= 4
|
|
typedef unsigned int Py_UCS4;
|
|
#elif SIZEOF_LONG >= 4
|
|
typedef unsigned long Py_UCS4;
|
|
#endif
|
|
|
|
typedef PY_UNICODE_TYPE Py_UNICODE;
|
|
|
|
/* --- UCS-2/UCS-4 Name Mangling ------------------------------------------ */
|
|
|
|
/* Unicode API names are mangled to assure that UCS-2 and UCS-4 builds
|
|
produce different external names and thus cause import errors in
|
|
case Python interpreters and extensions with mixed compiled in
|
|
Unicode width assumptions are combined. */
|
|
|
|
#ifndef Py_UNICODE_WIDE
|
|
|
|
# define PyUnicode_AsASCIIString PyUnicodeUCS2_AsASCIIString
|
|
# define PyUnicode_AsCharmapString PyUnicodeUCS2_AsCharmapString
|
|
# define PyUnicode_AsEncodedObject PyUnicodeUCS2_AsEncodedObject
|
|
# define PyUnicode_AsEncodedString PyUnicodeUCS2_AsEncodedString
|
|
# define PyUnicode_AsLatin1String PyUnicodeUCS2_AsLatin1String
|
|
# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS2_AsRawUnicodeEscapeString
|
|
# define PyUnicode_AsUTF16String PyUnicodeUCS2_AsUTF16String
|
|
# define PyUnicode_AsUTF8String PyUnicodeUCS2_AsUTF8String
|
|
# define PyUnicode_AsUnicode PyUnicodeUCS2_AsUnicode
|
|
# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS2_AsUnicodeEscapeString
|
|
# define PyUnicode_AsWideChar PyUnicodeUCS2_AsWideChar
|
|
# define PyUnicode_Compare PyUnicodeUCS2_Compare
|
|
# define PyUnicode_Concat PyUnicodeUCS2_Concat
|
|
# define PyUnicode_Contains PyUnicodeUCS2_Contains
|
|
# define PyUnicode_Count PyUnicodeUCS2_Count
|
|
# define PyUnicode_Decode PyUnicodeUCS2_Decode
|
|
# define PyUnicode_DecodeASCII PyUnicodeUCS2_DecodeASCII
|
|
# define PyUnicode_DecodeCharmap PyUnicodeUCS2_DecodeCharmap
|
|
# define PyUnicode_DecodeLatin1 PyUnicodeUCS2_DecodeLatin1
|
|
# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS2_DecodeRawUnicodeEscape
|
|
# define PyUnicode_DecodeUTF16 PyUnicodeUCS2_DecodeUTF16
|
|
# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS2_DecodeUTF16Stateful
|
|
# define PyUnicode_DecodeUTF8 PyUnicodeUCS2_DecodeUTF8
|
|
# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS2_DecodeUTF8Stateful
|
|
# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS2_DecodeUnicodeEscape
|
|
# define PyUnicode_Encode PyUnicodeUCS2_Encode
|
|
# define PyUnicode_EncodeASCII PyUnicodeUCS2_EncodeASCII
|
|
# define PyUnicode_EncodeCharmap PyUnicodeUCS2_EncodeCharmap
|
|
# define PyUnicode_EncodeDecimal PyUnicodeUCS2_EncodeDecimal
|
|
# define PyUnicode_EncodeLatin1 PyUnicodeUCS2_EncodeLatin1
|
|
# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS2_EncodeRawUnicodeEscape
|
|
# define PyUnicode_EncodeUTF16 PyUnicodeUCS2_EncodeUTF16
|
|
# define PyUnicode_EncodeUTF8 PyUnicodeUCS2_EncodeUTF8
|
|
# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS2_EncodeUnicodeEscape
|
|
# define PyUnicode_Find PyUnicodeUCS2_Find
|
|
# define PyUnicode_Format PyUnicodeUCS2_Format
|
|
# define PyUnicode_FromEncodedObject PyUnicodeUCS2_FromEncodedObject
|
|
# define PyUnicode_FromObject PyUnicodeUCS2_FromObject
|
|
# define PyUnicode_FromOrdinal PyUnicodeUCS2_FromOrdinal
|
|
# define PyUnicode_FromUnicode PyUnicodeUCS2_FromUnicode
|
|
# define PyUnicode_FromWideChar PyUnicodeUCS2_FromWideChar
|
|
# define PyUnicode_GetDefaultEncoding PyUnicodeUCS2_GetDefaultEncoding
|
|
# define PyUnicode_GetMax PyUnicodeUCS2_GetMax
|
|
# define PyUnicode_GetSize PyUnicodeUCS2_GetSize
|
|
# define PyUnicode_Join PyUnicodeUCS2_Join
|
|
# define PyUnicode_Partition PyUnicodeUCS2_Partition
|
|
# define PyUnicode_RPartition PyUnicodeUCS2_RPartition
|
|
# define PyUnicode_RSplit PyUnicodeUCS2_RSplit
|
|
# define PyUnicode_Replace PyUnicodeUCS2_Replace
|
|
# define PyUnicode_Resize PyUnicodeUCS2_Resize
|
|
# define PyUnicode_RichCompare PyUnicodeUCS2_RichCompare
|
|
# define PyUnicode_SetDefaultEncoding PyUnicodeUCS2_SetDefaultEncoding
|
|
# define PyUnicode_Split PyUnicodeUCS2_Split
|
|
# define PyUnicode_Splitlines PyUnicodeUCS2_Splitlines
|
|
# define PyUnicode_Tailmatch PyUnicodeUCS2_Tailmatch
|
|
# define PyUnicode_Translate PyUnicodeUCS2_Translate
|
|
# define PyUnicode_TranslateCharmap PyUnicodeUCS2_TranslateCharmap
|
|
# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS2_AsDefaultEncodedString
|
|
# define _PyUnicode_Fini _PyUnicodeUCS2_Fini
|
|
# define _PyUnicode_Init _PyUnicodeUCS2_Init
|
|
# define _PyUnicode_IsAlpha _PyUnicodeUCS2_IsAlpha
|
|
# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS2_IsDecimalDigit
|
|
# define _PyUnicode_IsDigit _PyUnicodeUCS2_IsDigit
|
|
# define _PyUnicode_IsLinebreak _PyUnicodeUCS2_IsLinebreak
|
|
# define _PyUnicode_IsLowercase _PyUnicodeUCS2_IsLowercase
|
|
# define _PyUnicode_IsNumeric _PyUnicodeUCS2_IsNumeric
|
|
# define _PyUnicode_IsTitlecase _PyUnicodeUCS2_IsTitlecase
|
|
# define _PyUnicode_IsUppercase _PyUnicodeUCS2_IsUppercase
|
|
# define _PyUnicode_IsWhitespace _PyUnicodeUCS2_IsWhitespace
|
|
# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS2_ToDecimalDigit
|
|
# define _PyUnicode_ToDigit _PyUnicodeUCS2_ToDigit
|
|
# define _PyUnicode_ToLowercase _PyUnicodeUCS2_ToLowercase
|
|
# define _PyUnicode_ToNumeric _PyUnicodeUCS2_ToNumeric
|
|
# define _PyUnicode_ToTitlecase _PyUnicodeUCS2_ToTitlecase
|
|
# define _PyUnicode_ToUppercase _PyUnicodeUCS2_ToUppercase
|
|
|
|
#else
|
|
|
|
# define PyUnicode_AsASCIIString PyUnicodeUCS4_AsASCIIString
|
|
# define PyUnicode_AsCharmapString PyUnicodeUCS4_AsCharmapString
|
|
# define PyUnicode_AsEncodedObject PyUnicodeUCS4_AsEncodedObject
|
|
# define PyUnicode_AsEncodedString PyUnicodeUCS4_AsEncodedString
|
|
# define PyUnicode_AsLatin1String PyUnicodeUCS4_AsLatin1String
|
|
# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS4_AsRawUnicodeEscapeString
|
|
# define PyUnicode_AsUTF16String PyUnicodeUCS4_AsUTF16String
|
|
# define PyUnicode_AsUTF8String PyUnicodeUCS4_AsUTF8String
|
|
# define PyUnicode_AsUnicode PyUnicodeUCS4_AsUnicode
|
|
# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS4_AsUnicodeEscapeString
|
|
# define PyUnicode_AsWideChar PyUnicodeUCS4_AsWideChar
|
|
# define PyUnicode_Compare PyUnicodeUCS4_Compare
|
|
# define PyUnicode_Concat PyUnicodeUCS4_Concat
|
|
# define PyUnicode_Contains PyUnicodeUCS4_Contains
|
|
# define PyUnicode_Count PyUnicodeUCS4_Count
|
|
# define PyUnicode_Decode PyUnicodeUCS4_Decode
|
|
# define PyUnicode_DecodeASCII PyUnicodeUCS4_DecodeASCII
|
|
# define PyUnicode_DecodeCharmap PyUnicodeUCS4_DecodeCharmap
|
|
# define PyUnicode_DecodeLatin1 PyUnicodeUCS4_DecodeLatin1
|
|
# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS4_DecodeRawUnicodeEscape
|
|
# define PyUnicode_DecodeUTF16 PyUnicodeUCS4_DecodeUTF16
|
|
# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS4_DecodeUTF16Stateful
|
|
# define PyUnicode_DecodeUTF8 PyUnicodeUCS4_DecodeUTF8
|
|
# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS4_DecodeUTF8Stateful
|
|
# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS4_DecodeUnicodeEscape
|
|
# define PyUnicode_Encode PyUnicodeUCS4_Encode
|
|
# define PyUnicode_EncodeASCII PyUnicodeUCS4_EncodeASCII
|
|
# define PyUnicode_EncodeCharmap PyUnicodeUCS4_EncodeCharmap
|
|
# define PyUnicode_EncodeDecimal PyUnicodeUCS4_EncodeDecimal
|
|
# define PyUnicode_EncodeLatin1 PyUnicodeUCS4_EncodeLatin1
|
|
# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS4_EncodeRawUnicodeEscape
|
|
# define PyUnicode_EncodeUTF16 PyUnicodeUCS4_EncodeUTF16
|
|
# define PyUnicode_EncodeUTF8 PyUnicodeUCS4_EncodeUTF8
|
|
# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS4_EncodeUnicodeEscape
|
|
# define PyUnicode_Find PyUnicodeUCS4_Find
|
|
# define PyUnicode_Format PyUnicodeUCS4_Format
|
|
# define PyUnicode_FromEncodedObject PyUnicodeUCS4_FromEncodedObject
|
|
# define PyUnicode_FromObject PyUnicodeUCS4_FromObject
|
|
# define PyUnicode_FromOrdinal PyUnicodeUCS4_FromOrdinal
|
|
# define PyUnicode_FromUnicode PyUnicodeUCS4_FromUnicode
|
|
# define PyUnicode_FromWideChar PyUnicodeUCS4_FromWideChar
|
|
# define PyUnicode_GetDefaultEncoding PyUnicodeUCS4_GetDefaultEncoding
|
|
# define PyUnicode_GetMax PyUnicodeUCS4_GetMax
|
|
# define PyUnicode_GetSize PyUnicodeUCS4_GetSize
|
|
# define PyUnicode_Join PyUnicodeUCS4_Join
|
|
# define PyUnicode_Partition PyUnicodeUCS4_Partition
|
|
# define PyUnicode_RPartition PyUnicodeUCS4_RPartition
|
|
# define PyUnicode_RSplit PyUnicodeUCS4_RSplit
|
|
# define PyUnicode_Replace PyUnicodeUCS4_Replace
|
|
# define PyUnicode_Resize PyUnicodeUCS4_Resize
|
|
# define PyUnicode_RichCompare PyUnicodeUCS4_RichCompare
|
|
# define PyUnicode_SetDefaultEncoding PyUnicodeUCS4_SetDefaultEncoding
|
|
# define PyUnicode_Split PyUnicodeUCS4_Split
|
|
# define PyUnicode_Splitlines PyUnicodeUCS4_Splitlines
|
|
# define PyUnicode_Tailmatch PyUnicodeUCS4_Tailmatch
|
|
# define PyUnicode_Translate PyUnicodeUCS4_Translate
|
|
# define PyUnicode_TranslateCharmap PyUnicodeUCS4_TranslateCharmap
|
|
# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS4_AsDefaultEncodedString
|
|
# define _PyUnicode_Fini _PyUnicodeUCS4_Fini
|
|
# define _PyUnicode_Init _PyUnicodeUCS4_Init
|
|
# define _PyUnicode_IsAlpha _PyUnicodeUCS4_IsAlpha
|
|
# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS4_IsDecimalDigit
|
|
# define _PyUnicode_IsDigit _PyUnicodeUCS4_IsDigit
|
|
# define _PyUnicode_IsLinebreak _PyUnicodeUCS4_IsLinebreak
|
|
# define _PyUnicode_IsLowercase _PyUnicodeUCS4_IsLowercase
|
|
# define _PyUnicode_IsNumeric _PyUnicodeUCS4_IsNumeric
|
|
# define _PyUnicode_IsTitlecase _PyUnicodeUCS4_IsTitlecase
|
|
# define _PyUnicode_IsUppercase _PyUnicodeUCS4_IsUppercase
|
|
# define _PyUnicode_IsWhitespace _PyUnicodeUCS4_IsWhitespace
|
|
# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS4_ToDecimalDigit
|
|
# define _PyUnicode_ToDigit _PyUnicodeUCS4_ToDigit
|
|
# define _PyUnicode_ToLowercase _PyUnicodeUCS4_ToLowercase
|
|
# define _PyUnicode_ToNumeric _PyUnicodeUCS4_ToNumeric
|
|
# define _PyUnicode_ToTitlecase _PyUnicodeUCS4_ToTitlecase
|
|
# define _PyUnicode_ToUppercase _PyUnicodeUCS4_ToUppercase
|
|
|
|
|
|
#endif
|
|
|
|
/* --- Internal Unicode Operations ---------------------------------------- */
|
|
|
|
/* If you want Python to use the compiler's wctype.h functions instead
|
|
of the ones supplied with Python, define WANT_WCTYPE_FUNCTIONS or
|
|
configure Python using --with-wctype-functions. This reduces the
|
|
interpreter's code size. */
|
|
|
|
#if defined(HAVE_USABLE_WCHAR_T) && defined(WANT_WCTYPE_FUNCTIONS)
|
|
|
|
#include <wctype.h>
|
|
|
|
#define Py_UNICODE_ISSPACE(ch) iswspace(ch)
|
|
|
|
#define Py_UNICODE_ISLOWER(ch) iswlower(ch)
|
|
#define Py_UNICODE_ISUPPER(ch) iswupper(ch)
|
|
#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch)
|
|
#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch)
|
|
|
|
#define Py_UNICODE_TOLOWER(ch) towlower(ch)
|
|
#define Py_UNICODE_TOUPPER(ch) towupper(ch)
|
|
#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch)
|
|
|
|
#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch)
|
|
#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch)
|
|
#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch)
|
|
|
|
#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch)
|
|
#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
|
|
#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
|
|
|
|
#define Py_UNICODE_ISALPHA(ch) iswalpha(ch)
|
|
|
|
#else
|
|
|
|
#define Py_UNICODE_ISSPACE(ch) _PyUnicode_IsWhitespace(ch)
|
|
|
|
#define Py_UNICODE_ISLOWER(ch) _PyUnicode_IsLowercase(ch)
|
|
#define Py_UNICODE_ISUPPER(ch) _PyUnicode_IsUppercase(ch)
|
|
#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch)
|
|
#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch)
|
|
|
|
#define Py_UNICODE_TOLOWER(ch) _PyUnicode_ToLowercase(ch)
|
|
#define Py_UNICODE_TOUPPER(ch) _PyUnicode_ToUppercase(ch)
|
|
#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch)
|
|
|
|
#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch)
|
|
#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch)
|
|
#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch)
|
|
|
|
#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch)
|
|
#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
|
|
#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
|
|
|
|
#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch)
|
|
|
|
#endif
|
|
|
|
#define Py_UNICODE_ISALNUM(ch) \
|
|
(Py_UNICODE_ISALPHA(ch) || \
|
|
Py_UNICODE_ISDECIMAL(ch) || \
|
|
Py_UNICODE_ISDIGIT(ch) || \
|
|
Py_UNICODE_ISNUMERIC(ch))
|
|
|
|
#define Py_UNICODE_COPY(target, source, length) \
|
|
Py_MEMCPY((target), (source), (length)*sizeof(Py_UNICODE))
|
|
|
|
#define Py_UNICODE_FILL(target, value, length) do\
|
|
{Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\
|
|
for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\
|
|
} while (0)
|
|
|
|
/* check if substring matches at given offset. the offset must be
|
|
valid, and the substring must not be empty */
|
|
#define Py_UNICODE_MATCH(string, offset, substring) \
|
|
((*((string)->str + (offset)) == *((substring)->str)) && \
|
|
((*((string)->str + (offset) + (substring)->length-1) == *((substring)->str + (substring)->length-1))) && \
|
|
!memcmp((string)->str + (offset), (substring)->str, (substring)->length*sizeof(Py_UNICODE)))
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* --- Unicode Type ------------------------------------------------------- */
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
Py_ssize_t length; /* Length of raw Unicode data in buffer */
|
|
Py_UNICODE *str; /* Raw Unicode buffer */
|
|
long hash; /* Hash value; -1 if not set */
|
|
PyObject *defenc; /* (Default) Encoded version as Python
|
|
string, or NULL; this is used for
|
|
implementing the buffer protocol */
|
|
} PyUnicodeObject;
|
|
|
|
PyAPI_DATA(PyTypeObject) PyUnicode_Type;
|
|
|
|
#define PyUnicode_Check(op) PyObject_TypeCheck(op, &PyUnicode_Type)
|
|
#define PyUnicode_CheckExact(op) ((op)->ob_type == &PyUnicode_Type)
|
|
|
|
/* Fast access macros */
|
|
#define PyUnicode_GET_SIZE(op) \
|
|
(((PyUnicodeObject *)(op))->length)
|
|
#define PyUnicode_GET_DATA_SIZE(op) \
|
|
(((PyUnicodeObject *)(op))->length * sizeof(Py_UNICODE))
|
|
#define PyUnicode_AS_UNICODE(op) \
|
|
(((PyUnicodeObject *)(op))->str)
|
|
#define PyUnicode_AS_DATA(op) \
|
|
((const char *)((PyUnicodeObject *)(op))->str)
|
|
|
|
/* --- Constants ---------------------------------------------------------- */
|
|
|
|
/* This Unicode character will be used as replacement character during
|
|
decoding if the errors argument is set to "replace". Note: the
|
|
Unicode character U+FFFD is the official REPLACEMENT CHARACTER in
|
|
Unicode 3.0. */
|
|
|
|
#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UNICODE) 0xFFFD)
|
|
|
|
/* === Public API ========================================================= */
|
|
|
|
/* --- Plain Py_UNICODE --------------------------------------------------- */
|
|
|
|
/* Create a Unicode Object from the Py_UNICODE buffer u of the given
|
|
size.
|
|
|
|
u may be NULL which causes the contents to be undefined. It is the
|
|
user's responsibility to fill in the needed data afterwards. Note
|
|
that modifying the Unicode object contents after construction is
|
|
only allowed if u was set to NULL.
|
|
|
|
The buffer is copied into the new object. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode(
|
|
const Py_UNICODE *u, /* Unicode buffer */
|
|
Py_ssize_t size /* size of buffer */
|
|
);
|
|
|
|
/* Return a read-only pointer to the Unicode object's internal
|
|
Py_UNICODE buffer. */
|
|
|
|
PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode(
|
|
PyObject *unicode /* Unicode object */
|
|
);
|
|
|
|
/* Get the length of the Unicode object. */
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize(
|
|
PyObject *unicode /* Unicode object */
|
|
);
|
|
|
|
/* Get the maximum ordinal for a Unicode character. */
|
|
PyAPI_FUNC(Py_UNICODE) PyUnicode_GetMax(void);
|
|
|
|
/* Resize an already allocated Unicode object to the new size length.
|
|
|
|
*unicode is modified to point to the new (resized) object and 0
|
|
returned on success.
|
|
|
|
This API may only be called by the function which also called the
|
|
Unicode constructor. The refcount on the object must be 1. Otherwise,
|
|
an error is returned.
|
|
|
|
Error handling is implemented as follows: an exception is set, -1
|
|
is returned and *unicode left untouched.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyUnicode_Resize(
|
|
PyObject **unicode, /* Pointer to the Unicode object */
|
|
Py_ssize_t length /* New length */
|
|
);
|
|
|
|
/* Coerce obj to an Unicode object and return a reference with
|
|
*incremented* refcount.
|
|
|
|
Coercion is done in the following way:
|
|
|
|
1. String and other char buffer compatible objects are decoded
|
|
under the assumptions that they contain data using the current
|
|
default encoding. Decoding is done in "strict" mode.
|
|
|
|
2. All other objects (including Unicode objects) raise an
|
|
exception.
|
|
|
|
The API returns NULL in case of an error. The caller is responsible
|
|
for decref'ing the returned objects.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject(
|
|
register PyObject *obj, /* Object */
|
|
const char *encoding, /* encoding */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* Coerce obj to an Unicode object and return a reference with
|
|
*incremented* refcount.
|
|
|
|
Unicode objects are passed back as-is (subclasses are converted to
|
|
true Unicode objects), all other objects are delegated to
|
|
PyUnicode_FromEncodedObject(obj, NULL, "strict") which results in
|
|
using the default encoding as basis for decoding the object.
|
|
|
|
The API returns NULL in case of an error. The caller is responsible
|
|
for decref'ing the returned objects.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_FromObject(
|
|
register PyObject *obj /* Object */
|
|
);
|
|
|
|
/* --- wchar_t support for platforms which support it --------------------- */
|
|
|
|
#ifdef HAVE_WCHAR_H
|
|
|
|
/* Create a Unicode Object from the whcar_t buffer w of the given
|
|
size.
|
|
|
|
The buffer is copied into the new object. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar(
|
|
register const wchar_t *w, /* wchar_t buffer */
|
|
Py_ssize_t size /* size of buffer */
|
|
);
|
|
|
|
/* Copies the Unicode Object contents into the wchar_t buffer w. At
|
|
most size wchar_t characters are copied.
|
|
|
|
Note that the resulting wchar_t string may or may not be
|
|
0-terminated. It is the responsibility of the caller to make sure
|
|
that the wchar_t string is 0-terminated in case this is required by
|
|
the application.
|
|
|
|
Returns the number of wchar_t characters copied (excluding a
|
|
possibly trailing 0-termination character) or -1 in case of an
|
|
error. */
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar(
|
|
PyUnicodeObject *unicode, /* Unicode object */
|
|
register wchar_t *w, /* wchar_t buffer */
|
|
Py_ssize_t size /* size of buffer */
|
|
);
|
|
|
|
#endif
|
|
|
|
/* --- Unicode ordinals --------------------------------------------------- */
|
|
|
|
/* Create a Unicode Object from the given Unicode code point ordinal.
|
|
|
|
The ordinal must be in range(0x10000) on narrow Python builds
|
|
(UCS2), and range(0x110000) on wide builds (UCS4). A ValueError is
|
|
raised in case it is not.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal);
|
|
|
|
/* === Builtin Codecs =====================================================
|
|
|
|
Many of these APIs take two arguments encoding and errors. These
|
|
parameters encoding and errors have the same semantics as the ones
|
|
of the builtin unicode() API.
|
|
|
|
Setting encoding to NULL causes the default encoding to be used.
|
|
|
|
Error handling is set by errors which may also be set to NULL
|
|
meaning to use the default handling defined for the codec. Default
|
|
error handling for all builtin codecs is "strict" (ValueErrors are
|
|
raised).
|
|
|
|
The codecs all use a similar interface. Only deviation from the
|
|
generic ones are documented.
|
|
|
|
*/
|
|
|
|
/* --- Manage the default encoding ---------------------------------------- */
|
|
|
|
/* Return a Python string holding the default encoded value of the
|
|
Unicode object.
|
|
|
|
The resulting string is cached in the Unicode object for subsequent
|
|
usage by this function. The cached version is needed to implement
|
|
the character buffer interface and will live (at least) as long as
|
|
the Unicode object itself.
|
|
|
|
The refcount of the string is *not* incremented.
|
|
|
|
*** Exported for internal use by the interpreter only !!! ***
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) _PyUnicode_AsDefaultEncodedString(
|
|
PyObject *, const char *);
|
|
|
|
/* Returns the currently active default encoding.
|
|
|
|
The default encoding is currently implemented as run-time settable
|
|
process global. This may change in future versions of the
|
|
interpreter to become a parameter which is managed on a per-thread
|
|
basis.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void);
|
|
|
|
/* Sets the currently active default encoding.
|
|
|
|
Returns 0 on success, -1 in case of an error.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyUnicode_SetDefaultEncoding(
|
|
const char *encoding /* Encoding name in standard form */
|
|
);
|
|
|
|
/* --- Generic Codecs ----------------------------------------------------- */
|
|
|
|
/* Create a Unicode object by decoding the encoded string s of the
|
|
given size. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_Decode(
|
|
const char *s, /* encoded string */
|
|
Py_ssize_t size, /* size of buffer */
|
|
const char *encoding, /* encoding */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* Encodes a Py_UNICODE buffer of the given size and returns a
|
|
Python string object. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_Encode(
|
|
const Py_UNICODE *s, /* Unicode char buffer */
|
|
Py_ssize_t size, /* number of Py_UNICODE chars to encode */
|
|
const char *encoding, /* encoding */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* Encodes a Unicode object and returns the result as Python
|
|
object. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject(
|
|
PyObject *unicode, /* Unicode object */
|
|
const char *encoding, /* encoding */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* Encodes a Unicode object and returns the result as Python string
|
|
object. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString(
|
|
PyObject *unicode, /* Unicode object */
|
|
const char *encoding, /* encoding */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap(
|
|
PyObject* string /* 256 character map */
|
|
);
|
|
|
|
|
|
/* --- UTF-7 Codecs ------------------------------------------------------- */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7(
|
|
const char *string, /* UTF-7 encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length, /* number of Py_UNICODE chars to encode */
|
|
int encodeSetO, /* force the encoder to encode characters in
|
|
Set O, as described in RFC2152 */
|
|
int encodeWhiteSpace, /* force the encoder to encode space, tab,
|
|
carriage return and linefeed characters */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* --- UTF-8 Codecs ------------------------------------------------------- */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8(
|
|
const char *string, /* UTF-8 encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful(
|
|
const char *string, /* UTF-8 encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors, /* error handling */
|
|
Py_ssize_t *consumed /* bytes consumed */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String(
|
|
PyObject *unicode /* Unicode object */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length, /* number of Py_UNICODE chars to encode */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* --- UTF-16 Codecs ------------------------------------------------------ */
|
|
|
|
/* Decodes length bytes from a UTF-16 encoded buffer string and returns
|
|
the corresponding Unicode object.
|
|
|
|
errors (if non-NULL) defines the error handling. It defaults
|
|
to "strict".
|
|
|
|
If byteorder is non-NULL, the decoder starts decoding using the
|
|
given byte order:
|
|
|
|
*byteorder == -1: little endian
|
|
*byteorder == 0: native order
|
|
*byteorder == 1: big endian
|
|
|
|
In native mode, the first two bytes of the stream are checked for a
|
|
BOM mark. If found, the BOM mark is analysed, the byte order
|
|
adjusted and the BOM skipped. In the other modes, no BOM mark
|
|
interpretation is done. After completion, *byteorder is set to the
|
|
current byte order at the end of input data.
|
|
|
|
If byteorder is NULL, the codec starts in native order mode.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16(
|
|
const char *string, /* UTF-16 encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors, /* error handling */
|
|
int *byteorder /* pointer to byteorder to use
|
|
0=native;-1=LE,1=BE; updated on
|
|
exit */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful(
|
|
const char *string, /* UTF-16 encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors, /* error handling */
|
|
int *byteorder, /* pointer to byteorder to use
|
|
0=native;-1=LE,1=BE; updated on
|
|
exit */
|
|
Py_ssize_t *consumed /* bytes consumed */
|
|
);
|
|
|
|
/* Returns a Python string using the UTF-16 encoding in native byte
|
|
order. The string always starts with a BOM mark. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String(
|
|
PyObject *unicode /* Unicode object */
|
|
);
|
|
|
|
/* Returns a Python string object holding the UTF-16 encoded value of
|
|
the Unicode data.
|
|
|
|
If byteorder is not 0, output is written according to the following
|
|
byte order:
|
|
|
|
byteorder == -1: little endian
|
|
byteorder == 0: native byte order (writes a BOM mark)
|
|
byteorder == 1: big endian
|
|
|
|
If byteorder is 0, the output string will always start with the
|
|
Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is
|
|
prepended.
|
|
|
|
Note that Py_UNICODE data is being interpreted as UTF-16 reduced to
|
|
UCS-2. This trick makes it possible to add full UTF-16 capabilities
|
|
at a later point without compromising the APIs.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length, /* number of Py_UNICODE chars to encode */
|
|
const char *errors, /* error handling */
|
|
int byteorder /* byteorder to use 0=BOM+native;-1=LE,1=BE */
|
|
);
|
|
|
|
/* --- Unicode-Escape Codecs ---------------------------------------------- */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape(
|
|
const char *string, /* Unicode-Escape encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString(
|
|
PyObject *unicode /* Unicode object */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length /* Number of Py_UNICODE chars to encode */
|
|
);
|
|
|
|
/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape(
|
|
const char *string, /* Raw-Unicode-Escape encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString(
|
|
PyObject *unicode /* Unicode object */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length /* Number of Py_UNICODE chars to encode */
|
|
);
|
|
|
|
/* --- Unicode Internal Codec ---------------------------------------------
|
|
|
|
Only for internal use in _codecsmodule.c */
|
|
|
|
PyObject *_PyUnicode_DecodeUnicodeInternal(
|
|
const char *string,
|
|
Py_ssize_t length,
|
|
const char *errors
|
|
);
|
|
|
|
/* --- Latin-1 Codecs -----------------------------------------------------
|
|
|
|
Note: Latin-1 corresponds to the first 256 Unicode ordinals.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1(
|
|
const char *string, /* Latin-1 encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String(
|
|
PyObject *unicode /* Unicode object */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length, /* Number of Py_UNICODE chars to encode */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* --- ASCII Codecs -------------------------------------------------------
|
|
|
|
Only 7-bit ASCII data is excepted. All other codes generate errors.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII(
|
|
const char *string, /* ASCII encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString(
|
|
PyObject *unicode /* Unicode object */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length, /* Number of Py_UNICODE chars to encode */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* --- Character Map Codecs -----------------------------------------------
|
|
|
|
This codec uses mappings to encode and decode characters.
|
|
|
|
Decoding mappings must map single string characters to single
|
|
Unicode characters, integers (which are then interpreted as Unicode
|
|
ordinals) or None (meaning "undefined mapping" and causing an
|
|
error).
|
|
|
|
Encoding mappings must map single Unicode characters to single
|
|
string characters, integers (which are then interpreted as Latin-1
|
|
ordinals) or None (meaning "undefined mapping" and causing an
|
|
error).
|
|
|
|
If a character lookup fails with a LookupError, the character is
|
|
copied as-is meaning that its ordinal value will be interpreted as
|
|
Unicode or Latin-1 ordinal resp. Because of this mappings only need
|
|
to contain those mappings which map characters to different code
|
|
points.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap(
|
|
const char *string, /* Encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
PyObject *mapping, /* character mapping
|
|
(char ordinal -> unicode ordinal) */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString(
|
|
PyObject *unicode, /* Unicode object */
|
|
PyObject *mapping /* character mapping
|
|
(unicode ordinal -> char ordinal) */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length, /* Number of Py_UNICODE chars to encode */
|
|
PyObject *mapping, /* character mapping
|
|
(unicode ordinal -> char ordinal) */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* Translate a Py_UNICODE buffer of the given length by applying a
|
|
character mapping table to it and return the resulting Unicode
|
|
object.
|
|
|
|
The mapping table must map Unicode ordinal integers to Unicode
|
|
ordinal integers or None (causing deletion of the character).
|
|
|
|
Mapping tables may be dictionaries or sequences. Unmapped character
|
|
ordinals (ones which cause a LookupError) are left untouched and
|
|
are copied as-is.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length, /* Number of Py_UNICODE chars to encode */
|
|
PyObject *table, /* Translate table */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
#ifdef MS_WIN32
|
|
|
|
/* --- MBCS codecs for Windows -------------------------------------------- */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS(
|
|
const char *string, /* MBCS encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful(
|
|
const char *string, /* MBCS encoded string */
|
|
Py_ssize_t length, /* size of string */
|
|
const char *errors, /* error handling */
|
|
Py_ssize_t *consumed /* bytes consumed */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString(
|
|
PyObject *unicode /* Unicode object */
|
|
);
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS(
|
|
const Py_UNICODE *data, /* Unicode char buffer */
|
|
Py_ssize_t length, /* Number of Py_UNICODE chars to encode */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
#endif /* MS_WIN32 */
|
|
|
|
/* --- Decimal Encoder ---------------------------------------------------- */
|
|
|
|
/* Takes a Unicode string holding a decimal value and writes it into
|
|
an output buffer using standard ASCII digit codes.
|
|
|
|
The output buffer has to provide at least length+1 bytes of storage
|
|
area. The output string is 0-terminated.
|
|
|
|
The encoder converts whitespace to ' ', decimal characters to their
|
|
corresponding ASCII digit and all other Latin-1 characters except
|
|
\0 as-is. Characters outside this range (Unicode ordinals 1-256)
|
|
are treated as errors. This includes embedded NULL bytes.
|
|
|
|
Error handling is defined by the errors argument:
|
|
|
|
NULL or "strict": raise a ValueError
|
|
"ignore": ignore the wrong characters (these are not copied to the
|
|
output buffer)
|
|
"replace": replaces illegal characters with '?'
|
|
|
|
Returns 0 on success, -1 on failure.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyUnicode_EncodeDecimal(
|
|
Py_UNICODE *s, /* Unicode buffer */
|
|
Py_ssize_t length, /* Number of Py_UNICODE chars to encode */
|
|
char *output, /* Output buffer; must have size >= length */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* --- Methods & Slots ----------------------------------------------------
|
|
|
|
These are capable of handling Unicode objects and strings on input
|
|
(we refer to them as strings in the descriptions) and return
|
|
Unicode objects or integers as apporpriate. */
|
|
|
|
/* Concat two strings giving a new Unicode string. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_Concat(
|
|
PyObject *left, /* Left string */
|
|
PyObject *right /* Right string */
|
|
);
|
|
|
|
/* Split a string giving a list of Unicode strings.
|
|
|
|
If sep is NULL, splitting will be done at all whitespace
|
|
substrings. Otherwise, splits occur at the given separator.
|
|
|
|
At most maxsplit splits will be done. If negative, no limit is set.
|
|
|
|
Separators are not included in the resulting list.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_Split(
|
|
PyObject *s, /* String to split */
|
|
PyObject *sep, /* String separator */
|
|
Py_ssize_t maxsplit /* Maxsplit count */
|
|
);
|
|
|
|
/* Dito, but split at line breaks.
|
|
|
|
CRLF is considered to be one line break. Line breaks are not
|
|
included in the resulting list. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_Splitlines(
|
|
PyObject *s, /* String to split */
|
|
int keepends /* If true, line end markers are included */
|
|
);
|
|
|
|
/* Partition a string using a given separator. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_Partition(
|
|
PyObject *s, /* String to partition */
|
|
PyObject *sep /* String separator */
|
|
);
|
|
|
|
/* Partition a string using a given separator, searching from the end of the
|
|
string. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_RPartition(
|
|
PyObject *s, /* String to partition */
|
|
PyObject *sep /* String separator */
|
|
);
|
|
|
|
/* Split a string giving a list of Unicode strings.
|
|
|
|
If sep is NULL, splitting will be done at all whitespace
|
|
substrings. Otherwise, splits occur at the given separator.
|
|
|
|
At most maxsplit splits will be done. But unlike PyUnicode_Split
|
|
PyUnicode_RSplit splits from the end of the string. If negative,
|
|
no limit is set.
|
|
|
|
Separators are not included in the resulting list.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_RSplit(
|
|
PyObject *s, /* String to split */
|
|
PyObject *sep, /* String separator */
|
|
Py_ssize_t maxsplit /* Maxsplit count */
|
|
);
|
|
|
|
/* Translate a string by applying a character mapping table to it and
|
|
return the resulting Unicode object.
|
|
|
|
The mapping table must map Unicode ordinal integers to Unicode
|
|
ordinal integers or None (causing deletion of the character).
|
|
|
|
Mapping tables may be dictionaries or sequences. Unmapped character
|
|
ordinals (ones which cause a LookupError) are left untouched and
|
|
are copied as-is.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyUnicode_Translate(
|
|
PyObject *str, /* String */
|
|
PyObject *table, /* Translate table */
|
|
const char *errors /* error handling */
|
|
);
|
|
|
|
/* Join a sequence of strings using the given separator and return
|
|
the resulting Unicode string. */
|
|
|
|
PyAPI_FUNC(PyObject*) PyUnicode_Join(
|
|
PyObject *separator, /* Separator string */
|
|
PyObject *seq /* Sequence object */
|
|
);
|
|
|
|
/* Return 1 if substr matches str[start:end] at the given tail end, 0
|
|
otherwise. */
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch(
|
|
PyObject *str, /* String */
|
|
PyObject *substr, /* Prefix or Suffix string */
|
|
Py_ssize_t start, /* Start index */
|
|
Py_ssize_t end, /* Stop index */
|
|
int direction /* Tail end: -1 prefix, +1 suffix */
|
|
);
|
|
|
|
/* Return the first position of substr in str[start:end] using the
|
|
given search direction or -1 if not found. -2 is returned in case
|
|
an error occurred and an exception is set. */
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PyUnicode_Find(
|
|
PyObject *str, /* String */
|
|
PyObject *substr, /* Substring to find */
|
|
Py_ssize_t start, /* Start index */
|
|
Py_ssize_t end, /* Stop index */
|
|
int direction /* Find direction: +1 forward, -1 backward */
|
|
);
|
|
|
|
/* Count the number of occurrences of substr in str[start:end]. */
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PyUnicode_Count(
|
|
PyObject *str, /* String */
|
|
PyObject *substr, /* Substring to count */
|
|
Py_ssize_t start, /* Start index */
|
|
Py_ssize_t end /* Stop index */
|
|
);
|
|
|
|
/* Replace at most maxcount occurrences of substr in str with replstr
|
|
and return the resulting Unicode object. */
|
|
|
|
PyAPI_FUNC(PyObject *) PyUnicode_Replace(
|
|
PyObject *str, /* String */
|
|
PyObject *substr, /* Substring to find */
|
|
PyObject *replstr, /* Substring to replace */
|
|
Py_ssize_t maxcount /* Max. number of replacements to apply;
|
|
-1 = all */
|
|
);
|
|
|
|
/* Compare two strings and return -1, 0, 1 for less than, equal,
|
|
greater than resp. */
|
|
|
|
PyAPI_FUNC(int) PyUnicode_Compare(
|
|
PyObject *left, /* Left string */
|
|
PyObject *right /* Right string */
|
|
);
|
|
|
|
/* Rich compare two strings and return one of the following:
|
|
|
|
- NULL in case an exception was raised
|
|
- Py_True or Py_False for successfuly comparisons
|
|
- Py_NotImplemented in case the type combination is unknown
|
|
|
|
Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in
|
|
case the conversion of the arguments to Unicode fails with a
|
|
UnicodeDecodeError.
|
|
|
|
Possible values for op:
|
|
|
|
Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyUnicode_RichCompare(
|
|
PyObject *left, /* Left string */
|
|
PyObject *right, /* Right string */
|
|
int op /* Operation: Py_EQ, Py_NE, Py_GT, etc. */
|
|
);
|
|
|
|
/* Apply a argument tuple or dictionary to a format string and return
|
|
the resulting Unicode string. */
|
|
|
|
PyAPI_FUNC(PyObject *) PyUnicode_Format(
|
|
PyObject *format, /* Format string */
|
|
PyObject *args /* Argument tuple or dictionary */
|
|
);
|
|
|
|
/* Checks whether element is contained in container and return 1/0
|
|
accordingly.
|
|
|
|
element has to coerce to an one element Unicode string. -1 is
|
|
returned in case of an error. */
|
|
|
|
PyAPI_FUNC(int) PyUnicode_Contains(
|
|
PyObject *container, /* Container string */
|
|
PyObject *element /* Element string */
|
|
);
|
|
|
|
/* Externally visible for str.strip(unicode) */
|
|
PyAPI_FUNC(PyObject *) _PyUnicode_XStrip(
|
|
PyUnicodeObject *self,
|
|
int striptype,
|
|
PyObject *sepobj
|
|
);
|
|
|
|
/* === Characters Type APIs =============================================== */
|
|
|
|
/* These should not be used directly. Use the Py_UNICODE_IS* and
|
|
Py_UNICODE_TO* macros instead.
|
|
|
|
These APIs are implemented in Objects/unicodectype.c.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_IsLowercase(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_IsUppercase(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_IsTitlecase(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_IsWhitespace(
|
|
const Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_IsLinebreak(
|
|
const Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToLowercase(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToUppercase(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToTitlecase(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_ToDecimalDigit(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_ToDigit(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(double) _PyUnicode_ToNumeric(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_IsDecimalDigit(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_IsDigit(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_IsNumeric(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
PyAPI_FUNC(int) _PyUnicode_IsAlpha(
|
|
Py_UNICODE ch /* Unicode character */
|
|
);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* Py_USING_UNICODE */
|
|
#endif /* !Py_UNICODEOBJECT_H */
|