cpython-lru_cache-weakref: Modules/_codecsmodule.c annotate

annotate Modules/_codecsmodule.c @ 39610:3674f20ac781

Merge current trunk into p3yk. This includes the PyNumber_Index API change, 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) ........

author	Thomas Wouters <thomas@python.org>
date	Mon, 21 Aug 2006 19:07:27 +0000
parents	654c380cf8b9
children	15b810e21fe9

rev	line source
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	1 /* ------------------------------------------------------------------------
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	2
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	3 _codecs -- Provides access to the codec registry and the builtin
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	4 codecs.
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	5
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	6 This module should never be imported directly. The standard library
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	7 module "codecs" wraps this builtin module for use within Python.
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	8
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	9 The codec registry is accessible via:
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	10
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	11 register(search_function) -> None
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	12
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	13 lookup(encoding) -> (encoder, decoder, stream_reader, stream_writer)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	14
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	15 The builtin Unicode codecs use the following interface:
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	16
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	17 <encoding>_encode(Unicode_object[,errors='strict']) ->
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	18 (string object, bytes consumed)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	19
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	20 <encoding>_decode(char_buffer_obj[,errors='strict']) ->
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	21 (Unicode object, bytes consumed)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	22
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	23 <encoding>_encode() interfaces also accept non-Unicode object as
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	24 input. The objects are then converted to Unicode using
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	25 PyUnicode_FromObject() prior to applying the conversion.
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	26
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	27 These <encoding>s are available: utf_8, unicode_escape,
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	28 raw_unicode_escape, unicode_internal, latin_1, ascii (7-bit),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	29 mbcs (on win32).
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	30
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	31
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	32 Written by Marc-Andre Lemburg (mal@lemburg.com).
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	33
13828 254f8b7c4a83 Changing the CNRI copyright notice according to CNRI's instructions. Guido van Rossum <guido@python.org> parents: 13651 diff changeset	34 Copyright (c) Corporation for National Research Initiatives.
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	35
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	36 ------------------------------------------------------------------------ */
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	37
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	38 #define PY_SSIZE_T_CLEAN
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	39 #include "Python.h"
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	40
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	41 /* --- Registry ----------------------------------------------------------- */
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	42
25974 040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	43 PyDoc_STRVAR(register__doc__,
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	44 "register(search_function)\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	45 \n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	46 Register a codec search function. Search functions are expected to take\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	47 one argument, the encoding name in all lower case letters, and return\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	48 a tuple of functions (encoder, decoder, stream_reader, stream_writer).");
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	49
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	50 static
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	51 PyObject codec_register(PyObject self, PyObject *search_function)
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	52 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	53 if (PyCodec_Register(search_function))
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	54 return NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	55
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	56 Py_RETURN_NONE;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	57 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	58
25974 040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	59 PyDoc_STRVAR(lookup__doc__,
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	60 "lookup(encoding) -> (encoder, decoder, stream_reader, stream_writer)\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	61 \n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	62 Looks up a codec tuple in the Python codec registry and returns\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	63 a tuple of functions.");
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	64
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	65 static
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	66 PyObject codec_lookup(PyObject self, PyObject *args)
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	67 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	68 char *encoding;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	69
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	70 if (!PyArg_ParseTuple(args, "s:lookup", &encoding))
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	71 return NULL;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	72
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	73 return _PyCodec_Lookup(encoding);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	74 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	75
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	76 PyDoc_STRVAR(encode__doc__,
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	77 "encode(obj, [encoding[,errors]]) -> object\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	78 \n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	79 Encodes obj using the codec registered for encoding. encoding defaults\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	80 to the default encoding. errors may be given to set a different error\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	81 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	82 a ValueError. Other possible values are 'ignore', 'replace' and\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	83 'xmlcharrefreplace' as well as any other name registered with\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	84 codecs.register_error that can handle ValueErrors.");
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	85
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	86 static PyObject *
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	87 codec_encode(PyObject self, PyObject args)
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	88 {
32602 ab979ff8b02a Change some declarations from ``char `` to ``const char ``. Also added Brett Cannon <bcannon@gmail.com> parents: 32572 diff changeset	89 const char *encoding = NULL;
ab979ff8b02a Change some declarations from ``char `` to ``const char ``. Also added Brett Cannon <bcannon@gmail.com> parents: 32572 diff changeset	90 const char *errors = NULL;
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	91 PyObject *v;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	92
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	93 if (!PyArg_ParseTuple(args, "O\|ss:encode", &v, &encoding, &errors))
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	94 return NULL;
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	95
34707 0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	96 #ifdef Py_USING_UNICODE
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	97 if (encoding == NULL)
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	98 encoding = PyUnicode_GetDefaultEncoding();
34707 0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	99 #else
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	100 if (encoding == NULL) {
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	101 PyErr_SetString(PyExc_ValueError, "no encoding specified");
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	102 return NULL;
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	103 }
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	104 #endif
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	105
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	106 /* Encode via the codec registry */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	107 return PyCodec_Encode(v, encoding, errors);
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	108 }
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	109
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	110 PyDoc_STRVAR(decode__doc__,
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	111 "decode(obj, [encoding[,errors]]) -> object\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	112 \n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	113 Decodes obj using the codec registered for encoding. encoding defaults\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	114 to the default encoding. errors may be given to set a different error\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	115 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	116 a ValueError. Other possible values are 'ignore' and 'replace'\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	117 as well as any other name registerd with codecs.register_error that is\n\
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	118 able to handle ValueErrors.");
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	119
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	120 static PyObject *
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	121 codec_decode(PyObject self, PyObject args)
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	122 {
32602 ab979ff8b02a Change some declarations from ``char `` to ``const char ``. Also added Brett Cannon <bcannon@gmail.com> parents: 32572 diff changeset	123 const char *encoding = NULL;
ab979ff8b02a Change some declarations from ``char `` to ``const char ``. Also added Brett Cannon <bcannon@gmail.com> parents: 32572 diff changeset	124 const char *errors = NULL;
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	125 PyObject *v;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	126
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	127 if (!PyArg_ParseTuple(args, "O\|ss:decode", &v, &encoding, &errors))
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	128 return NULL;
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	129
34707 0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	130 #ifdef Py_USING_UNICODE
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	131 if (encoding == NULL)
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	132 encoding = PyUnicode_GetDefaultEncoding();
34707 0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	133 #else
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	134 if (encoding == NULL) {
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	135 PyErr_SetString(PyExc_ValueError, "no encoding specified");
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	136 return NULL;
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	137 }
0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33428 diff changeset	138 #endif
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	139
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	140 /* Decode via the codec registry */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	141 return PyCodec_Decode(v, encoding, errors);
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	142 }
8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	143
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	144 /* --- Helpers ------------------------------------------------------------ */
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	145
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	146 static
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	147 PyObject codec_tuple(PyObject unicode,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	148 Py_ssize_t len)
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	149 {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	150 PyObject *v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	151 if (unicode == NULL)
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	152 return NULL;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	153 v = Py_BuildValue("On", unicode, len);
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	154 Py_DECREF(unicode);
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	155 return v;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	156 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	157
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	158 /* --- String codecs ------------------------------------------------------ */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	159 static PyObject *
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	160 escape_decode(PyObject *self,
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	161 PyObject *args)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	162 {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	163 const char *errors = NULL;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	164 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	165 Py_ssize_t size;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	166
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	167 if (!PyArg_ParseTuple(args, "s#\|z:escape_decode",
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	168 &data, &size, &errors))
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	169 return NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	170 return codec_tuple(PyString_DecodeEscape(data, size, errors, 0, NULL),
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	171 size);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	172 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	173
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	174 static PyObject *
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	175 escape_encode(PyObject *self,
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	176 PyObject *args)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	177 {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	178 PyObject *str;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	179 const char *errors = NULL;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	180 char *buf;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	181 Py_ssize_t len;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	182
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	183 if (!PyArg_ParseTuple(args, "O!\|z:escape_encode",
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	184 &PyString_Type, &str, &errors))
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	185 return NULL;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	186
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	187 str = PyString_Repr(str, 0);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	188 if (!str)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	189 return NULL;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	190
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	191 /* The string will be quoted. Unquote, similar to unicode-escape. */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	192 buf = PyString_AS_STRING (str);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	193 len = PyString_GET_SIZE (str);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	194 memmove(buf, buf+1, len-2);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	195 if (_PyString_Resize(&str, len-2) < 0)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	196 return NULL;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	197
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	198 return codec_tuple(str, PyString_Size(str));
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	199 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	200
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	201 #ifdef Py_USING_UNICODE
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	202 /* --- Decoder ------------------------------------------------------------ */
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	203
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	204 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	205 unicode_internal_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	206 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	207 {
14733 814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	208 PyObject *obj;
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	209 const char *errors = NULL;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	210 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	211 Py_ssize_t size;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	212
14733 814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	213 if (!PyArg_ParseTuple(args, "O\|z:unicode_internal_decode",
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	214 &obj, &errors))
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	215 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	216
27680 b19aaaeb6d64 Fix for [ 543344 ] Interpreter crashes when recoding; suggested Marc-André Lemburg <mal@egenix.com> parents: 25974 diff changeset	217 if (PyUnicode_Check(obj)) {
b19aaaeb6d64 Fix for [ 543344 ] Interpreter crashes when recoding; suggested Marc-André Lemburg <mal@egenix.com> parents: 25974 diff changeset	218 Py_INCREF(obj);
14733 814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	219 return codec_tuple(obj, PyUnicode_GET_SIZE(obj));
27680 b19aaaeb6d64 Fix for [ 543344 ] Interpreter crashes when recoding; suggested Marc-André Lemburg <mal@egenix.com> parents: 25974 diff changeset	220 }
14733 814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	221 else {
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	222 if (PyObject_AsReadBuffer(obj, (const void **)&data, &size))
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	223 return NULL;
35485 6b8c55877755 Backport checkin: Walter Dörwald <walter@livinglogic.de> parents: 34707 diff changeset	224
6b8c55877755 Backport checkin: Walter Dörwald <walter@livinglogic.de> parents: 34707 diff changeset	225 return codec_tuple(_PyUnicode_DecodeUnicodeInternal(data, size, errors),
14733 814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	226 size);
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	227 }
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	228 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	229
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	230 static PyObject *
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	231 utf_7_decode(PyObject *self,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	232 PyObject *args)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	233 {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	234 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	235 Py_ssize_t size;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	236 const char *errors = NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	237
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	238 if (!PyArg_ParseTuple(args, "t#\|z:utf_7_decode",
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	239 &data, &size, &errors))
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	240 return NULL;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	241
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	242 return codec_tuple(PyUnicode_DecodeUTF7(data, size, errors),
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	243 size);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	244 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	245
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	246 static PyObject *
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	247 utf_8_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	248 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	249 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	250 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	251 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	252 const char *errors = NULL;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	253 int final = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	254 Py_ssize_t consumed;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	255 PyObject *decoded = NULL;
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	256
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	257 if (!PyArg_ParseTuple(args, "t#\|zi:utf_8_decode",
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	258 &data, &size, &errors, &final))
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	259 return NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	260 if (size < 0) {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	261 PyErr_SetString(PyExc_ValueError, "negative argument");
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	262 return 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	263 }
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	264 consumed = size;
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	265
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	266 decoded = PyUnicode_DecodeUTF8Stateful(data, size, errors,
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	267 final ? NULL : &consumed);
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	268 if (decoded == NULL)
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	269 return NULL;
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	270 return codec_tuple(decoded, consumed);
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	271 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	272
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	273 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	274 utf_16_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	275 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	276 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	277 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	278 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	279 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	280 int byteorder = 0;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	281 int final = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	282 Py_ssize_t consumed;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	283 PyObject *decoded;
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	284
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	285 if (!PyArg_ParseTuple(args, "t#\|zi:utf_16_decode",
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	286 &data, &size, &errors, &final))
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	287 return NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	288 if (size < 0) {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	289 PyErr_SetString(PyExc_ValueError, "negative argument");
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	290 return 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	291 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	292 consumed = size; /* This is overwritten unless final is true. */
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	293 decoded = PyUnicode_DecodeUTF16Stateful(data, size, errors, &byteorder,
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	294 final ? NULL : &consumed);
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	295 if (decoded == NULL)
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	296 return NULL;
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	297 return codec_tuple(decoded, consumed);
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	298 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	299
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	300 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	301 utf_16_le_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	302 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	303 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	304 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	305 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	306 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	307 int byteorder = -1;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	308 int final = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	309 Py_ssize_t consumed;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	310 PyObject *decoded = NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	311
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	312 if (!PyArg_ParseTuple(args, "t#\|zi:utf_16_le_decode",
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	313 &data, &size, &errors, &final))
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	314 return NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	315
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	316 if (size < 0) {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	317 PyErr_SetString(PyExc_ValueError, "negative argument");
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	318 return 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	319 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	320 consumed = size; /* This is overwritten unless final is true. */
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	321 decoded = PyUnicode_DecodeUTF16Stateful(data, size, errors,
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	322 &byteorder, final ? NULL : &consumed);
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	323 if (decoded == NULL)
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	324 return NULL;
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	325 return codec_tuple(decoded, consumed);
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	326
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	327 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	328
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	329 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	330 utf_16_be_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	331 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	332 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	333 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	334 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	335 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	336 int byteorder = 1;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	337 int final = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	338 Py_ssize_t consumed;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	339 PyObject *decoded = NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	340
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	341 if (!PyArg_ParseTuple(args, "t#\|zi:utf_16_be_decode",
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	342 &data, &size, &errors, &final))
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	343 return NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	344 if (size < 0) {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	345 PyErr_SetString(PyExc_ValueError, "negative argument");
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	346 return 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	347 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	348 consumed = size; /* This is overwritten unless final is true. */
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	349 decoded = PyUnicode_DecodeUTF16Stateful(data, size, errors,
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	350 &byteorder, final ? NULL : &consumed);
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	351 if (decoded == NULL)
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	352 return NULL;
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	353 return codec_tuple(decoded, consumed);
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	354 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	355
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	356 /* This non-standard version also provides access to the byteorder
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	357 parameter of the builtin UTF-16 codec.
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	358
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	359 It returns a tuple (unicode, bytesread, byteorder) with byteorder
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	360 being the value in effect at the end of data.
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	361
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	362 */
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	363
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	364 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	365 utf_16_ex_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	366 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	367 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	368 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	369 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	370 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	371 int byteorder = 0;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	372 PyObject unicode, tuple;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	373 int final = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	374 Py_ssize_t consumed;
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	375
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	376 if (!PyArg_ParseTuple(args, "t#\|zii:utf_16_ex_decode",
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	377 &data, &size, &errors, &byteorder, &final))
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	378 return NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	379 if (size < 0) {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	380 PyErr_SetString(PyExc_ValueError, "negative argument");
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	381 return 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	382 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	383 consumed = size; /* This is overwritten unless final is true. */
33428 57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	384 unicode = PyUnicode_DecodeUTF16Stateful(data, size, errors, &byteorder,
57478a13fbf6 SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support Walter Dörwald <walter@livinglogic.de> parents: 32602 diff changeset	385 final ? NULL : &consumed);
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	386 if (unicode == NULL)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	387 return NULL;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	388 tuple = Py_BuildValue("Oni", unicode, consumed, byteorder);
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	389 Py_DECREF(unicode);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	390 return tuple;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	391 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	392
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	393 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	394 unicode_escape_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	395 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	396 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	397 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	398 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	399 const char *errors = NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	400
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	401 if (!PyArg_ParseTuple(args, "t#\|z:unicode_escape_decode",
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	402 &data, &size, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	403 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	404
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	405 return codec_tuple(PyUnicode_DecodeUnicodeEscape(data, size, errors),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	406 size);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	407 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	408
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	409 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	410 raw_unicode_escape_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	411 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	412 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	413 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	414 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	415 const char *errors = NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	416
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	417 if (!PyArg_ParseTuple(args, "t#\|z:raw_unicode_escape_decode",
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	418 &data, &size, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	419 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	420
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	421 return codec_tuple(PyUnicode_DecodeRawUnicodeEscape(data, size, errors),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	422 size);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	423 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	424
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	425 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	426 latin_1_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	427 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	428 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	429 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	430 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	431 const char *errors = NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	432
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	433 if (!PyArg_ParseTuple(args, "t#\|z:latin_1_decode",
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	434 &data, &size, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	435 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	436
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	437 return codec_tuple(PyUnicode_DecodeLatin1(data, size, errors),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	438 size);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	439 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	440
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	441 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	442 ascii_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	443 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	444 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	445 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	446 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	447 const char *errors = NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	448
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	449 if (!PyArg_ParseTuple(args, "t#\|z:ascii_decode",
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	450 &data, &size, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	451 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	452
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	453 return codec_tuple(PyUnicode_DecodeASCII(data, size, errors),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	454 size);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	455 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	456
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	457 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	458 charmap_decode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	459 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	460 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	461 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	462 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	463 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	464 PyObject *mapping = NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	465
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	466 if (!PyArg_ParseTuple(args, "t#\|zO:charmap_decode",
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	467 &data, &size, &errors, &mapping))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	468 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	469 if (mapping == Py_None)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	470 mapping = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	471
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	472 return codec_tuple(PyUnicode_DecodeCharmap(data, size, mapping, errors),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	473 size);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	474 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	475
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21757 diff changeset	476 #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	477
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	478 static PyObject *
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	479 mbcs_decode(PyObject *self,
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	480 PyObject *args)
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	481 {
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	482 const char *data;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	483 Py_ssize_t size, consumed;
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	484 const char *errors = NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	485 int final = 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	486 PyObject *decoded;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	487
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	488 if (!PyArg_ParseTuple(args, "t#\|zi:mbcs_decode",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	489 &data, &size, &errors, &final))
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	490 return NULL;
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	491
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	492 decoded = PyUnicode_DecodeMBCSStateful(
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	493 data, size, errors, final ? NULL : &consumed);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	494 if (!decoded)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	495 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	496 return codec_tuple(decoded, final ? size : consumed);
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	497 }
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	498
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21757 diff changeset	499 #endif /* MS_WINDOWS */
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	500
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	501 /* --- Encoder ------------------------------------------------------------ */
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	502
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	503 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	504 readbuffer_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	505 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	506 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	507 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	508 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	509 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	510
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	511 if (!PyArg_ParseTuple(args, "s#\|z:readbuffer_encode",
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	512 &data, &size, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	513 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	514
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	515 return codec_tuple(PyString_FromStringAndSize(data, size),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	516 size);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	517 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	518
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	519 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	520 charbuffer_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	521 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	522 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	523 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	524 Py_ssize_t size;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	525 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	526
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	527 if (!PyArg_ParseTuple(args, "t#\|z:charbuffer_encode",
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	528 &data, &size, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	529 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	530
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	531 return codec_tuple(PyString_FromStringAndSize(data, size),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	532 size);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	533 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	534
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	535 static PyObject *
14733 814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	536 unicode_internal_encode(PyObject *self,
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	537 PyObject *args)
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	538 {
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	539 PyObject *obj;
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	540 const char *errors = NULL;
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	541 const char *data;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35825 diff changeset	542 Py_ssize_t size;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	543
14733 814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	544 if (!PyArg_ParseTuple(args, "O\|z:unicode_internal_encode",
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	545 &obj, &errors))
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	546 return NULL;
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	547
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	548 if (PyUnicode_Check(obj)) {
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	549 data = PyUnicode_AS_DATA(obj);
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	550 size = PyUnicode_GET_DATA_SIZE(obj);
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	551 return codec_tuple(PyString_FromStringAndSize(data, size),
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	552 size);
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	553 }
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	554 else {
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	555 if (PyObject_AsReadBuffer(obj, (const void **)&data, &size))
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	556 return NULL;
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	557 return codec_tuple(PyString_FromStringAndSize(data, size),
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	558 size);
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	559 }
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	560 }
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	561
814f421e0326 Added a true unicode_internal_encode function and fixed the Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	562 static PyObject *
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	563 utf_7_encode(PyObject *self,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	564 PyObject *args)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	565 {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	566 PyObject str, v;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	567 const char *errors = NULL;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	568
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	569 if (!PyArg_ParseTuple(args, "O\|z:utf_7_encode",
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	570 &str, &errors))
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	571 return NULL;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	572
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	573 str = PyUnicode_FromObject(str);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	574 if (str == NULL)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	575 return NULL;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	576 v = codec_tuple(PyUnicode_EncodeUTF7(PyUnicode_AS_UNICODE(str),
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	577 PyUnicode_GET_SIZE(str),
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	578 0,
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	579 0,
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	580 errors),
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	581 PyUnicode_GET_SIZE(str));
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	582 Py_DECREF(str);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	583 return v;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	584 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	585
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19343 diff changeset	586 static PyObject *
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	587 utf_8_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	588 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	589 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	590 PyObject str, v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	591 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	592
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	593 if (!PyArg_ParseTuple(args, "O\|z:utf_8_encode",
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	594 &str, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	595 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	596
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	597 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	598 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	599 return NULL;
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	600 v = codec_tuple(PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(str),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	601 PyUnicode_GET_SIZE(str),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	602 errors),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	603 PyUnicode_GET_SIZE(str));
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	604 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	605 return v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	606 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	607
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	608 /* This version provides access to the byteorder parameter of the
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	609 builtin UTF-16 codecs as optional third argument. It defaults to 0
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	610 which means: use the native byte order and prepend the data with a
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	611 BOM mark.
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	612
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	613 */
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	614
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	615 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	616 utf_16_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	617 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	618 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	619 PyObject str, v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	620 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	621 int byteorder = 0;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	622
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	623 if (!PyArg_ParseTuple(args, "O\|zi:utf_16_encode",
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	624 &str, &errors, &byteorder))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	625 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	626
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	627 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	628 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	629 return NULL;
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	630 v = codec_tuple(PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(str),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	631 PyUnicode_GET_SIZE(str),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	632 errors,
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	633 byteorder),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	634 PyUnicode_GET_SIZE(str));
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	635 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	636 return v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	637 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	638
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	639 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	640 utf_16_le_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	641 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	642 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	643 PyObject str, v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	644 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	645
18139 354a4df09e38 Fix for bug [ #433047 ] missing args to PyArg_ParseTuple Marc-André Lemburg <mal@egenix.com> parents: 14733 diff changeset	646 if (!PyArg_ParseTuple(args, "O\|z:utf_16_le_encode",
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	647 &str, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	648 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	649
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	650 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	651 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	652 return NULL;
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	653 v = codec_tuple(PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(str),
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	654 PyUnicode_GET_SIZE(str),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	655 errors,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	656 -1),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	657 PyUnicode_GET_SIZE(str));
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	658 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	659 return v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	660 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	661
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	662 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	663 utf_16_be_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	664 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	665 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	666 PyObject str, v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	667 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	668
18139 354a4df09e38 Fix for bug [ #433047 ] missing args to PyArg_ParseTuple Marc-André Lemburg <mal@egenix.com> parents: 14733 diff changeset	669 if (!PyArg_ParseTuple(args, "O\|z:utf_16_be_encode",
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	670 &str, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	671 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	672
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	673 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	674 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	675 return NULL;
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	676 v = codec_tuple(PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(str),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	677 PyUnicode_GET_SIZE(str),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	678 errors,
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	679 +1),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	680 PyUnicode_GET_SIZE(str));
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	681 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	682 return v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	683 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	684
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	685 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	686 unicode_escape_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	687 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	688 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	689 PyObject str, v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	690 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	691
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	692 if (!PyArg_ParseTuple(args, "O\|z:unicode_escape_encode",
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	693 &str, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	694 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	695
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	696 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	697 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	698 return NULL;
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	699 v = codec_tuple(PyUnicode_EncodeUnicodeEscape(PyUnicode_AS_UNICODE(str),
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	700 PyUnicode_GET_SIZE(str)),
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	701 PyUnicode_GET_SIZE(str));
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	702 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	703 return v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	704 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	705
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	706 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	707 raw_unicode_escape_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	708 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	709 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	710 PyObject str, v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	711 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	712
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	713 if (!PyArg_ParseTuple(args, "O\|z:raw_unicode_escape_encode",
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	714 &str, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	715 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	716
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	717 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	718 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	719 return NULL;
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	720 v = codec_tuple(PyUnicode_EncodeRawUnicodeEscape(
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	721 PyUnicode_AS_UNICODE(str),
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	722 PyUnicode_GET_SIZE(str)),
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	723 PyUnicode_GET_SIZE(str));
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	724 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	725 return v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	726 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	727
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	728 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	729 latin_1_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	730 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	731 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	732 PyObject str, v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	733 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	734
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	735 if (!PyArg_ParseTuple(args, "O\|z:latin_1_encode",
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	736 &str, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	737 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	738
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	739 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	740 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	741 return NULL;
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	742 v = codec_tuple(PyUnicode_EncodeLatin1(
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	743 PyUnicode_AS_UNICODE(str),
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	744 PyUnicode_GET_SIZE(str),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	745 errors),
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	746 PyUnicode_GET_SIZE(str));
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	747 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	748 return v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	749 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	750
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	751 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	752 ascii_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	753 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	754 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	755 PyObject str, v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	756 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	757
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	758 if (!PyArg_ParseTuple(args, "O\|z:ascii_encode",
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	759 &str, &errors))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	760 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	761
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	762 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	763 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	764 return NULL;
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	765 v = codec_tuple(PyUnicode_EncodeASCII(
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	766 PyUnicode_AS_UNICODE(str),
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	767 PyUnicode_GET_SIZE(str),
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	768 errors),
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	769 PyUnicode_GET_SIZE(str));
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	770 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	771 return v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	772 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	773
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	774 static PyObject *
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	775 charmap_encode(PyObject *self,
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	776 PyObject *args)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	777 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	778 PyObject str, v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	779 const char *errors = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	780 PyObject *mapping = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	781
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	782 if (!PyArg_ParseTuple(args, "O\|zO:charmap_encode",
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	783 &str, &errors, &mapping))
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	784 return NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	785 if (mapping == Py_None)
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	786 mapping = NULL;
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	787
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	788 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	789 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	790 return NULL;
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	791 v = codec_tuple(PyUnicode_EncodeCharmap(
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	792 PyUnicode_AS_UNICODE(str),
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	793 PyUnicode_GET_SIZE(str),
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	794 mapping,
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	795 errors),
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	796 PyUnicode_GET_SIZE(str));
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	797 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	798 return v;
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	799 }
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	800
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	801 static PyObject*
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	802 charmap_build(PyObject self, PyObject args)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	803 {
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	804 PyObject *map;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	805 if (!PyArg_ParseTuple(args, "U:charmap_build", &map))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	806 return NULL;
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	807 return PyUnicode_BuildEncodingMap(map);
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	808 }
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	809
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21757 diff changeset	810 #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	811
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	812 static PyObject *
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	813 mbcs_encode(PyObject *self,
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	814 PyObject *args)
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	815 {
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	816 PyObject str, v;
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	817 const char *errors = NULL;
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	818
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	819 if (!PyArg_ParseTuple(args, "O\|z:mbcs_encode",
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	820 &str, &errors))
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	821 return NULL;
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	822
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	823 str = PyUnicode_FromObject(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	824 if (str == NULL)
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	825 return NULL;
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	826 v = codec_tuple(PyUnicode_EncodeMBCS(
35825 cc17a582518a Whitespace cleanup. Walter Dörwald <walter@livinglogic.de> parents: 35485 diff changeset	827 PyUnicode_AS_UNICODE(str),
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	828 PyUnicode_GET_SIZE(str),
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	829 errors),
13358 c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	830 PyUnicode_GET_SIZE(str));
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	831 Py_DECREF(str);
c8706e5a882f Modified the encode interfaces of all builtin codecs to accept Marc-André Lemburg <mal@egenix.com> parents: 12074 diff changeset	832 return v;
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	833 }
65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	834
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21757 diff changeset	835 #endif /* MS_WINDOWS */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18278 diff changeset	836 #endif /* Py_USING_UNICODE */
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	837
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	838 /* --- Error handler registry --------------------------------------------- */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	839
25974 040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	840 PyDoc_STRVAR(register_error__doc__,
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	841 "register_error(errors, handler)\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	842 \n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	843 Register the specified error handler under the name\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	844 errors. handler must be a callable object, that\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	845 will be called with an exception instance containing\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	846 information about the location of the encoding/decoding\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	847 error and must return a (replacement, new position) tuple.");
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	848
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	849 static PyObject register_error(PyObject self, PyObject *args)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	850 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	851 const char *name;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	852 PyObject *handler;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	853
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	854 if (!PyArg_ParseTuple(args, "sO:register_error",
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	855 &name, &handler))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	856 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	857 if (PyCodec_RegisterError(name, handler))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	858 return NULL;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	859 Py_RETURN_NONE;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	860 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	861
25974 040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	862 PyDoc_STRVAR(lookup_error__doc__,
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	863 "lookup_error(errors) -> handler\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	864 \n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	865 Return the error handler for the specified error handling name\n\
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	866 or raise a LookupError, if no handler exists under this name.");
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	867
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	868 static PyObject lookup_error(PyObject self, PyObject *args)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	869 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	870 const char *name;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	871
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	872 if (!PyArg_ParseTuple(args, "s:lookup_error",
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	873 &name))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	874 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	875 return PyCodec_LookupError(name);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	876 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24808 diff changeset	877
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	878 /* --- Module API --------------------------------------------------------- */
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	879
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	880 static PyMethodDef _codecs_functions[] = {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	881 {"register", codec_register, METH_O,
25974 040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	882 register__doc__},
32572 8ea2cb1ec598 Add generic codecs.encode() and .decode() APIs that don't impose Marc-André Lemburg <mal@egenix.com> parents: 27680 diff changeset	883 {"lookup", codec_lookup, METH_VARARGS,
25974 040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	884 lookup__doc__},
32602 ab979ff8b02a Change some declarations from ``char `` to ``const char ``. Also added Brett Cannon <bcannon@gmail.com> parents: 32572 diff changeset	885 {"encode", codec_encode, METH_VARARGS,
ab979ff8b02a Change some declarations from ``char `` to ``const char ``. Also added Brett Cannon <bcannon@gmail.com> parents: 32572 diff changeset	886 encode__doc__},
ab979ff8b02a Change some declarations from ``char `` to ``const char ``. Also added Brett Cannon <bcannon@gmail.com> parents: 32572 diff changeset	887 {"decode", codec_decode, METH_VARARGS,
ab979ff8b02a Change some declarations from ``char `` to ``const char ``. Also added Brett Cannon <bcannon@gmail.com> parents: 32572 diff changeset	888 decode__doc__},
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	889 {"escape_encode", escape_encode, METH_VARARGS},
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24471 diff changeset	890 {"escape_decode", escape_decode, METH_VARARGS},
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18278 diff changeset	891 #ifdef Py_USING_UNICODE
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	892 {"utf_8_encode", utf_8_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	893 {"utf_8_decode", utf_8_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	894 {"utf_7_encode", utf_7_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	895 {"utf_7_decode", utf_7_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	896 {"utf_16_encode", utf_16_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	897 {"utf_16_le_encode", utf_16_le_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	898 {"utf_16_be_encode", utf_16_be_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	899 {"utf_16_decode", utf_16_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	900 {"utf_16_le_decode", utf_16_le_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	901 {"utf_16_be_decode", utf_16_be_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	902 {"utf_16_ex_decode", utf_16_ex_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	903 {"unicode_escape_encode", unicode_escape_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	904 {"unicode_escape_decode", unicode_escape_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	905 {"unicode_internal_encode", unicode_internal_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	906 {"unicode_internal_decode", unicode_internal_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	907 {"raw_unicode_escape_encode", raw_unicode_escape_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	908 {"raw_unicode_escape_decode", raw_unicode_escape_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	909 {"latin_1_encode", latin_1_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	910 {"latin_1_decode", latin_1_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	911 {"ascii_encode", ascii_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	912 {"ascii_decode", ascii_decode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	913 {"charmap_encode", charmap_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	914 {"charmap_decode", charmap_decode, METH_VARARGS},
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	915 {"charmap_build", charmap_build, METH_VARARGS},
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	916 {"readbuffer_encode", readbuffer_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	917 {"charbuffer_encode", charbuffer_encode, METH_VARARGS},
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21757 diff changeset	918 #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	919 {"mbcs_encode", mbcs_encode, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 19998 diff changeset	920 {"mbcs_decode", mbcs_decode, METH_VARARGS},
12074 65f35b73e350 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11980 diff changeset	921 #endif
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18278 diff changeset	922 #endif /* Py_USING_UNICODE */
25974 040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	923 {"register_error", register_error, METH_VARARGS,
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	924 register_error__doc__},
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	925 {"lookup_error", lookup_error, METH_VARARGS,
040af9c736bb Add docstrings to register, lookup, register_error Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	926 lookup_error__doc__},
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	927 {NULL, NULL} /* sentinel */
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	928 };
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	929
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24071 diff changeset	930 PyMODINIT_FUNC
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13358 diff changeset	931 init_codecs(void)
11980 a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	932 {
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	933 Py_InitModule("_codecs", _codecs_functions);
a9b5a31ff8cb Internal module _codecs -- Provides access to the codec registry and Guido van Rossum <guido@python.org> parents: diff changeset	934 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_codecsmodule.c @ 39610:3674f20ac781