mirror of
https://github.com/python/cpython.git
synced 2025-07-19 01:05:26 +00:00

Merged revisions 51434-53004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev ........ r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines Patch #1542451: disallow continue anywhere under a finally I'm undecided if this should be backported to 2.5 or 2.5.1. Armin suggested to wait (I'm of the same opinion). Thomas W thinks it's fine to go in 2.5. ........ r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines Handle a few more error conditions. Klocwork 301 and 302. Will backport. ........ r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines Patch #1541585: fix buffer overrun when performing repr() on a unicode string in a build with wide unicode (UCS-4) support. This code could be improved, so add an XXX comment. ........ r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line Try to get the windows bots working again with the new peephole.c ........ r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line patch for documentation for recent uuid changes (from ping) ........ r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line Alexander Belopolsky pointed out that pos is a size_t ........ r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines Expose column offset information in parse trees. ........ r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line Move functional howto into trunk ........ r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines Baby steps towards better tests for tokenize ........ r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines x**2 should about equal x*x (including for a float x such that the result is inf) but didn't; added a test to test_float to verify that, and ignored the ERANGE value for errno in the pow operation to make the new test pass (with help from Marilyn Davis at the Google Python Sprint -- thanks!). ........ r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines Bug fixes large and small for tokenize. Small: Always generate a NL or NEWLINE token following a COMMENT token. The old code did not generate an NL token if the comment was on a line by itself. Large: The output of untokenize() will now match the input exactly if it is passed the full token sequence. The old, crufty output is still generated if a limited input sequence is provided, where limited means that it does not include position information for tokens. Remaining bug: There is no CONTINUATION token (\) so there is no way for untokenize() to handle such code. Also, expanded the number of doctests in hopes of eventually removing the old-style tests that compare against a golden file. Bug fix candidate for Python 2.5.1. (Sigh.) ........ r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines Replace dead code with an assert. Now that COMMENT tokens are reliably followed by NL or NEWLINE, there is never a need to add extra newlines in untokenize. ........ r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines Reverting the patch that tried to fix the issue whereby x**2 raises OverflowError while x*x succeeds and produces infinity; apparently these inconsistencies cannot be fixed across ``all'' platforms and there's a widespread feeling that therefore ``every'' platform should keep suffering forevermore. Ah well. ........ r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines Fix SF bug #1545837: array.array borks on deepcopy. array.__deepcopy__() needs to take an argument, even if it doesn't actually use it. Will backport to 2.5 and 2.4 (if applicable.) ........ r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines Patch #1545507: Exclude ctypes package in Win64 MSI file. Will backport to 2.5. ........ r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line importing types is not necessary if we use isinstance ........ r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines Port _ctypes.pyd to win64 on AMD64. ........ r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines Add missing file for _ctypes.pyd port to win64 on AMD64. ........ r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines Build _ctypes.pyd for win AMD64 into the MSVC project file. Since MSVC doesn't know about .asm files, a helper batch file is needed to find ml64.exe in predefined locations. The helper script hardcodes the path to the MS Platform SDK. ........ r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines The regular expression engine in '_sre' can segfault when interpreting bogus bytecode. It is unclear whether this is a real bug or a "won't fix" case like bogus_code_obj.py. ........ r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines Whitespace normalization. ........ r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines A new test here relied on preserving invisible trailing whitespace in expected output. Stop that. ........ r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines - Move functions common to all path modules into genericpath.py and have the OS speicifc path modules import them. - Have os2emxpath import common functions fron ntpath instead of using copies ........ r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line Fix a couple of typos. ........ r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines Fix a buglet in the error reporting (SF bug report #1546372). This should probably go into Python 2.5 or 2.5.1 as well. ........ r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines Doc fix: hashlib objects don't always return a digest of 16 bytes. Backport candidate for 2.5. ........ r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5) ........ r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...) ........ r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines Make sure memory is properly cleaned up in file_init. Backport candidate. ........ r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines Fix comment about indentation level in C files. ........ r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but have all new files use 4 spaces (to match current PEP 7 style). ........ r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines - SF patch #1550263: Enhance and correct unittest docs - various minor cleanups for improved consistency ........ r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines evalfile() should be execfile(). ........ r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line SF #1547931, fix typo (missing and). Will backport to 2.5 ........ r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line Bug #1548092: fix curses.tparm seg fault on invalid input. Needs backport to 2.5.1 and earlier. ........ r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines Bug #1550714: fix SystemError from itertools.tee on negative value for n. Needs backport to 2.5.1 and earlier. ........ r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line Make decimal.ContextManager a private implementation detail of decimal.localcontext() ........ r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line Further corrections to the decimal module context management documentation ........ r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line Fix documentation nits for decimal context managers. ........ r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line Add missing word in comment ........ r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines Hmm, this test has failed at least twice recently on the OpenBSD and Debian sparc buildbots. Since this goes through a lot of tests and hits the disk a lot it could be slow (especially if NFS is involved). I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt. The code was stolen from test_compiler. ........ r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line Fix final documentation nits before backporting decimal module fixes to 2.5 ........ r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line Typo fix for decimal docs ........ r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line NEWS entry on trunk for decimal module changes ........ r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line Fix endcase for str.rpartition() ........ r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines "Conceptual" merge of rev 51711 from the 2.5 branch. i_divmod(): As discussed on Python-Dev, changed the overflow checking to live happily with recent gcc optimizations that assume signed integer arithmetic never overflows. This differs from the corresponding change on the 2.5 and 2.4 branches, using a less obscure approach, but one that /may/ tickle platform idiocies in their definitions of LONG_MIN. The 2.4 + 2.5 change avoided introducing a dependence on LONG_MIN, at the cost of substantially goofier code. ........ r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines Whitespace normalization. ........ r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines Fix SF bug #1546288, crash in dict_equal. ........ r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line Fix SF #1552093, eval docstring typo (3 ps in mapping) ........ r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line This was found by Guido AFAIK on p3yk (sic) branch. ........ r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line Add a NEWS entry for str.rpartition() change ........ r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34]. ........ r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines Bug #1520864 (again): unpacking singleton tuples in list comprehensions and generator expressions (x for x, in ... ) works again. Sigh, I only fixed for loops the first time, not list comps and genexprs too. I couldn't find any more unpacking cases where there is a similar bug lurking. This code should be refactored to eliminate the duplication. I'm sure the listcomp/genexpr code can be refactored. I'm not sure if the for loop can re-use any of the same code though. Will backport to 2.5 (the only place it matters). ........ r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. ........ r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line M-x untabify ........ r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines Fix a few bugs on cjkcodecs found by Oren Tirosh: - gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly. - iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312 codepoints to conform the standard. - iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2 codepoints now. ........ r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines Fix a typo: 2013 -> 0213 ........ r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines Bug #1552618: change docs of dict.has_key() to reflect recommendation to use "in". ........ r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line Rearrange example a bit, and show rpartition() when separator is not found ........ r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line [Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info(). Reported by Russell Warren ........ r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines [Bug #1526834] Fix crash in pdb when you do 'b f('; the function name was placed into a regex pattern and the unbalanced paren caused re.compile() to report an error ........ r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines Update the PCBuild8 solution. Facilitate cross-compilation by having binaries in separate Win32 and x64 directories. Rationalized configs by making proper use of platforms/configurations. Remove pythoncore_pgo project. Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation. Removed I64 support, but this can be easily added by copying the x64 platform settings. ........ r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines Fixing #1531862: Do not close standard file descriptors in the subprocess module. ........ r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line Revert 51758 because it broke all the buildbots ........ r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1551427: fix a wrong NULL pointer check in the win32 version of os.urandom(). ........ r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1550983: emit better error messages for erroneous relative imports (if not in package and if beyond toplevel package). ........ r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line with and as are now keywords. There are some generated files I can't recreate. ........ r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack. Also make sure that every exception class has __module__ set to 'exceptions'. ........ r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines Fix missing import of the types module in logging.config. ........ r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines Add news item for bug fix of SF bug report #1546372. ........ r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines Fixed subprocess bug #1531862 again, after removing tests offending buildbot ........ r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line Fix refcounts and add error checks. ........ r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314 ........ r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines Fix a glaring error and update some version numbers. ........ r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line Typo fix ........ r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines [Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select() if an input hook has been defined. Patch by Richard Boulton. This select() code is only executed with readline 2.1, or if READLINE_CALLBACKS is defined. Backport candidate for 2.5, 2.4, probably earlier versions too. ........ r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines Add a warning notice on top of the generated grammar.txt. ........ r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines Anonymous structure fields that have a bit-width specified did not work, and they gave a strange error message from PyArg_ParseTuple: function takes exactly 2 arguments (3 given). With tests. ........ r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines The cast function did not accept c_char_p or c_wchar_p instances as first argument, and failed with a 'bad argument to internal function' error message. ........ r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line Add missing NEWS entry for rev 51803 ........ r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line Add missing word ........ r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line Fix typo in example ........ r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines Remove the __unicode__ method from exceptions. Allows unicode() to be called on exception classes. Would require introducing a tp_unicode slot to make it work otherwise. Fixes bug #1551432 and will be backported. ........ r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines Forward port of 51850 from release25-maint branch. As mentioned on python-dev, reverting patch #1504333 because it introduced an infinite loop in rev 47154. This patch also adds a test to prevent the regression. ........ r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines Properly handle a NULL returned from PyArena_New(). (Also fix some whitespace) Klocwork #364. ........ r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line Add a "crasher" taken from the sgml bug report referenced in the comment ........ r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines Forward-port of rev. 51857: Building with HP's cc on HP-UX turned up a couple of problems. _PyGILState_NoteThreadState was declared as static inconsistently. Make it static as it's not necessary outside of this module. Some tests failed because errno was reset to 0. (I think the tests that failed were at least: test_fcntl and test_mailbox). Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS. This only affected debug builds. ........ r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines Forward-port 51862: Add sgml_input.html. ........ r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line Markup typo fix ........ r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line Some editing, markup fixes ........ r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line More wordsmithing ........ r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line Make --help mention that -v can be supplied multiple times ........ r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line Rewrite help message to remove some of the parentheticals. (There were a lot of them.) ........ r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines Fix grammar errors and improve clarity. ........ r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines Correct elementtree module index entry. ........ r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines - fix module name in links in formatted documentation - minor markup cleanup (forward-ported from release25-maint revision 51888) ........ r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines revise explanation of returns_unicode to reflect bool values and to include the default value (merged from release25-maint revision 51890) ........ r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines Patch #1557515: Add RLIMIT_SBSIZE. ........ r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines Port of revision 51902 in release25-maint to the trunk ........ r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version of python changes (2.5 -> 2.6). Bug #1552935. ........ r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines Make this thing executable. ........ r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines Fixes a bug with bsddb.DB.stat where the flags and txn keyword arguments are transposed. (reported by Louis Zechtzer) ..already committed to release24-maint ..needs committing to release25-maint ........ r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed from exceptions. ........ r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines Allow exceptions to be directly sliced again (e.g., ``BaseException(1,2,3)[0:2]``). Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev. This should be backported to 2.5 . ........ r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines Make python.vim output more deterministic. ........ r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines Fix typo. ........ r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines * regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t which breaks negative counts * added test for negative numbers will backport to 2.5.1 ........ r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line added itertools.count(-n) fix ........ r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines Fix %zd string formatting on Mac OS X so it prints negative numbers. In addition to testing positive numbers, verify negative numbers work in configure. In order to avoid compiler warnings on OS X 10.4, also change the order of the check for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format for Py_ssize_t. This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't defined at configure time. Need to verify the buildbot results. Backport candidate (if everyone thinks this patch can't be improved). ........ r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). These tests should be improved. Hopefully this fixes variations when flipping back and forth between fpdef and fplist. Backport candidate. ........ r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines Mostly revert this file to the same version as before. Only force setting of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define to use. This should get rid of the warnings on other platforms and Mac too. ........ r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line add boilerplate "What's New" document so the docs will build ........ r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line Remove extra semi-colons reported by Johnny Lee on python-dev. Backport if anyone cares. ........ r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line SF Bug #1563963, add missing word and cleanup first sentance ........ r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines Make output on test_strptime() be more verbose in face of failure. This is in hopes that more information will help debug the failing test on HPPA Ubuntu. ........ r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines Fix webbrowser.BackgroundBrowser on Windows. ........ r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in the parser's future statement handling that led to "with" not being recognized as a keyword after, e.g., this statement: from __future__ import division, with_statement ........ r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in traceback.format_exception_only() that led to an error being raised when print_exc() was called without an exception set. In version 2.4, this printed "None", restored that behavior. ........ r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines Another crasher. ........ r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines Make the error message for when the time data and format do not match clearer. ........ r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line Add news item for rev. 51815 ........ r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line Make examples do error checking on Py_InitModule ........ r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines Very minor grammatical fix in a comment. ........ r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines SF bug #1567976 : fix typo Will backport to 2.5. ........ r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines wording change ........ r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1567375: a minor logical glitch in example description. ........ r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1565661: in webbrowser, split() the command for the default GNOME browser in case it is a command with args. ........ r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines Patch #1567691: super() and new.instancemethod() now don't accept keyword arguments any more (previously they accepted them, but didn't use them). ........ r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566800: make sure that EnvironmentError can be called with any number of arguments, as was the case in Python 2.4. ........ r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1566663: remove obsolete example from datetime docs. ........ r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566602: correct failure of posixpath unittest when $HOME ends with a slash. ........ r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes keep_blank_values and strict_parsing keyword arguments. ........ r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1560617: in pyclbr, return full module name not only for classes, but also for functions. ........ r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1556784: allow format strings longer than 127 characters in datetime's strftime function. ........ r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1446043: correctly raise a LookupError if an encoding name given to encodings.search_function() contains a dot. ........ r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1546052: clarify that PyString_FromString(AndSize) copies the string pointed to by its parameter. ........ r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines Convert test_import to unittest. ........ r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines Some syntax errors were being caught by tokenize during the tabnanny check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719 ........ r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines Add comment explaining that error msgs may be due to user code when running w/o subprocess. ........ r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines Fix test for uintptr_t. Fixes #1568842. Will backport. ........ r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines Guard uintptr_t test with HAVE_STDINT_H, test for stdint.h. Will backport. ........ r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622). ........ r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line Documentation clarified to mention optional parameters. ........ r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622). ........ r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines Fix minor typo in a comment. ........ r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines Convert test_imp over to unittest. ........ r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to test for parts > 3 when we use .split(..., 2). ........ r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines Fix for SF bug 1569998: break permitted inside try. The compiler was checking that there was something on the fblock stack, but not that there was a loop on the stack. Fixed that and added a test for the specific syntax error. Bug fix candidate. ........ r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines Fix integer negation and absolute value to not rely on undefined behaviour of the C compiler anymore. Will backport to 2.5 and 2.4. ........ r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line Forward port r52134: Add uuids for 2.4.4. ........ r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines Compilation problem caused by conflicting typedefs for uint32_t (unsigned long vs. unsigned int). ........ r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines Forward-port of r52136,52138: a review of overflow-detecting code. * unified the way intobject, longobject and mystrtoul handle values around -sys.maxint-1. * in general, trying to entierely avoid overflows in any computation involving signed ints or longs is extremely involved. Fixed a few simple cases where a compiler might be too clever (but that's all guesswork). * more overflow checks against bad data in marshal.c. * 2.5 specific: fixed a number of places that were still confusing int and Py_ssize_t. Some of them could potentially have caused "real-world" breakage. * list.pop(x): fixing overflow issues on x was messy. I just reverted to PyArg_ParseTuple("n"), which does the right thing. (An obscure test was trying to give a Decimal to list.pop()... doesn't make sense any more IMHO) * trying to write a few tests... ........ r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines Cause a PyObject_Malloc() failure to trigger a MemoryError, and then add 'if (PyErr_Occurred())' checks to various places so that NULL is returned properly. 2.4 backport candidate. ........ r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line Add MSVC8 project files to create wininst-8.exe. ........ r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines Clarify what "re-initialization" means for init_builtin() and init_dynamic(). Also remove warning about re-initialization as possibly raising an execption as both call _PyImport_FindExtension() which pulls any module that was already imported from the Python process' extension cache and just copies the __dict__ into the module stored in sys.modules. ........ r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines - update links - remove Sleepycat name now that they have been bought ........ r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line Case fix ........ r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines Fix name. ........ r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line [Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list. Will backport. ........ r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines A very minor bug fix: this code looks like it is designed to accept any hue value and do the modulo itself, except it doesn't quite do it in all cases. At least, the "cannot get here" comment was wrong. ........ r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line Comment grammar ........ r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines Note that the excel_tab class is registered as the "excel-tab" dialect. Fixes 1572471. Make a similar change for the excel class and clean up references to the Dialects and Formatting Parameters section in a few places. ........ r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines Add missing NEWS entry for rev. 52129. ........ r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault when encoding non-BMP unicode characters. (Submitted by Ray Chason) ........ r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines Add version number to the link to the python documentation in /Developer/Documentation/Python, better for users that install multiple versions of python. ........ r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines Fix for bug #1570284 ........ r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a universal build of python on OSX 10.3 to ensure that those flags can be used to compile code (the universal build uses compiler flags that aren't supported on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and BLDSHARED. ........ r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines MacOSX: The universal build requires that users have the MacOSX10.4u SDK installed to build extensions. This patch makes distutils emit a warning when the compiler should use an SDK but that SDK is not installed, hopefully reducing some confusion. ........ r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines MacOSX: add more logic to recognize the correct startup file to patch to the shell profile patching post-install script. ........ r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line Add news item for rev. 52211 change ........ r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line Fix wording in comment ........ r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines Patch #1572724: fix typo ('=' instead of '==') in _msi.c. ........ r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines List gc.get_count() in the module docstring. ........ r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line Bug #1565150: Fix subsecond processing for os.utime on Windows. ........ r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines MacOSX: fix permission problem in the generated installer ........ r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1575746: fix typo in property() docs. ........ r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #813342: Start the IDLE subprocess with -Qnew if the parent is started with that option. ........ r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1565919: document set types in the Language Reference. ........ r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1550524: better heuristics to find correct class definition in inspect.findsource(). ........ r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode arguments with the system default encoding just like the write() method does, instead of converting it to a raw buffer. ........ r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1546628: add a note about urlparse.urljoin() and absolute paths. ........ r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1545497: when given an explicit base, int() did ignore NULs embedded in the string to convert. ........ r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines Add a note to fpectl docs that it's not built by default (bug #1556261). ........ r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560114: the Mac filesystem does have accurate information about the case of filenames. ........ r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines Small grammar fix, thanks Sjoerd. ........ r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines Fix tarfile depending on buggy int('1\0', base) behavior. ........ r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). ........ r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560179: speed up posixpath.(dir|base)name ........ r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines Clean up the language of a sentence relating to the connect() function and user-defined datatypes. ........ r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines Update the peephole optimizer to remove more dead code (jumps after returns) and inline jumps to returns. ........ r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines Patch #1576954: Update VC6 build directory; remove redundant files in VC7. Will backport to 2.5. ........ r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line Patch #1576166: Support os.utime for directories on Windows NT+. ........ r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines Patch #1577551: Add ctypes and ET build support for VC6. Will backport to 2.5. ........ r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line Loosen the test for equal time stamps. ........ r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines Bug #1567666: Emulate GetFileAttributesExA for Win95. Will backport to 2.5. ........ r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines Round to int, because some systems support sub-second time stamps in stat, but not in utime. Also be consistent with modifying only mtime, not atime. ........ r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines Set the eol-style for project files to "CRLF". ........ r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines Drop binary property on dsp files, set eol-style to CRLF instead. ........ r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines Remove binary property, set eol-style to CRLF instead. ........ r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines Mention the bdist_msi module. Will backport to 2.5. ........ r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines Fix turtle so that you can launch the demo2 function on its own instead of only when the module is launched as a script. ........ r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines Patch #1457736: Update VC6 to use current PCbuild settings. Will backport to 2.5. ........ r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines Remove obsolete file. Will backport. ........ r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines Forward-port r52358: - Bug #1578513: Cross compilation was broken by a change to configure. Repair so that it's back to how it was in 2.4.3. ........ r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines ctypes callback functions only support 'fundamental' result types. Check this and raise an error when something else is used - before this change ctypes would hang or crash when such a callback was called. This is a partial fix for #1574584. Will backport to release25-maint. ........ r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines newIobject(): repaired incorrect cast to quiet MSVC warning. ........ r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines Whitespace normalization. ........ r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines Add missing svn:eol-style to text files. ........ r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines Add check for the PyArg_ParseTuple format, and declare it if it is supported. ........ r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines Fix various minor errors in passing arguments to PyArg_ParseTuple. ........ r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines Restore CFLAGS after checking for __attribute__ ........ r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line [Bug #1576348] Fix typo in example ........ r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines Port test___future__ to unittest. ........ r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580674: with this patch os.readlink uses the filesystem encoding to decode unicode objects and returns an unicode object when the argument is one. ........ r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580872: Remove duplicate declaration of PyCallable_Check. Will backport to 2.5. ........ r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that ctypes isn't considered as requiring executable stacks. Will backport to 2.5. ........ r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines Remove passwd.adjunct.byname from list of maps for test_nis. Will backport to 2.5. ........ r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated ........ r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line [Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation. Reported by David Faure. ........ r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line Typo fix ........ r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines Patch #1549049: Rewrite type conversion in structmember. Fixes #1545696 and #1566140. Will backport to 2.5. ........ r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines Check for values.h. Will backport. ........ r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines Get DBL_MAX from float.h not values.h. Will backport. ........ r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1567274: Support SMTP over TLS. ........ r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line Set svn:keywords property ........ r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line Add item ........ r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line Some wording changes and markup fixes ........ r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1585690] Note that line_num was added in Python 2.5 ........ r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1583946] Reword description of server and issuer ........ r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1562583] Mention the set_reuse_addr() method ........ r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines [Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring. Backport candidate. Though it's an API change, this is a pretty obscure portion of the API. ........ r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules ........ r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1576241] Let functools.wraps work with built-in functions ........ r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error ........ r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line Clarify docstring ........ r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines [Patch #1574068 by Scott Dial] urllib and urllib2 were using base64.encodestring() for encoding authentication data. encodestring() can include newlines for very long input, which produced broken HTTP headers. ........ r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line Check db_setup_debug for a few print statements; change sqlite_setup_debug to False ........ r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line [Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed ........ r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines WindowsError.str should display the windows error code, not the posix error code; with test. Fixes #1576174. Will backport to release25-maint. ........ r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines Modulefinder now handles absolute and relative imports, including tests. Will backport to release25-maint. ........ r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1552024: add decorator support to unparse.py demo script. ........ r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines Port test_bufio to unittest. ........ r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines Convert test_global, test_scope and test_grammar to unittest. I tried to enclose all tests which must be run at the toplevel (instead of inside a method) in exec statements. ........ r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines Update outstanding bugs test file. ........ r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_math to unittest. ........ r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_opcodes to unittest. ........ r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines Fix nth() itertool recipe. ........ r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines make test_grammar pass with python -O ........ r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines Add some asserts. In sysmodule, I think these were to try to silence some warnings from Klokwork. They verify the assumptions of the format of svn version output. The assert in the thread module helped debug a problem on HP-UX. ........ r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines Fix warnings with HP's C compiler. It doesn't recognize that infinite loops are, um, infinite. These conditions should not be able to happen. Will backport. ........ r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines Fix crash in test on HP-UX. Apparently, it's not possible to delete a lock if it's held (even by the current thread). Will backport. ........ r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines Fix bug #1565514, SystemError not raised on too many nested blocks. It seems like this should be a different error than SystemError, but I don't have any great ideas and SystemError was raised in 2.4 and earlier. Will backport. ........ r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines Prevent crash if alloc of garbage fails. Found by Typo.pl. Will backport. ........ r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either. Will backport. ........ r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines Fix test_modulefinder so it doesn't fail when run after test_distutils. ........ r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines From SF 1557890, fix problem of using wrong type in example. Will backport. ........ r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and fix all codecs file wrappers to work correctly with the "with" statement (bug #1586513). ........ r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines Clean up a leftover from old listcomp generation code. ........ r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines Bug #1586448: the compiler module now emits the same bytecode for list comprehensions as the builtin compiler, using the LIST_APPEND opcode. ........ r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines Remove trailing comma. ........ r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1357915: allow all sequence types for shell arguments in subprocess. ........ r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines Patch #1583880: fix tarfile's problems with long names and posix/ GNU modes. ........ r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines Test assert if __debug__ is true. ........ r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines Fix the new EncodedFile test to work with big endian platforms. ........ r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders. ........ r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586773: extend hashlib docstring. ........ r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines Update comments, remove commented out code. Move assembler structure next to assembler code to make it easier to move it to a separate file. ........ r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1576657: when setting a KeyError for a tuple key, make sure that the tuple isn't used as the "exception arguments tuple". ........ r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_mmap to unittest. ........ r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_poll to unittest. ........ r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_nis to unittest. ........ r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_types to unittest. ........ r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cookie to unittest. ........ r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cgi to unittest. ........ r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines Completely convert test_httplib to unittest. ........ r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines Convert test_MimeWriter to unittest. ........ r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_openpty to unittest. ........ r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines Remove leftover test output file. ........ r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines Move the check for openpty to the beginning. ........ r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines Add tests for basic argument errors. ........ r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines Add tests for incremental codecs with an errors argument. ........ r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line Fix refleak ........ r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line I'm assuming this is correct, it fixes the tests so they pass again ........ r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line Change to improve speed of _fixupChildren ........ r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now). ........ r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines Replace the XXX marker in the 'Arrays and pointers' reference manual section with a link to the tutorial sections. Will backport to release25-maint. ........ r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines Fix a code example by adding a missing import. Fixes #1557890. Will backport to release25-maint. ........ r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines Whitespace normalization. ........ r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines - Patch #1060577: Extract list of RPM files from spec file in bdist_rpm Will backport to 2.5. ........ r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines Bug #1588287: fix invalid assertion for `1,2` in debug builds. Will backport ........ r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line Update link ........ r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line note that user can control directory location even if default dir is used ........ r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines Fix a number of typos in strings and comments (sf#1589070) ........ r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines Whitespace changes to make the source more compliant with PEP8 (SF#1589070) ........ r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines Fix markup. Will backport to release25-maint. ........ r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines Fix grammatical error as well. Will backport to release25-maint. ........ r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line Add missing word ........ r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines Correctly forward exception in instance_contains(). Fixes #1591996. Patch contributed by Neal Norwitz. Will backport. ........ r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines News entry for 52662. ........ r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1351744: Add askyesnocancel helper for tkMessageBox. ........ r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1592072: fix docs for return value of PyErr_CheckSignals. ........ r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines Bug #1592533: rename variable in heapq doc example, to avoid shadowing "sorted". ........ r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line Add section on the functional module ........ r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line Add section on operator module; make a few edits ........ r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line Add table of contents; this required fixing a few headings. Some more smalle edits. ........ r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line More edits ........ r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines Patch #838546: Make terminal become controlling in pty.fork(). Will backport to 2.5. ........ r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines Patch #1592250: Add elidge argument to Tkinter.Text.search. ........ r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines [Bug #1569790] mailbox.Maildir.get_folder() loses factory information Both the Maildir and MH classes had this bug; the patch fixes both classes and adds a test. Will backport to 25-maint. ........ r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line [Patch #1514544 by David Watson] use fsync() to ensure data is really on disk ........ r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines Replace C++ comment with C comment (fixes SF bug #1593525). ........ r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines [Patch #1514543] mailbox (Maildir): avoid losing messages on name clash Two changes: Where possible, use link()/remove() to move files into a directory; this makes it easier to avoid overwriting an existing file. Use _create_carefully() to create files in tmp/, which uses O_EXCL. Backport candidate. ........ r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines Fix SF#1566719: not creating site-packages (or other target directory) when installing .egg-info for a project that contains no modules or packages, while using --root (as in bdist_rpm). ........ r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line Reword entry ........ r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line [Feature request #1542920] Link to wsgi.org ........ r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594742: wrong word in stringobject doc. ........ r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594758: wording improvement for dict.update() docs. ........ r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1065257: Support passing open files as body in HTTPConnection.request(). ........ r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines Patch #1355023: support whence argument for GzipFile.seek. ........ r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines Bug #1067760: Deprecate passing floats to file.seek. ........ r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1359217: Ignore 2xx response before 150 response. Will backport to 2.5. ........ r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines Patch #1360200: Use unmangled_version RPM spec field to deal with file name mangling. Will backport to 2.5. ........ r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines Fix typo. ........ r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines Bug #1594809: add a note to README regarding PYTHONPATH and make install. ........ r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines Bug #1597576: mention that the new base64 api has been introduced in py2.4. ........ r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines Bug #1597824: return the registered function from atexit.register() to facilitate usage as a decorator. ........ r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines Bug #1588217: don't parse "= " as a soft line break in binascii's a2b_qp() function, instead leave it in the string as quopri.decode() does. ........ r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines Remove file-locking in MH.pack() method. This change looks massive but it's mostly a re-indenting after removing some try...finally blocks. Also adds a test case that does a pack() while the mailbox is locked; this test would have turned up bugs in the original code on some platforms. In both nmh and GNU Mailutils' implementation of MH-format mailboxes, no locking is done of individual message files when renaming them. The original mailbox.py code did do locking, which meant that message files had to be opened. This code was buggy on certain platforms (found through reading the code); there were code paths that closed the file object and then called _unlock_file() on it. Will backport to 25-maint once I see how the buildbots react to this patch. ........ r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines Patch #1538878: Don't make tkSimpleDialog dialogs transient if the parent window is withdrawn. This mirrors what dialog.tcl does. Will backport to 2.5. ........ r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines Patch #1594554: Always close a tkSimpleDialog on ok(), even if an exception occurs. Will backport to 2.5. ........ r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines Patch #1472877: Fix Tix subwidget name resolution. Will backport to 2.5. ........ r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line Expand checking in test_sha ........ r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines Patch [ 1586791 ] better error msgs for some TypeErrors ........ r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines Make cStringIO.truncate raise IOError for negative arguments (even for -1). Fixes the last bit of #1359365. ........ r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line Add a test case of data w/ bytes > 127 ........ r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines Patch #1070046: Marshal new-style objects like InstanceType in xmlrpclib. ........ r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines Speed up function calls into the math module by using METH_O. There should be no functional changes. However, the error msgs are slightly different. Also verified that the module dict is not NULL on init. ........ r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines markup fix ........ r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines Further markup fix. ........ r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines Jython compatibility fix: if uu.decode() opened its output file, be sure to close it. ........ r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines Bug #1599782: Fix segfault on bsddb.db.DB().type(). The problem is that _DB_get_type() can't be called without the GIL because it calls a bunch of PyErr_* APIs when an error occurs. There were no other cases in this file that it was called without the GIL. Removing the BEGIN/END THREAD around _DB_get_type() made everything work. Will backport. ........ r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line Oops, convert tabs to spaces ........ r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line Fix SF #1599879, socket.gethostname should ref getfqdn directly. ........ r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines Conditionalize definition of _CRT_SECURE_NO_DEPRECATE and _CRT_NONSTDC_NO_DEPRECATE. Will backport. ........ r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines Patch #1362975: Rework CodeContext indentation algorithm to avoid hard-coding pixel widths. Also make the text's scrollbar a child of the text frame, not the top widget. ........ r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig')) SF bug #1601501. ........ r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines Bug #1601630: little improvement to getopt docs ........ r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines a test for an error condition not covered by existing tests (noticed this when writing the equivalent code for pypy) ........ r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line Fix and/add typo ........ r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line ... and the number of the counting shall be three. ........ r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line Fix bug #1598620: A ctypes structure cannot contain itself. ........ r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines Disable _XOPEN_SOURCE on NetBSD 1.x. Will backport to 2.5 ........ r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines Bug #1603321: make pstats.Stats accept Unicode file paths. ........ r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines Bug #1603789: grammatical error in Tkinter docs. ........ r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines Fix #1563807: _ctypes built on AIX fails with ld ffi error. The contents of ffi_darwin.c must be compiled unless __APPLE__ is defined and __ppc__ is not. Will backport. ........ r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines Forgot a case where the locals can now be a general mapping instead of just a dictionary. (backporting...) ........ r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines Update version. ........ r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines Move xdrlib tests from the module into a separate test script, port the tests to unittest and add a few new tests. ........ r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line Add name to credits (for untokenize). ........ r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines Move IDLE news into NEWS.txt. ........ r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines Patch #1544279: Improve thread-safety of the socket module by moving the sock_addr_t storage out of the socket object. Will backport to 2.5. ........ r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines Patch #1371075: Make ConfigParser accept optional dict type for ordering, sorting, etc. ........ r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines - Fix build failure on kfreebsd and on the hurd. ........ r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines fix a versionchanged tag ........ r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines Fix pickle doc typo Patch #1608758 ........ r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines Patch #1610437: fix a tarfile bug with long filename headers. ........ r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines Fix a bad assumption that all objects assigned to '__loader__' on a module will have a '_files' attribute. ........ r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines RFE #1592899: mention string.maketrans() in docs for str.translate, remove reference to the old regex module in the former's doc. ........ r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line Eliminate two redundant calls to PyObject_Hash(). ........ r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209). ........ r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug 1576657). ........ r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines Add test for SF bug 1576657 ........ r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines #1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force English output. ........ r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines Patch #1608267: fix a race condition in os.makedirs() is the directory to be created is already there. ........ r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines - Fix the build of the library reference in info format. ........ r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line Fix a typo ........ r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines Move errno imports back to individual functions. ........ r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line Patch by Jeremy Katz (SF #1609407) ........ r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line Patch by "cuppatea" (SF #1503765) ........
5129 lines
123 KiB
C
5129 lines
123 KiB
C
/* String object implementation */
|
||
|
||
#define PY_SSIZE_T_CLEAN
|
||
|
||
#include "Python.h"
|
||
|
||
#include <ctype.h>
|
||
|
||
#ifdef COUNT_ALLOCS
|
||
int null_strings, one_strings;
|
||
#endif
|
||
|
||
static PyStringObject *characters[UCHAR_MAX + 1];
|
||
static PyStringObject *nullstring;
|
||
|
||
/* This dictionary holds all interned strings. Note that references to
|
||
strings in this dictionary are *not* counted in the string's ob_refcnt.
|
||
When the interned string reaches a refcnt of 0 the string deallocation
|
||
function will delete the reference from this dictionary.
|
||
|
||
Another way to look at this is that to say that the actual reference
|
||
count of a string is: s->ob_refcnt + (s->ob_sstate?2:0)
|
||
*/
|
||
static PyObject *interned;
|
||
|
||
/*
|
||
For both PyString_FromString() and PyString_FromStringAndSize(), the
|
||
parameter `size' denotes number of characters to allocate, not counting any
|
||
null terminating character.
|
||
|
||
For PyString_FromString(), the parameter `str' points to a null-terminated
|
||
string containing exactly `size' bytes.
|
||
|
||
For PyString_FromStringAndSize(), the parameter the parameter `str' is
|
||
either NULL or else points to a string containing at least `size' bytes.
|
||
For PyString_FromStringAndSize(), the string in the `str' parameter does
|
||
not have to be null-terminated. (Therefore it is safe to construct a
|
||
substring by calling `PyString_FromStringAndSize(origstring, substrlen)'.)
|
||
If `str' is NULL then PyString_FromStringAndSize() will allocate `size+1'
|
||
bytes (setting the last byte to the null terminating character) and you can
|
||
fill in the data yourself. If `str' is non-NULL then the resulting
|
||
PyString object must be treated as immutable and you must not fill in nor
|
||
alter the data yourself, since the strings may be shared.
|
||
|
||
The PyObject member `op->ob_size', which denotes the number of "extra
|
||
items" in a variable-size object, will contain the number of bytes
|
||
allocated for string data, not counting the null terminating character. It
|
||
is therefore equal to the equal to the `size' parameter (for
|
||
PyString_FromStringAndSize()) or the length of the string in the `str'
|
||
parameter (for PyString_FromString()).
|
||
*/
|
||
PyObject *
|
||
PyString_FromStringAndSize(const char *str, Py_ssize_t size)
|
||
{
|
||
register PyStringObject *op;
|
||
assert(size >= 0);
|
||
if (size == 0 && (op = nullstring) != NULL) {
|
||
#ifdef COUNT_ALLOCS
|
||
null_strings++;
|
||
#endif
|
||
Py_INCREF(op);
|
||
return (PyObject *)op;
|
||
}
|
||
if (size == 1 && str != NULL &&
|
||
(op = characters[*str & UCHAR_MAX]) != NULL)
|
||
{
|
||
#ifdef COUNT_ALLOCS
|
||
one_strings++;
|
||
#endif
|
||
Py_INCREF(op);
|
||
return (PyObject *)op;
|
||
}
|
||
|
||
/* Inline PyObject_NewVar */
|
||
op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
|
||
if (op == NULL)
|
||
return PyErr_NoMemory();
|
||
PyObject_INIT_VAR(op, &PyString_Type, size);
|
||
op->ob_shash = -1;
|
||
op->ob_sstate = SSTATE_NOT_INTERNED;
|
||
if (str != NULL)
|
||
Py_MEMCPY(op->ob_sval, str, size);
|
||
op->ob_sval[size] = '\0';
|
||
/* share short strings */
|
||
if (size == 0) {
|
||
PyObject *t = (PyObject *)op;
|
||
PyString_InternInPlace(&t);
|
||
op = (PyStringObject *)t;
|
||
nullstring = op;
|
||
Py_INCREF(op);
|
||
} else if (size == 1 && str != NULL) {
|
||
PyObject *t = (PyObject *)op;
|
||
PyString_InternInPlace(&t);
|
||
op = (PyStringObject *)t;
|
||
characters[*str & UCHAR_MAX] = op;
|
||
Py_INCREF(op);
|
||
}
|
||
return (PyObject *) op;
|
||
}
|
||
|
||
PyObject *
|
||
PyString_FromString(const char *str)
|
||
{
|
||
register size_t size;
|
||
register PyStringObject *op;
|
||
|
||
assert(str != NULL);
|
||
size = strlen(str);
|
||
if (size > PY_SSIZE_T_MAX) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"string is too long for a Python string");
|
||
return NULL;
|
||
}
|
||
if (size == 0 && (op = nullstring) != NULL) {
|
||
#ifdef COUNT_ALLOCS
|
||
null_strings++;
|
||
#endif
|
||
Py_INCREF(op);
|
||
return (PyObject *)op;
|
||
}
|
||
if (size == 1 && (op = characters[*str & UCHAR_MAX]) != NULL) {
|
||
#ifdef COUNT_ALLOCS
|
||
one_strings++;
|
||
#endif
|
||
Py_INCREF(op);
|
||
return (PyObject *)op;
|
||
}
|
||
|
||
/* Inline PyObject_NewVar */
|
||
op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
|
||
if (op == NULL)
|
||
return PyErr_NoMemory();
|
||
PyObject_INIT_VAR(op, &PyString_Type, size);
|
||
op->ob_shash = -1;
|
||
op->ob_sstate = SSTATE_NOT_INTERNED;
|
||
Py_MEMCPY(op->ob_sval, str, size+1);
|
||
/* share short strings */
|
||
if (size == 0) {
|
||
PyObject *t = (PyObject *)op;
|
||
PyString_InternInPlace(&t);
|
||
op = (PyStringObject *)t;
|
||
nullstring = op;
|
||
Py_INCREF(op);
|
||
} else if (size == 1) {
|
||
PyObject *t = (PyObject *)op;
|
||
PyString_InternInPlace(&t);
|
||
op = (PyStringObject *)t;
|
||
characters[*str & UCHAR_MAX] = op;
|
||
Py_INCREF(op);
|
||
}
|
||
return (PyObject *) op;
|
||
}
|
||
|
||
PyObject *
|
||
PyString_FromFormatV(const char *format, va_list vargs)
|
||
{
|
||
va_list count;
|
||
Py_ssize_t n = 0;
|
||
const char* f;
|
||
char *s;
|
||
PyObject* string;
|
||
|
||
#ifdef VA_LIST_IS_ARRAY
|
||
Py_MEMCPY(count, vargs, sizeof(va_list));
|
||
#else
|
||
#ifdef __va_copy
|
||
__va_copy(count, vargs);
|
||
#else
|
||
count = vargs;
|
||
#endif
|
||
#endif
|
||
/* step 1: figure out how large a buffer we need */
|
||
for (f = format; *f; f++) {
|
||
if (*f == '%') {
|
||
const char* p = f;
|
||
while (*++f && *f != '%' && !isalpha(Py_CHARMASK(*f)))
|
||
;
|
||
|
||
/* skip the 'l' or 'z' in {%ld, %zd, %lu, %zu} since
|
||
* they don't affect the amount of space we reserve.
|
||
*/
|
||
if ((*f == 'l' || *f == 'z') &&
|
||
(f[1] == 'd' || f[1] == 'u'))
|
||
++f;
|
||
|
||
switch (*f) {
|
||
case 'c':
|
||
(void)va_arg(count, int);
|
||
/* fall through... */
|
||
case '%':
|
||
n++;
|
||
break;
|
||
case 'd': case 'u': case 'i': case 'x':
|
||
(void) va_arg(count, int);
|
||
/* 20 bytes is enough to hold a 64-bit
|
||
integer. Decimal takes the most space.
|
||
This isn't enough for octal. */
|
||
n += 20;
|
||
break;
|
||
case 's':
|
||
s = va_arg(count, char*);
|
||
n += strlen(s);
|
||
break;
|
||
case 'p':
|
||
(void) va_arg(count, int);
|
||
/* maximum 64-bit pointer representation:
|
||
* 0xffffffffffffffff
|
||
* so 19 characters is enough.
|
||
* XXX I count 18 -- what's the extra for?
|
||
*/
|
||
n += 19;
|
||
break;
|
||
default:
|
||
/* if we stumble upon an unknown
|
||
formatting code, copy the rest of
|
||
the format string to the output
|
||
string. (we cannot just skip the
|
||
code, since there's no way to know
|
||
what's in the argument list) */
|
||
n += strlen(p);
|
||
goto expand;
|
||
}
|
||
} else
|
||
n++;
|
||
}
|
||
expand:
|
||
/* step 2: fill the buffer */
|
||
/* Since we've analyzed how much space we need for the worst case,
|
||
use sprintf directly instead of the slower PyOS_snprintf. */
|
||
string = PyString_FromStringAndSize(NULL, n);
|
||
if (!string)
|
||
return NULL;
|
||
|
||
s = PyString_AsString(string);
|
||
|
||
for (f = format; *f; f++) {
|
||
if (*f == '%') {
|
||
const char* p = f++;
|
||
Py_ssize_t i;
|
||
int longflag = 0;
|
||
int size_tflag = 0;
|
||
/* parse the width.precision part (we're only
|
||
interested in the precision value, if any) */
|
||
n = 0;
|
||
while (isdigit(Py_CHARMASK(*f)))
|
||
n = (n*10) + *f++ - '0';
|
||
if (*f == '.') {
|
||
f++;
|
||
n = 0;
|
||
while (isdigit(Py_CHARMASK(*f)))
|
||
n = (n*10) + *f++ - '0';
|
||
}
|
||
while (*f && *f != '%' && !isalpha(Py_CHARMASK(*f)))
|
||
f++;
|
||
/* handle the long flag, but only for %ld and %lu.
|
||
others can be added when necessary. */
|
||
if (*f == 'l' && (f[1] == 'd' || f[1] == 'u')) {
|
||
longflag = 1;
|
||
++f;
|
||
}
|
||
/* handle the size_t flag. */
|
||
if (*f == 'z' && (f[1] == 'd' || f[1] == 'u')) {
|
||
size_tflag = 1;
|
||
++f;
|
||
}
|
||
|
||
switch (*f) {
|
||
case 'c':
|
||
*s++ = va_arg(vargs, int);
|
||
break;
|
||
case 'd':
|
||
if (longflag)
|
||
sprintf(s, "%ld", va_arg(vargs, long));
|
||
else if (size_tflag)
|
||
sprintf(s, "%" PY_FORMAT_SIZE_T "d",
|
||
va_arg(vargs, Py_ssize_t));
|
||
else
|
||
sprintf(s, "%d", va_arg(vargs, int));
|
||
s += strlen(s);
|
||
break;
|
||
case 'u':
|
||
if (longflag)
|
||
sprintf(s, "%lu",
|
||
va_arg(vargs, unsigned long));
|
||
else if (size_tflag)
|
||
sprintf(s, "%" PY_FORMAT_SIZE_T "u",
|
||
va_arg(vargs, size_t));
|
||
else
|
||
sprintf(s, "%u",
|
||
va_arg(vargs, unsigned int));
|
||
s += strlen(s);
|
||
break;
|
||
case 'i':
|
||
sprintf(s, "%i", va_arg(vargs, int));
|
||
s += strlen(s);
|
||
break;
|
||
case 'x':
|
||
sprintf(s, "%x", va_arg(vargs, int));
|
||
s += strlen(s);
|
||
break;
|
||
case 's':
|
||
p = va_arg(vargs, char*);
|
||
i = strlen(p);
|
||
if (n > 0 && i > n)
|
||
i = n;
|
||
Py_MEMCPY(s, p, i);
|
||
s += i;
|
||
break;
|
||
case 'p':
|
||
sprintf(s, "%p", va_arg(vargs, void*));
|
||
/* %p is ill-defined: ensure leading 0x. */
|
||
if (s[1] == 'X')
|
||
s[1] = 'x';
|
||
else if (s[1] != 'x') {
|
||
memmove(s+2, s, strlen(s)+1);
|
||
s[0] = '0';
|
||
s[1] = 'x';
|
||
}
|
||
s += strlen(s);
|
||
break;
|
||
case '%':
|
||
*s++ = '%';
|
||
break;
|
||
default:
|
||
strcpy(s, p);
|
||
s += strlen(s);
|
||
goto end;
|
||
}
|
||
} else
|
||
*s++ = *f;
|
||
}
|
||
|
||
end:
|
||
_PyString_Resize(&string, s - PyString_AS_STRING(string));
|
||
return string;
|
||
}
|
||
|
||
PyObject *
|
||
PyString_FromFormat(const char *format, ...)
|
||
{
|
||
PyObject* ret;
|
||
va_list vargs;
|
||
|
||
#ifdef HAVE_STDARG_PROTOTYPES
|
||
va_start(vargs, format);
|
||
#else
|
||
va_start(vargs);
|
||
#endif
|
||
ret = PyString_FromFormatV(format, vargs);
|
||
va_end(vargs);
|
||
return ret;
|
||
}
|
||
|
||
|
||
PyObject *PyString_Decode(const char *s,
|
||
Py_ssize_t size,
|
||
const char *encoding,
|
||
const char *errors)
|
||
{
|
||
PyObject *v, *str;
|
||
|
||
str = PyString_FromStringAndSize(s, size);
|
||
if (str == NULL)
|
||
return NULL;
|
||
v = PyString_AsDecodedString(str, encoding, errors);
|
||
Py_DECREF(str);
|
||
return v;
|
||
}
|
||
|
||
PyObject *PyString_AsDecodedObject(PyObject *str,
|
||
const char *encoding,
|
||
const char *errors)
|
||
{
|
||
PyObject *v;
|
||
|
||
if (!PyString_Check(str)) {
|
||
PyErr_BadArgument();
|
||
goto onError;
|
||
}
|
||
|
||
if (encoding == NULL) {
|
||
#ifdef Py_USING_UNICODE
|
||
encoding = PyUnicode_GetDefaultEncoding();
|
||
#else
|
||
PyErr_SetString(PyExc_ValueError, "no encoding specified");
|
||
goto onError;
|
||
#endif
|
||
}
|
||
|
||
/* Decode via the codec registry */
|
||
v = PyCodec_Decode(str, encoding, errors);
|
||
if (v == NULL)
|
||
goto onError;
|
||
|
||
return v;
|
||
|
||
onError:
|
||
return NULL;
|
||
}
|
||
|
||
PyObject *PyString_AsDecodedString(PyObject *str,
|
||
const char *encoding,
|
||
const char *errors)
|
||
{
|
||
PyObject *v;
|
||
|
||
v = PyString_AsDecodedObject(str, encoding, errors);
|
||
if (v == NULL)
|
||
goto onError;
|
||
|
||
#ifdef Py_USING_UNICODE
|
||
/* Convert Unicode to a string using the default encoding */
|
||
if (PyUnicode_Check(v)) {
|
||
PyObject *temp = v;
|
||
v = PyUnicode_AsEncodedString(v, NULL, NULL);
|
||
Py_DECREF(temp);
|
||
if (v == NULL)
|
||
goto onError;
|
||
}
|
||
#endif
|
||
if (!PyString_Check(v)) {
|
||
PyErr_Format(PyExc_TypeError,
|
||
"decoder did not return a string object (type=%.400s)",
|
||
v->ob_type->tp_name);
|
||
Py_DECREF(v);
|
||
goto onError;
|
||
}
|
||
|
||
return v;
|
||
|
||
onError:
|
||
return NULL;
|
||
}
|
||
|
||
PyObject *PyString_Encode(const char *s,
|
||
Py_ssize_t size,
|
||
const char *encoding,
|
||
const char *errors)
|
||
{
|
||
PyObject *v, *str;
|
||
|
||
str = PyString_FromStringAndSize(s, size);
|
||
if (str == NULL)
|
||
return NULL;
|
||
v = PyString_AsEncodedString(str, encoding, errors);
|
||
Py_DECREF(str);
|
||
return v;
|
||
}
|
||
|
||
PyObject *PyString_AsEncodedObject(PyObject *str,
|
||
const char *encoding,
|
||
const char *errors)
|
||
{
|
||
PyObject *v;
|
||
|
||
if (!PyString_Check(str)) {
|
||
PyErr_BadArgument();
|
||
goto onError;
|
||
}
|
||
|
||
if (encoding == NULL) {
|
||
#ifdef Py_USING_UNICODE
|
||
encoding = PyUnicode_GetDefaultEncoding();
|
||
#else
|
||
PyErr_SetString(PyExc_ValueError, "no encoding specified");
|
||
goto onError;
|
||
#endif
|
||
}
|
||
|
||
/* Encode via the codec registry */
|
||
v = PyCodec_Encode(str, encoding, errors);
|
||
if (v == NULL)
|
||
goto onError;
|
||
|
||
return v;
|
||
|
||
onError:
|
||
return NULL;
|
||
}
|
||
|
||
PyObject *PyString_AsEncodedString(PyObject *str,
|
||
const char *encoding,
|
||
const char *errors)
|
||
{
|
||
PyObject *v;
|
||
|
||
v = PyString_AsEncodedObject(str, encoding, errors);
|
||
if (v == NULL)
|
||
goto onError;
|
||
|
||
#ifdef Py_USING_UNICODE
|
||
/* Convert Unicode to a string using the default encoding */
|
||
if (PyUnicode_Check(v)) {
|
||
PyObject *temp = v;
|
||
v = PyUnicode_AsEncodedString(v, NULL, NULL);
|
||
Py_DECREF(temp);
|
||
if (v == NULL)
|
||
goto onError;
|
||
}
|
||
#endif
|
||
if (!PyString_Check(v)) {
|
||
PyErr_Format(PyExc_TypeError,
|
||
"encoder did not return a string object (type=%.400s)",
|
||
v->ob_type->tp_name);
|
||
Py_DECREF(v);
|
||
goto onError;
|
||
}
|
||
|
||
return v;
|
||
|
||
onError:
|
||
return NULL;
|
||
}
|
||
|
||
static void
|
||
string_dealloc(PyObject *op)
|
||
{
|
||
switch (PyString_CHECK_INTERNED(op)) {
|
||
case SSTATE_NOT_INTERNED:
|
||
break;
|
||
|
||
case SSTATE_INTERNED_MORTAL:
|
||
/* revive dead object temporarily for DelItem */
|
||
op->ob_refcnt = 3;
|
||
if (PyDict_DelItem(interned, op) != 0)
|
||
Py_FatalError(
|
||
"deletion of interned string failed");
|
||
break;
|
||
|
||
case SSTATE_INTERNED_IMMORTAL:
|
||
Py_FatalError("Immortal interned string died.");
|
||
|
||
default:
|
||
Py_FatalError("Inconsistent interned string state.");
|
||
}
|
||
op->ob_type->tp_free(op);
|
||
}
|
||
|
||
/* Unescape a backslash-escaped string. If unicode is non-zero,
|
||
the string is a u-literal. If recode_encoding is non-zero,
|
||
the string is UTF-8 encoded and should be re-encoded in the
|
||
specified encoding. */
|
||
|
||
PyObject *PyString_DecodeEscape(const char *s,
|
||
Py_ssize_t len,
|
||
const char *errors,
|
||
Py_ssize_t unicode,
|
||
const char *recode_encoding)
|
||
{
|
||
int c;
|
||
char *p, *buf;
|
||
const char *end;
|
||
PyObject *v;
|
||
Py_ssize_t newlen = recode_encoding ? 4*len:len;
|
||
v = PyString_FromStringAndSize((char *)NULL, newlen);
|
||
if (v == NULL)
|
||
return NULL;
|
||
p = buf = PyString_AsString(v);
|
||
end = s + len;
|
||
while (s < end) {
|
||
if (*s != '\\') {
|
||
non_esc:
|
||
#ifdef Py_USING_UNICODE
|
||
if (recode_encoding && (*s & 0x80)) {
|
||
PyObject *u, *w;
|
||
char *r;
|
||
const char* t;
|
||
Py_ssize_t rn;
|
||
t = s;
|
||
/* Decode non-ASCII bytes as UTF-8. */
|
||
while (t < end && (*t & 0x80)) t++;
|
||
u = PyUnicode_DecodeUTF8(s, t - s, errors);
|
||
if(!u) goto failed;
|
||
|
||
/* Recode them in target encoding. */
|
||
w = PyUnicode_AsEncodedString(
|
||
u, recode_encoding, errors);
|
||
Py_DECREF(u);
|
||
if (!w) goto failed;
|
||
|
||
/* Append bytes to output buffer. */
|
||
assert(PyString_Check(w));
|
||
r = PyString_AS_STRING(w);
|
||
rn = PyString_GET_SIZE(w);
|
||
Py_MEMCPY(p, r, rn);
|
||
p += rn;
|
||
Py_DECREF(w);
|
||
s = t;
|
||
} else {
|
||
*p++ = *s++;
|
||
}
|
||
#else
|
||
*p++ = *s++;
|
||
#endif
|
||
continue;
|
||
}
|
||
s++;
|
||
if (s==end) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"Trailing \\ in string");
|
||
goto failed;
|
||
}
|
||
switch (*s++) {
|
||
/* XXX This assumes ASCII! */
|
||
case '\n': break;
|
||
case '\\': *p++ = '\\'; break;
|
||
case '\'': *p++ = '\''; break;
|
||
case '\"': *p++ = '\"'; break;
|
||
case 'b': *p++ = '\b'; break;
|
||
case 'f': *p++ = '\014'; break; /* FF */
|
||
case 't': *p++ = '\t'; break;
|
||
case 'n': *p++ = '\n'; break;
|
||
case 'r': *p++ = '\r'; break;
|
||
case 'v': *p++ = '\013'; break; /* VT */
|
||
case 'a': *p++ = '\007'; break; /* BEL, not classic C */
|
||
case '0': case '1': case '2': case '3':
|
||
case '4': case '5': case '6': case '7':
|
||
c = s[-1] - '0';
|
||
if ('0' <= *s && *s <= '7') {
|
||
c = (c<<3) + *s++ - '0';
|
||
if ('0' <= *s && *s <= '7')
|
||
c = (c<<3) + *s++ - '0';
|
||
}
|
||
*p++ = c;
|
||
break;
|
||
case 'x':
|
||
if (isxdigit(Py_CHARMASK(s[0]))
|
||
&& isxdigit(Py_CHARMASK(s[1]))) {
|
||
unsigned int x = 0;
|
||
c = Py_CHARMASK(*s);
|
||
s++;
|
||
if (isdigit(c))
|
||
x = c - '0';
|
||
else if (islower(c))
|
||
x = 10 + c - 'a';
|
||
else
|
||
x = 10 + c - 'A';
|
||
x = x << 4;
|
||
c = Py_CHARMASK(*s);
|
||
s++;
|
||
if (isdigit(c))
|
||
x += c - '0';
|
||
else if (islower(c))
|
||
x += 10 + c - 'a';
|
||
else
|
||
x += 10 + c - 'A';
|
||
*p++ = x;
|
||
break;
|
||
}
|
||
if (!errors || strcmp(errors, "strict") == 0) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"invalid \\x escape");
|
||
goto failed;
|
||
}
|
||
if (strcmp(errors, "replace") == 0) {
|
||
*p++ = '?';
|
||
} else if (strcmp(errors, "ignore") == 0)
|
||
/* do nothing */;
|
||
else {
|
||
PyErr_Format(PyExc_ValueError,
|
||
"decoding error; "
|
||
"unknown error handling code: %.400s",
|
||
errors);
|
||
goto failed;
|
||
}
|
||
#ifndef Py_USING_UNICODE
|
||
case 'u':
|
||
case 'U':
|
||
case 'N':
|
||
if (unicode) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"Unicode escapes not legal "
|
||
"when Unicode disabled");
|
||
goto failed;
|
||
}
|
||
#endif
|
||
default:
|
||
*p++ = '\\';
|
||
s--;
|
||
goto non_esc; /* an arbitry number of unescaped
|
||
UTF-8 bytes may follow. */
|
||
}
|
||
}
|
||
if (p-buf < newlen)
|
||
_PyString_Resize(&v, p - buf);
|
||
return v;
|
||
failed:
|
||
Py_DECREF(v);
|
||
return NULL;
|
||
}
|
||
|
||
/* -------------------------------------------------------------------- */
|
||
/* object api */
|
||
|
||
static Py_ssize_t
|
||
string_getsize(register PyObject *op)
|
||
{
|
||
char *s;
|
||
Py_ssize_t len;
|
||
if (PyString_AsStringAndSize(op, &s, &len))
|
||
return -1;
|
||
return len;
|
||
}
|
||
|
||
static /*const*/ char *
|
||
string_getbuffer(register PyObject *op)
|
||
{
|
||
char *s;
|
||
Py_ssize_t len;
|
||
if (PyString_AsStringAndSize(op, &s, &len))
|
||
return NULL;
|
||
return s;
|
||
}
|
||
|
||
Py_ssize_t
|
||
PyString_Size(register PyObject *op)
|
||
{
|
||
if (!PyString_Check(op))
|
||
return string_getsize(op);
|
||
return ((PyStringObject *)op) -> ob_size;
|
||
}
|
||
|
||
/*const*/ char *
|
||
PyString_AsString(register PyObject *op)
|
||
{
|
||
if (!PyString_Check(op))
|
||
return string_getbuffer(op);
|
||
return ((PyStringObject *)op) -> ob_sval;
|
||
}
|
||
|
||
int
|
||
PyString_AsStringAndSize(register PyObject *obj,
|
||
register char **s,
|
||
register Py_ssize_t *len)
|
||
{
|
||
if (s == NULL) {
|
||
PyErr_BadInternalCall();
|
||
return -1;
|
||
}
|
||
|
||
if (!PyString_Check(obj)) {
|
||
#ifdef Py_USING_UNICODE
|
||
if (PyUnicode_Check(obj)) {
|
||
obj = _PyUnicode_AsDefaultEncodedString(obj, NULL);
|
||
if (obj == NULL)
|
||
return -1;
|
||
}
|
||
else
|
||
#endif
|
||
{
|
||
PyErr_Format(PyExc_TypeError,
|
||
"expected string or Unicode object, "
|
||
"%.200s found", obj->ob_type->tp_name);
|
||
return -1;
|
||
}
|
||
}
|
||
|
||
*s = PyString_AS_STRING(obj);
|
||
if (len != NULL)
|
||
*len = PyString_GET_SIZE(obj);
|
||
else if (strlen(*s) != (size_t)PyString_GET_SIZE(obj)) {
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"expected string without null bytes");
|
||
return -1;
|
||
}
|
||
return 0;
|
||
}
|
||
|
||
/* -------------------------------------------------------------------- */
|
||
/* Methods */
|
||
|
||
#define STRINGLIB_CHAR char
|
||
|
||
#define STRINGLIB_CMP memcmp
|
||
#define STRINGLIB_LEN PyString_GET_SIZE
|
||
#define STRINGLIB_NEW PyString_FromStringAndSize
|
||
#define STRINGLIB_STR PyString_AS_STRING
|
||
|
||
#define STRINGLIB_EMPTY nullstring
|
||
|
||
#include "stringlib/fastsearch.h"
|
||
|
||
#include "stringlib/count.h"
|
||
#include "stringlib/find.h"
|
||
#include "stringlib/partition.h"
|
||
|
||
|
||
static int
|
||
string_print(PyStringObject *op, FILE *fp, int flags)
|
||
{
|
||
Py_ssize_t i;
|
||
char c;
|
||
int quote;
|
||
|
||
/* XXX Ought to check for interrupts when writing long strings */
|
||
if (! PyString_CheckExact(op)) {
|
||
int ret;
|
||
/* A str subclass may have its own __str__ method. */
|
||
op = (PyStringObject *) PyObject_Str((PyObject *)op);
|
||
if (op == NULL)
|
||
return -1;
|
||
ret = string_print(op, fp, flags);
|
||
Py_DECREF(op);
|
||
return ret;
|
||
}
|
||
if (flags & Py_PRINT_RAW) {
|
||
char *data = op->ob_sval;
|
||
Py_ssize_t size = op->ob_size;
|
||
while (size > INT_MAX) {
|
||
/* Very long strings cannot be written atomically.
|
||
* But don't write exactly INT_MAX bytes at a time
|
||
* to avoid memory aligment issues.
|
||
*/
|
||
const int chunk_size = INT_MAX & ~0x3FFF;
|
||
fwrite(data, 1, chunk_size, fp);
|
||
data += chunk_size;
|
||
size -= chunk_size;
|
||
}
|
||
#ifdef __VMS
|
||
if (size) fwrite(data, (int)size, 1, fp);
|
||
#else
|
||
fwrite(data, 1, (int)size, fp);
|
||
#endif
|
||
return 0;
|
||
}
|
||
|
||
/* figure out which quote to use; single is preferred */
|
||
quote = '\'';
|
||
if (memchr(op->ob_sval, '\'', op->ob_size) &&
|
||
!memchr(op->ob_sval, '"', op->ob_size))
|
||
quote = '"';
|
||
|
||
fputc(quote, fp);
|
||
for (i = 0; i < op->ob_size; i++) {
|
||
c = op->ob_sval[i];
|
||
if (c == quote || c == '\\')
|
||
fprintf(fp, "\\%c", c);
|
||
else if (c == '\t')
|
||
fprintf(fp, "\\t");
|
||
else if (c == '\n')
|
||
fprintf(fp, "\\n");
|
||
else if (c == '\r')
|
||
fprintf(fp, "\\r");
|
||
else if (c < ' ' || c >= 0x7f)
|
||
fprintf(fp, "\\x%02x", c & 0xff);
|
||
else
|
||
fputc(c, fp);
|
||
}
|
||
fputc(quote, fp);
|
||
return 0;
|
||
}
|
||
|
||
PyObject *
|
||
PyString_Repr(PyObject *obj, int smartquotes)
|
||
{
|
||
register PyStringObject* op = (PyStringObject*) obj;
|
||
size_t newsize = 2 + 4 * op->ob_size;
|
||
PyObject *v;
|
||
if (newsize > PY_SSIZE_T_MAX || newsize / 4 != op->ob_size) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"string is too large to make repr");
|
||
}
|
||
v = PyString_FromStringAndSize((char *)NULL, newsize);
|
||
if (v == NULL) {
|
||
return NULL;
|
||
}
|
||
else {
|
||
register Py_ssize_t i;
|
||
register char c;
|
||
register char *p;
|
||
int quote;
|
||
|
||
/* figure out which quote to use; single is preferred */
|
||
quote = '\'';
|
||
if (smartquotes &&
|
||
memchr(op->ob_sval, '\'', op->ob_size) &&
|
||
!memchr(op->ob_sval, '"', op->ob_size))
|
||
quote = '"';
|
||
|
||
p = PyString_AS_STRING(v);
|
||
*p++ = quote;
|
||
for (i = 0; i < op->ob_size; i++) {
|
||
/* There's at least enough room for a hex escape
|
||
and a closing quote. */
|
||
assert(newsize - (p - PyString_AS_STRING(v)) >= 5);
|
||
c = op->ob_sval[i];
|
||
if (c == quote || c == '\\')
|
||
*p++ = '\\', *p++ = c;
|
||
else if (c == '\t')
|
||
*p++ = '\\', *p++ = 't';
|
||
else if (c == '\n')
|
||
*p++ = '\\', *p++ = 'n';
|
||
else if (c == '\r')
|
||
*p++ = '\\', *p++ = 'r';
|
||
else if (c < ' ' || c >= 0x7f) {
|
||
/* For performance, we don't want to call
|
||
PyOS_snprintf here (extra layers of
|
||
function call). */
|
||
sprintf(p, "\\x%02x", c & 0xff);
|
||
p += 4;
|
||
}
|
||
else
|
||
*p++ = c;
|
||
}
|
||
assert(newsize - (p - PyString_AS_STRING(v)) >= 1);
|
||
*p++ = quote;
|
||
*p = '\0';
|
||
_PyString_Resize(
|
||
&v, (p - PyString_AS_STRING(v)));
|
||
return v;
|
||
}
|
||
}
|
||
|
||
static PyObject *
|
||
string_repr(PyObject *op)
|
||
{
|
||
return PyString_Repr(op, 1);
|
||
}
|
||
|
||
static PyObject *
|
||
string_str(PyObject *s)
|
||
{
|
||
assert(PyString_Check(s));
|
||
if (PyString_CheckExact(s)) {
|
||
Py_INCREF(s);
|
||
return s;
|
||
}
|
||
else {
|
||
/* Subtype -- return genuine string with the same value. */
|
||
PyStringObject *t = (PyStringObject *) s;
|
||
return PyString_FromStringAndSize(t->ob_sval, t->ob_size);
|
||
}
|
||
}
|
||
|
||
static Py_ssize_t
|
||
string_length(PyStringObject *a)
|
||
{
|
||
return a->ob_size;
|
||
}
|
||
|
||
static PyObject *
|
||
string_concat(register PyStringObject *a, register PyObject *bb)
|
||
{
|
||
register Py_ssize_t size;
|
||
register PyStringObject *op;
|
||
if (!PyString_Check(bb)) {
|
||
#ifdef Py_USING_UNICODE
|
||
if (PyUnicode_Check(bb))
|
||
return PyUnicode_Concat((PyObject *)a, bb);
|
||
#endif
|
||
PyErr_Format(PyExc_TypeError,
|
||
"cannot concatenate 'str' and '%.200s' objects",
|
||
bb->ob_type->tp_name);
|
||
return NULL;
|
||
}
|
||
#define b ((PyStringObject *)bb)
|
||
/* Optimize cases with empty left or right operand */
|
||
if ((a->ob_size == 0 || b->ob_size == 0) &&
|
||
PyString_CheckExact(a) && PyString_CheckExact(b)) {
|
||
if (a->ob_size == 0) {
|
||
Py_INCREF(bb);
|
||
return bb;
|
||
}
|
||
Py_INCREF(a);
|
||
return (PyObject *)a;
|
||
}
|
||
size = a->ob_size + b->ob_size;
|
||
if (size < 0) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"strings are too large to concat");
|
||
return NULL;
|
||
}
|
||
|
||
/* Inline PyObject_NewVar */
|
||
op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
|
||
if (op == NULL)
|
||
return PyErr_NoMemory();
|
||
PyObject_INIT_VAR(op, &PyString_Type, size);
|
||
op->ob_shash = -1;
|
||
op->ob_sstate = SSTATE_NOT_INTERNED;
|
||
Py_MEMCPY(op->ob_sval, a->ob_sval, a->ob_size);
|
||
Py_MEMCPY(op->ob_sval + a->ob_size, b->ob_sval, b->ob_size);
|
||
op->ob_sval[size] = '\0';
|
||
return (PyObject *) op;
|
||
#undef b
|
||
}
|
||
|
||
static PyObject *
|
||
string_repeat(register PyStringObject *a, register Py_ssize_t n)
|
||
{
|
||
register Py_ssize_t i;
|
||
register Py_ssize_t j;
|
||
register Py_ssize_t size;
|
||
register PyStringObject *op;
|
||
size_t nbytes;
|
||
if (n < 0)
|
||
n = 0;
|
||
/* watch out for overflows: the size can overflow int,
|
||
* and the # of bytes needed can overflow size_t
|
||
*/
|
||
size = a->ob_size * n;
|
||
if (n && size / n != a->ob_size) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"repeated string is too long");
|
||
return NULL;
|
||
}
|
||
if (size == a->ob_size && PyString_CheckExact(a)) {
|
||
Py_INCREF(a);
|
||
return (PyObject *)a;
|
||
}
|
||
nbytes = (size_t)size;
|
||
if (nbytes + sizeof(PyStringObject) <= nbytes) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"repeated string is too long");
|
||
return NULL;
|
||
}
|
||
op = (PyStringObject *)
|
||
PyObject_MALLOC(sizeof(PyStringObject) + nbytes);
|
||
if (op == NULL)
|
||
return PyErr_NoMemory();
|
||
PyObject_INIT_VAR(op, &PyString_Type, size);
|
||
op->ob_shash = -1;
|
||
op->ob_sstate = SSTATE_NOT_INTERNED;
|
||
op->ob_sval[size] = '\0';
|
||
if (a->ob_size == 1 && n > 0) {
|
||
memset(op->ob_sval, a->ob_sval[0] , n);
|
||
return (PyObject *) op;
|
||
}
|
||
i = 0;
|
||
if (i < size) {
|
||
Py_MEMCPY(op->ob_sval, a->ob_sval, a->ob_size);
|
||
i = a->ob_size;
|
||
}
|
||
while (i < size) {
|
||
j = (i <= size-i) ? i : size-i;
|
||
Py_MEMCPY(op->ob_sval+i, op->ob_sval, j);
|
||
i += j;
|
||
}
|
||
return (PyObject *) op;
|
||
}
|
||
|
||
/* String slice a[i:j] consists of characters a[i] ... a[j-1] */
|
||
|
||
static PyObject *
|
||
string_slice(register PyStringObject *a, register Py_ssize_t i,
|
||
register Py_ssize_t j)
|
||
/* j -- may be negative! */
|
||
{
|
||
if (i < 0)
|
||
i = 0;
|
||
if (j < 0)
|
||
j = 0; /* Avoid signed/unsigned bug in next line */
|
||
if (j > a->ob_size)
|
||
j = a->ob_size;
|
||
if (i == 0 && j == a->ob_size && PyString_CheckExact(a)) {
|
||
/* It's the same as a */
|
||
Py_INCREF(a);
|
||
return (PyObject *)a;
|
||
}
|
||
if (j < i)
|
||
j = i;
|
||
return PyString_FromStringAndSize(a->ob_sval + i, j-i);
|
||
}
|
||
|
||
static int
|
||
string_contains(PyObject *str_obj, PyObject *sub_obj)
|
||
{
|
||
if (!PyString_CheckExact(sub_obj)) {
|
||
#ifdef Py_USING_UNICODE
|
||
if (PyUnicode_Check(sub_obj))
|
||
return PyUnicode_Contains(str_obj, sub_obj);
|
||
#endif
|
||
if (!PyString_Check(sub_obj)) {
|
||
PyErr_Format(PyExc_TypeError,
|
||
"'in <string>' requires string as left operand, "
|
||
"not %.200s", sub_obj->ob_type->tp_name);
|
||
return -1;
|
||
}
|
||
}
|
||
|
||
return stringlib_contains_obj(str_obj, sub_obj);
|
||
}
|
||
|
||
static PyObject *
|
||
string_item(PyStringObject *a, register Py_ssize_t i)
|
||
{
|
||
char pchar;
|
||
PyObject *v;
|
||
if (i < 0 || i >= a->ob_size) {
|
||
PyErr_SetString(PyExc_IndexError, "string index out of range");
|
||
return NULL;
|
||
}
|
||
pchar = a->ob_sval[i];
|
||
v = (PyObject *)characters[pchar & UCHAR_MAX];
|
||
if (v == NULL)
|
||
v = PyString_FromStringAndSize(&pchar, 1);
|
||
else {
|
||
#ifdef COUNT_ALLOCS
|
||
one_strings++;
|
||
#endif
|
||
Py_INCREF(v);
|
||
}
|
||
return v;
|
||
}
|
||
|
||
static PyObject*
|
||
string_richcompare(PyStringObject *a, PyStringObject *b, int op)
|
||
{
|
||
int c;
|
||
Py_ssize_t len_a, len_b;
|
||
Py_ssize_t min_len;
|
||
PyObject *result;
|
||
|
||
/* Make sure both arguments are strings. */
|
||
if (!(PyString_Check(a) && PyString_Check(b))) {
|
||
result = Py_NotImplemented;
|
||
goto out;
|
||
}
|
||
if (a == b) {
|
||
switch (op) {
|
||
case Py_EQ:case Py_LE:case Py_GE:
|
||
result = Py_True;
|
||
goto out;
|
||
case Py_NE:case Py_LT:case Py_GT:
|
||
result = Py_False;
|
||
goto out;
|
||
}
|
||
}
|
||
if (op == Py_EQ) {
|
||
/* Supporting Py_NE here as well does not save
|
||
much time, since Py_NE is rarely used. */
|
||
if (a->ob_size == b->ob_size
|
||
&& (a->ob_sval[0] == b->ob_sval[0]
|
||
&& memcmp(a->ob_sval, b->ob_sval,
|
||
a->ob_size) == 0)) {
|
||
result = Py_True;
|
||
} else {
|
||
result = Py_False;
|
||
}
|
||
goto out;
|
||
}
|
||
len_a = a->ob_size; len_b = b->ob_size;
|
||
min_len = (len_a < len_b) ? len_a : len_b;
|
||
if (min_len > 0) {
|
||
c = Py_CHARMASK(*a->ob_sval) - Py_CHARMASK(*b->ob_sval);
|
||
if (c==0)
|
||
c = memcmp(a->ob_sval, b->ob_sval, min_len);
|
||
}else
|
||
c = 0;
|
||
if (c == 0)
|
||
c = (len_a < len_b) ? -1 : (len_a > len_b) ? 1 : 0;
|
||
switch (op) {
|
||
case Py_LT: c = c < 0; break;
|
||
case Py_LE: c = c <= 0; break;
|
||
case Py_EQ: assert(0); break; /* unreachable */
|
||
case Py_NE: c = c != 0; break;
|
||
case Py_GT: c = c > 0; break;
|
||
case Py_GE: c = c >= 0; break;
|
||
default:
|
||
result = Py_NotImplemented;
|
||
goto out;
|
||
}
|
||
result = c ? Py_True : Py_False;
|
||
out:
|
||
Py_INCREF(result);
|
||
return result;
|
||
}
|
||
|
||
int
|
||
_PyString_Eq(PyObject *o1, PyObject *o2)
|
||
{
|
||
PyStringObject *a = (PyStringObject*) o1;
|
||
PyStringObject *b = (PyStringObject*) o2;
|
||
return a->ob_size == b->ob_size
|
||
&& *a->ob_sval == *b->ob_sval
|
||
&& memcmp(a->ob_sval, b->ob_sval, a->ob_size) == 0;
|
||
}
|
||
|
||
static long
|
||
string_hash(PyStringObject *a)
|
||
{
|
||
register Py_ssize_t len;
|
||
register unsigned char *p;
|
||
register long x;
|
||
|
||
if (a->ob_shash != -1)
|
||
return a->ob_shash;
|
||
len = a->ob_size;
|
||
p = (unsigned char *) a->ob_sval;
|
||
x = *p << 7;
|
||
while (--len >= 0)
|
||
x = (1000003*x) ^ *p++;
|
||
x ^= a->ob_size;
|
||
if (x == -1)
|
||
x = -2;
|
||
a->ob_shash = x;
|
||
return x;
|
||
}
|
||
|
||
static PyObject*
|
||
string_subscript(PyStringObject* self, PyObject* item)
|
||
{
|
||
if (PyIndex_Check(item)) {
|
||
Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
|
||
if (i == -1 && PyErr_Occurred())
|
||
return NULL;
|
||
if (i < 0)
|
||
i += PyString_GET_SIZE(self);
|
||
return string_item(self, i);
|
||
}
|
||
else if (PySlice_Check(item)) {
|
||
Py_ssize_t start, stop, step, slicelength, cur, i;
|
||
char* source_buf;
|
||
char* result_buf;
|
||
PyObject* result;
|
||
|
||
if (PySlice_GetIndicesEx((PySliceObject*)item,
|
||
PyString_GET_SIZE(self),
|
||
&start, &stop, &step, &slicelength) < 0) {
|
||
return NULL;
|
||
}
|
||
|
||
if (slicelength <= 0) {
|
||
return PyString_FromStringAndSize("", 0);
|
||
}
|
||
else {
|
||
source_buf = PyString_AsString((PyObject*)self);
|
||
result_buf = (char *)PyMem_Malloc(slicelength);
|
||
if (result_buf == NULL)
|
||
return PyErr_NoMemory();
|
||
|
||
for (cur = start, i = 0; i < slicelength;
|
||
cur += step, i++) {
|
||
result_buf[i] = source_buf[cur];
|
||
}
|
||
|
||
result = PyString_FromStringAndSize(result_buf,
|
||
slicelength);
|
||
PyMem_Free(result_buf);
|
||
return result;
|
||
}
|
||
}
|
||
else {
|
||
PyErr_Format(PyExc_TypeError,
|
||
"string indices must be integers, not %.200s",
|
||
item->ob_type->tp_name);
|
||
return NULL;
|
||
}
|
||
}
|
||
|
||
static Py_ssize_t
|
||
string_buffer_getreadbuf(PyStringObject *self, Py_ssize_t index, const void **ptr)
|
||
{
|
||
if ( index != 0 ) {
|
||
PyErr_SetString(PyExc_SystemError,
|
||
"accessing non-existent string segment");
|
||
return -1;
|
||
}
|
||
*ptr = (void *)self->ob_sval;
|
||
return self->ob_size;
|
||
}
|
||
|
||
static Py_ssize_t
|
||
string_buffer_getwritebuf(PyStringObject *self, Py_ssize_t index, const void **ptr)
|
||
{
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"Cannot use string as modifiable buffer");
|
||
return -1;
|
||
}
|
||
|
||
static Py_ssize_t
|
||
string_buffer_getsegcount(PyStringObject *self, Py_ssize_t *lenp)
|
||
{
|
||
if ( lenp )
|
||
*lenp = self->ob_size;
|
||
return 1;
|
||
}
|
||
|
||
static Py_ssize_t
|
||
string_buffer_getcharbuf(PyStringObject *self, Py_ssize_t index, const char **ptr)
|
||
{
|
||
if ( index != 0 ) {
|
||
PyErr_SetString(PyExc_SystemError,
|
||
"accessing non-existent string segment");
|
||
return -1;
|
||
}
|
||
*ptr = self->ob_sval;
|
||
return self->ob_size;
|
||
}
|
||
|
||
static PySequenceMethods string_as_sequence = {
|
||
(lenfunc)string_length, /*sq_length*/
|
||
(binaryfunc)string_concat, /*sq_concat*/
|
||
(ssizeargfunc)string_repeat, /*sq_repeat*/
|
||
(ssizeargfunc)string_item, /*sq_item*/
|
||
(ssizessizeargfunc)string_slice, /*sq_slice*/
|
||
0, /*sq_ass_item*/
|
||
0, /*sq_ass_slice*/
|
||
(objobjproc)string_contains /*sq_contains*/
|
||
};
|
||
|
||
static PyMappingMethods string_as_mapping = {
|
||
(lenfunc)string_length,
|
||
(binaryfunc)string_subscript,
|
||
0,
|
||
};
|
||
|
||
static PyBufferProcs string_as_buffer = {
|
||
(readbufferproc)string_buffer_getreadbuf,
|
||
(writebufferproc)string_buffer_getwritebuf,
|
||
(segcountproc)string_buffer_getsegcount,
|
||
(charbufferproc)string_buffer_getcharbuf,
|
||
};
|
||
|
||
|
||
|
||
#define LEFTSTRIP 0
|
||
#define RIGHTSTRIP 1
|
||
#define BOTHSTRIP 2
|
||
|
||
/* Arrays indexed by above */
|
||
static const char *stripformat[] = {"|O:lstrip", "|O:rstrip", "|O:strip"};
|
||
|
||
#define STRIPNAME(i) (stripformat[i]+3)
|
||
|
||
|
||
/* Don't call if length < 2 */
|
||
#define Py_STRING_MATCH(target, offset, pattern, length) \
|
||
(target[offset] == pattern[0] && \
|
||
target[offset+length-1] == pattern[length-1] && \
|
||
!memcmp(target+offset+1, pattern+1, length-2) )
|
||
|
||
|
||
/* Overallocate the initial list to reduce the number of reallocs for small
|
||
split sizes. Eg, "A A A A A A A A A A".split() (10 elements) has three
|
||
resizes, to sizes 4, 8, then 16. Most observed string splits are for human
|
||
text (roughly 11 words per line) and field delimited data (usually 1-10
|
||
fields). For large strings the split algorithms are bandwidth limited
|
||
so increasing the preallocation likely will not improve things.*/
|
||
|
||
#define MAX_PREALLOC 12
|
||
|
||
/* 5 splits gives 6 elements */
|
||
#define PREALLOC_SIZE(maxsplit) \
|
||
(maxsplit >= MAX_PREALLOC ? MAX_PREALLOC : maxsplit+1)
|
||
|
||
#define SPLIT_APPEND(data, left, right) \
|
||
str = PyString_FromStringAndSize((data) + (left), \
|
||
(right) - (left)); \
|
||
if (str == NULL) \
|
||
goto onError; \
|
||
if (PyList_Append(list, str)) { \
|
||
Py_DECREF(str); \
|
||
goto onError; \
|
||
} \
|
||
else \
|
||
Py_DECREF(str);
|
||
|
||
#define SPLIT_ADD(data, left, right) { \
|
||
str = PyString_FromStringAndSize((data) + (left), \
|
||
(right) - (left)); \
|
||
if (str == NULL) \
|
||
goto onError; \
|
||
if (count < MAX_PREALLOC) { \
|
||
PyList_SET_ITEM(list, count, str); \
|
||
} else { \
|
||
if (PyList_Append(list, str)) { \
|
||
Py_DECREF(str); \
|
||
goto onError; \
|
||
} \
|
||
else \
|
||
Py_DECREF(str); \
|
||
} \
|
||
count++; }
|
||
|
||
/* Always force the list to the expected size. */
|
||
#define FIX_PREALLOC_SIZE(list) ((PyListObject *)list)->ob_size = count
|
||
|
||
#define SKIP_SPACE(s, i, len) { while (i<len && isspace(Py_CHARMASK(s[i]))) i++; }
|
||
#define SKIP_NONSPACE(s, i, len) { while (i<len && !isspace(Py_CHARMASK(s[i]))) i++; }
|
||
#define RSKIP_SPACE(s, i) { while (i>=0 && isspace(Py_CHARMASK(s[i]))) i--; }
|
||
#define RSKIP_NONSPACE(s, i) { while (i>=0 && !isspace(Py_CHARMASK(s[i]))) i--; }
|
||
|
||
Py_LOCAL_INLINE(PyObject *)
|
||
split_whitespace(const char *s, Py_ssize_t len, Py_ssize_t maxsplit)
|
||
{
|
||
Py_ssize_t i, j, count=0;
|
||
PyObject *str;
|
||
PyObject *list = PyList_New(PREALLOC_SIZE(maxsplit));
|
||
|
||
if (list == NULL)
|
||
return NULL;
|
||
|
||
i = j = 0;
|
||
|
||
while (maxsplit-- > 0) {
|
||
SKIP_SPACE(s, i, len);
|
||
if (i==len) break;
|
||
j = i; i++;
|
||
SKIP_NONSPACE(s, i, len);
|
||
SPLIT_ADD(s, j, i);
|
||
}
|
||
|
||
if (i < len) {
|
||
/* Only occurs when maxsplit was reached */
|
||
/* Skip any remaining whitespace and copy to end of string */
|
||
SKIP_SPACE(s, i, len);
|
||
if (i != len)
|
||
SPLIT_ADD(s, i, len);
|
||
}
|
||
FIX_PREALLOC_SIZE(list);
|
||
return list;
|
||
onError:
|
||
Py_DECREF(list);
|
||
return NULL;
|
||
}
|
||
|
||
Py_LOCAL_INLINE(PyObject *)
|
||
split_char(const char *s, Py_ssize_t len, char ch, Py_ssize_t maxcount)
|
||
{
|
||
register Py_ssize_t i, j, count=0;
|
||
PyObject *str;
|
||
PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
|
||
|
||
if (list == NULL)
|
||
return NULL;
|
||
|
||
i = j = 0;
|
||
while ((j < len) && (maxcount-- > 0)) {
|
||
for(; j<len; j++) {
|
||
/* I found that using memchr makes no difference */
|
||
if (s[j] == ch) {
|
||
SPLIT_ADD(s, i, j);
|
||
i = j = j + 1;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
if (i <= len) {
|
||
SPLIT_ADD(s, i, len);
|
||
}
|
||
FIX_PREALLOC_SIZE(list);
|
||
return list;
|
||
|
||
onError:
|
||
Py_DECREF(list);
|
||
return NULL;
|
||
}
|
||
|
||
PyDoc_STRVAR(split__doc__,
|
||
"S.split([sep [,maxsplit]]) -> list of strings\n\
|
||
\n\
|
||
Return a list of the words in the string S, using sep as the\n\
|
||
delimiter string. If maxsplit is given, at most maxsplit\n\
|
||
splits are done. If sep is not specified or is None, any\n\
|
||
whitespace string is a separator.");
|
||
|
||
static PyObject *
|
||
string_split(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t len = PyString_GET_SIZE(self), n, i, j;
|
||
Py_ssize_t maxsplit = -1, count=0;
|
||
const char *s = PyString_AS_STRING(self), *sub;
|
||
PyObject *list, *str, *subobj = Py_None;
|
||
#ifdef USE_FAST
|
||
Py_ssize_t pos;
|
||
#endif
|
||
|
||
if (!PyArg_ParseTuple(args, "|On:split", &subobj, &maxsplit))
|
||
return NULL;
|
||
if (maxsplit < 0)
|
||
maxsplit = PY_SSIZE_T_MAX;
|
||
if (subobj == Py_None)
|
||
return split_whitespace(s, len, maxsplit);
|
||
if (PyString_Check(subobj)) {
|
||
sub = PyString_AS_STRING(subobj);
|
||
n = PyString_GET_SIZE(subobj);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(subobj))
|
||
return PyUnicode_Split((PyObject *)self, subobj, maxsplit);
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(subobj, &sub, &n))
|
||
return NULL;
|
||
|
||
if (n == 0) {
|
||
PyErr_SetString(PyExc_ValueError, "empty separator");
|
||
return NULL;
|
||
}
|
||
else if (n == 1)
|
||
return split_char(s, len, sub[0], maxsplit);
|
||
|
||
list = PyList_New(PREALLOC_SIZE(maxsplit));
|
||
if (list == NULL)
|
||
return NULL;
|
||
|
||
#ifdef USE_FAST
|
||
i = j = 0;
|
||
while (maxsplit-- > 0) {
|
||
pos = fastsearch(s+i, len-i, sub, n, FAST_SEARCH);
|
||
if (pos < 0)
|
||
break;
|
||
j = i+pos;
|
||
SPLIT_ADD(s, i, j);
|
||
i = j + n;
|
||
}
|
||
#else
|
||
i = j = 0;
|
||
while ((j+n <= len) && (maxsplit-- > 0)) {
|
||
for (; j+n <= len; j++) {
|
||
if (Py_STRING_MATCH(s, j, sub, n)) {
|
||
SPLIT_ADD(s, i, j);
|
||
i = j = j + n;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
#endif
|
||
SPLIT_ADD(s, i, len);
|
||
FIX_PREALLOC_SIZE(list);
|
||
return list;
|
||
|
||
onError:
|
||
Py_DECREF(list);
|
||
return NULL;
|
||
}
|
||
|
||
PyDoc_STRVAR(partition__doc__,
|
||
"S.partition(sep) -> (head, sep, tail)\n\
|
||
\n\
|
||
Searches for the separator sep in S, and returns the part before it,\n\
|
||
the separator itself, and the part after it. If the separator is not\n\
|
||
found, returns S and two empty strings.");
|
||
|
||
static PyObject *
|
||
string_partition(PyStringObject *self, PyObject *sep_obj)
|
||
{
|
||
const char *sep;
|
||
Py_ssize_t sep_len;
|
||
|
||
if (PyString_Check(sep_obj)) {
|
||
sep = PyString_AS_STRING(sep_obj);
|
||
sep_len = PyString_GET_SIZE(sep_obj);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(sep_obj))
|
||
return PyUnicode_Partition((PyObject *) self, sep_obj);
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(sep_obj, &sep, &sep_len))
|
||
return NULL;
|
||
|
||
return stringlib_partition(
|
||
(PyObject*) self,
|
||
PyString_AS_STRING(self), PyString_GET_SIZE(self),
|
||
sep_obj, sep, sep_len
|
||
);
|
||
}
|
||
|
||
PyDoc_STRVAR(rpartition__doc__,
|
||
"S.rpartition(sep) -> (tail, sep, head)\n\
|
||
\n\
|
||
Searches for the separator sep in S, starting at the end of S, and returns\n\
|
||
the part before it, the separator itself, and the part after it. If the\n\
|
||
separator is not found, returns two empty strings and S.");
|
||
|
||
static PyObject *
|
||
string_rpartition(PyStringObject *self, PyObject *sep_obj)
|
||
{
|
||
const char *sep;
|
||
Py_ssize_t sep_len;
|
||
|
||
if (PyString_Check(sep_obj)) {
|
||
sep = PyString_AS_STRING(sep_obj);
|
||
sep_len = PyString_GET_SIZE(sep_obj);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(sep_obj))
|
||
return PyUnicode_Partition((PyObject *) self, sep_obj);
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(sep_obj, &sep, &sep_len))
|
||
return NULL;
|
||
|
||
return stringlib_rpartition(
|
||
(PyObject*) self,
|
||
PyString_AS_STRING(self), PyString_GET_SIZE(self),
|
||
sep_obj, sep, sep_len
|
||
);
|
||
}
|
||
|
||
Py_LOCAL_INLINE(PyObject *)
|
||
rsplit_whitespace(const char *s, Py_ssize_t len, Py_ssize_t maxsplit)
|
||
{
|
||
Py_ssize_t i, j, count=0;
|
||
PyObject *str;
|
||
PyObject *list = PyList_New(PREALLOC_SIZE(maxsplit));
|
||
|
||
if (list == NULL)
|
||
return NULL;
|
||
|
||
i = j = len-1;
|
||
|
||
while (maxsplit-- > 0) {
|
||
RSKIP_SPACE(s, i);
|
||
if (i<0) break;
|
||
j = i; i--;
|
||
RSKIP_NONSPACE(s, i);
|
||
SPLIT_ADD(s, i + 1, j + 1);
|
||
}
|
||
if (i >= 0) {
|
||
/* Only occurs when maxsplit was reached */
|
||
/* Skip any remaining whitespace and copy to beginning of string */
|
||
RSKIP_SPACE(s, i);
|
||
if (i >= 0)
|
||
SPLIT_ADD(s, 0, i + 1);
|
||
|
||
}
|
||
FIX_PREALLOC_SIZE(list);
|
||
if (PyList_Reverse(list) < 0)
|
||
goto onError;
|
||
return list;
|
||
onError:
|
||
Py_DECREF(list);
|
||
return NULL;
|
||
}
|
||
|
||
Py_LOCAL_INLINE(PyObject *)
|
||
rsplit_char(const char *s, Py_ssize_t len, char ch, Py_ssize_t maxcount)
|
||
{
|
||
register Py_ssize_t i, j, count=0;
|
||
PyObject *str;
|
||
PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
|
||
|
||
if (list == NULL)
|
||
return NULL;
|
||
|
||
i = j = len - 1;
|
||
while ((i >= 0) && (maxcount-- > 0)) {
|
||
for (; i >= 0; i--) {
|
||
if (s[i] == ch) {
|
||
SPLIT_ADD(s, i + 1, j + 1);
|
||
j = i = i - 1;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
if (j >= -1) {
|
||
SPLIT_ADD(s, 0, j + 1);
|
||
}
|
||
FIX_PREALLOC_SIZE(list);
|
||
if (PyList_Reverse(list) < 0)
|
||
goto onError;
|
||
return list;
|
||
|
||
onError:
|
||
Py_DECREF(list);
|
||
return NULL;
|
||
}
|
||
|
||
PyDoc_STRVAR(rsplit__doc__,
|
||
"S.rsplit([sep [,maxsplit]]) -> list of strings\n\
|
||
\n\
|
||
Return a list of the words in the string S, using sep as the\n\
|
||
delimiter string, starting at the end of the string and working\n\
|
||
to the front. If maxsplit is given, at most maxsplit splits are\n\
|
||
done. If sep is not specified or is None, any whitespace string\n\
|
||
is a separator.");
|
||
|
||
static PyObject *
|
||
string_rsplit(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t len = PyString_GET_SIZE(self), n, i, j;
|
||
Py_ssize_t maxsplit = -1, count=0;
|
||
const char *s = PyString_AS_STRING(self), *sub;
|
||
PyObject *list, *str, *subobj = Py_None;
|
||
|
||
if (!PyArg_ParseTuple(args, "|On:rsplit", &subobj, &maxsplit))
|
||
return NULL;
|
||
if (maxsplit < 0)
|
||
maxsplit = PY_SSIZE_T_MAX;
|
||
if (subobj == Py_None)
|
||
return rsplit_whitespace(s, len, maxsplit);
|
||
if (PyString_Check(subobj)) {
|
||
sub = PyString_AS_STRING(subobj);
|
||
n = PyString_GET_SIZE(subobj);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(subobj))
|
||
return PyUnicode_RSplit((PyObject *)self, subobj, maxsplit);
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(subobj, &sub, &n))
|
||
return NULL;
|
||
|
||
if (n == 0) {
|
||
PyErr_SetString(PyExc_ValueError, "empty separator");
|
||
return NULL;
|
||
}
|
||
else if (n == 1)
|
||
return rsplit_char(s, len, sub[0], maxsplit);
|
||
|
||
list = PyList_New(PREALLOC_SIZE(maxsplit));
|
||
if (list == NULL)
|
||
return NULL;
|
||
|
||
j = len;
|
||
i = j - n;
|
||
|
||
while ( (i >= 0) && (maxsplit-- > 0) ) {
|
||
for (; i>=0; i--) {
|
||
if (Py_STRING_MATCH(s, i, sub, n)) {
|
||
SPLIT_ADD(s, i + n, j);
|
||
j = i;
|
||
i -= n;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
SPLIT_ADD(s, 0, j);
|
||
FIX_PREALLOC_SIZE(list);
|
||
if (PyList_Reverse(list) < 0)
|
||
goto onError;
|
||
return list;
|
||
|
||
onError:
|
||
Py_DECREF(list);
|
||
return NULL;
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(join__doc__,
|
||
"S.join(sequence) -> string\n\
|
||
\n\
|
||
Return a string which is the concatenation of the strings in the\n\
|
||
sequence. The separator between elements is S.");
|
||
|
||
static PyObject *
|
||
string_join(PyStringObject *self, PyObject *orig)
|
||
{
|
||
char *sep = PyString_AS_STRING(self);
|
||
const Py_ssize_t seplen = PyString_GET_SIZE(self);
|
||
PyObject *res = NULL;
|
||
char *p;
|
||
Py_ssize_t seqlen = 0;
|
||
size_t sz = 0;
|
||
Py_ssize_t i;
|
||
PyObject *seq, *item;
|
||
|
||
seq = PySequence_Fast(orig, "");
|
||
if (seq == NULL) {
|
||
return NULL;
|
||
}
|
||
|
||
seqlen = PySequence_Size(seq);
|
||
if (seqlen == 0) {
|
||
Py_DECREF(seq);
|
||
return PyString_FromString("");
|
||
}
|
||
if (seqlen == 1) {
|
||
item = PySequence_Fast_GET_ITEM(seq, 0);
|
||
if (PyString_CheckExact(item) || PyUnicode_CheckExact(item)) {
|
||
Py_INCREF(item);
|
||
Py_DECREF(seq);
|
||
return item;
|
||
}
|
||
}
|
||
|
||
/* There are at least two things to join, or else we have a subclass
|
||
* of the builtin types in the sequence.
|
||
* Do a pre-pass to figure out the total amount of space we'll
|
||
* need (sz), see whether any argument is absurd, and defer to
|
||
* the Unicode join if appropriate.
|
||
*/
|
||
for (i = 0; i < seqlen; i++) {
|
||
const size_t old_sz = sz;
|
||
item = PySequence_Fast_GET_ITEM(seq, i);
|
||
if (!PyString_Check(item)){
|
||
#ifdef Py_USING_UNICODE
|
||
if (PyUnicode_Check(item)) {
|
||
/* Defer to Unicode join.
|
||
* CAUTION: There's no gurantee that the
|
||
* original sequence can be iterated over
|
||
* again, so we must pass seq here.
|
||
*/
|
||
PyObject *result;
|
||
result = PyUnicode_Join((PyObject *)self, seq);
|
||
Py_DECREF(seq);
|
||
return result;
|
||
}
|
||
#endif
|
||
PyErr_Format(PyExc_TypeError,
|
||
"sequence item %zd: expected string,"
|
||
" %.80s found",
|
||
i, item->ob_type->tp_name);
|
||
Py_DECREF(seq);
|
||
return NULL;
|
||
}
|
||
sz += PyString_GET_SIZE(item);
|
||
if (i != 0)
|
||
sz += seplen;
|
||
if (sz < old_sz || sz > PY_SSIZE_T_MAX) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"join() result is too long for a Python string");
|
||
Py_DECREF(seq);
|
||
return NULL;
|
||
}
|
||
}
|
||
|
||
/* Allocate result space. */
|
||
res = PyString_FromStringAndSize((char*)NULL, sz);
|
||
if (res == NULL) {
|
||
Py_DECREF(seq);
|
||
return NULL;
|
||
}
|
||
|
||
/* Catenate everything. */
|
||
p = PyString_AS_STRING(res);
|
||
for (i = 0; i < seqlen; ++i) {
|
||
size_t n;
|
||
item = PySequence_Fast_GET_ITEM(seq, i);
|
||
n = PyString_GET_SIZE(item);
|
||
Py_MEMCPY(p, PyString_AS_STRING(item), n);
|
||
p += n;
|
||
if (i < seqlen - 1) {
|
||
Py_MEMCPY(p, sep, seplen);
|
||
p += seplen;
|
||
}
|
||
}
|
||
|
||
Py_DECREF(seq);
|
||
return res;
|
||
}
|
||
|
||
PyObject *
|
||
_PyString_Join(PyObject *sep, PyObject *x)
|
||
{
|
||
assert(sep != NULL && PyString_Check(sep));
|
||
assert(x != NULL);
|
||
return string_join((PyStringObject *)sep, x);
|
||
}
|
||
|
||
Py_LOCAL_INLINE(void)
|
||
string_adjust_indices(Py_ssize_t *start, Py_ssize_t *end, Py_ssize_t len)
|
||
{
|
||
if (*end > len)
|
||
*end = len;
|
||
else if (*end < 0)
|
||
*end += len;
|
||
if (*end < 0)
|
||
*end = 0;
|
||
if (*start < 0)
|
||
*start += len;
|
||
if (*start < 0)
|
||
*start = 0;
|
||
}
|
||
|
||
Py_LOCAL_INLINE(Py_ssize_t)
|
||
string_find_internal(PyStringObject *self, PyObject *args, int dir)
|
||
{
|
||
PyObject *subobj;
|
||
const char *sub;
|
||
Py_ssize_t sub_len;
|
||
Py_ssize_t start=0, end=PY_SSIZE_T_MAX;
|
||
|
||
if (!PyArg_ParseTuple(args, "O|O&O&:find/rfind/index/rindex", &subobj,
|
||
_PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
|
||
return -2;
|
||
if (PyString_Check(subobj)) {
|
||
sub = PyString_AS_STRING(subobj);
|
||
sub_len = PyString_GET_SIZE(subobj);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(subobj))
|
||
return PyUnicode_Find(
|
||
(PyObject *)self, subobj, start, end, dir);
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(subobj, &sub, &sub_len))
|
||
/* XXX - the "expected a character buffer object" is pretty
|
||
confusing for a non-expert. remap to something else ? */
|
||
return -2;
|
||
|
||
if (dir > 0)
|
||
return stringlib_find_slice(
|
||
PyString_AS_STRING(self), PyString_GET_SIZE(self),
|
||
sub, sub_len, start, end);
|
||
else
|
||
return stringlib_rfind_slice(
|
||
PyString_AS_STRING(self), PyString_GET_SIZE(self),
|
||
sub, sub_len, start, end);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(find__doc__,
|
||
"S.find(sub [,start [,end]]) -> int\n\
|
||
\n\
|
||
Return the lowest index in S where substring sub is found,\n\
|
||
such that sub is contained within s[start,end]. Optional\n\
|
||
arguments start and end are interpreted as in slice notation.\n\
|
||
\n\
|
||
Return -1 on failure.");
|
||
|
||
static PyObject *
|
||
string_find(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t result = string_find_internal(self, args, +1);
|
||
if (result == -2)
|
||
return NULL;
|
||
return PyInt_FromSsize_t(result);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(index__doc__,
|
||
"S.index(sub [,start [,end]]) -> int\n\
|
||
\n\
|
||
Like S.find() but raise ValueError when the substring is not found.");
|
||
|
||
static PyObject *
|
||
string_index(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t result = string_find_internal(self, args, +1);
|
||
if (result == -2)
|
||
return NULL;
|
||
if (result == -1) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"substring not found");
|
||
return NULL;
|
||
}
|
||
return PyInt_FromSsize_t(result);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(rfind__doc__,
|
||
"S.rfind(sub [,start [,end]]) -> int\n\
|
||
\n\
|
||
Return the highest index in S where substring sub is found,\n\
|
||
such that sub is contained within s[start,end]. Optional\n\
|
||
arguments start and end are interpreted as in slice notation.\n\
|
||
\n\
|
||
Return -1 on failure.");
|
||
|
||
static PyObject *
|
||
string_rfind(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t result = string_find_internal(self, args, -1);
|
||
if (result == -2)
|
||
return NULL;
|
||
return PyInt_FromSsize_t(result);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(rindex__doc__,
|
||
"S.rindex(sub [,start [,end]]) -> int\n\
|
||
\n\
|
||
Like S.rfind() but raise ValueError when the substring is not found.");
|
||
|
||
static PyObject *
|
||
string_rindex(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t result = string_find_internal(self, args, -1);
|
||
if (result == -2)
|
||
return NULL;
|
||
if (result == -1) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"substring not found");
|
||
return NULL;
|
||
}
|
||
return PyInt_FromSsize_t(result);
|
||
}
|
||
|
||
|
||
Py_LOCAL_INLINE(PyObject *)
|
||
do_xstrip(PyStringObject *self, int striptype, PyObject *sepobj)
|
||
{
|
||
char *s = PyString_AS_STRING(self);
|
||
Py_ssize_t len = PyString_GET_SIZE(self);
|
||
char *sep = PyString_AS_STRING(sepobj);
|
||
Py_ssize_t seplen = PyString_GET_SIZE(sepobj);
|
||
Py_ssize_t i, j;
|
||
|
||
i = 0;
|
||
if (striptype != RIGHTSTRIP) {
|
||
while (i < len && memchr(sep, Py_CHARMASK(s[i]), seplen)) {
|
||
i++;
|
||
}
|
||
}
|
||
|
||
j = len;
|
||
if (striptype != LEFTSTRIP) {
|
||
do {
|
||
j--;
|
||
} while (j >= i && memchr(sep, Py_CHARMASK(s[j]), seplen));
|
||
j++;
|
||
}
|
||
|
||
if (i == 0 && j == len && PyString_CheckExact(self)) {
|
||
Py_INCREF(self);
|
||
return (PyObject*)self;
|
||
}
|
||
else
|
||
return PyString_FromStringAndSize(s+i, j-i);
|
||
}
|
||
|
||
|
||
Py_LOCAL_INLINE(PyObject *)
|
||
do_strip(PyStringObject *self, int striptype)
|
||
{
|
||
char *s = PyString_AS_STRING(self);
|
||
Py_ssize_t len = PyString_GET_SIZE(self), i, j;
|
||
|
||
i = 0;
|
||
if (striptype != RIGHTSTRIP) {
|
||
while (i < len && isspace(Py_CHARMASK(s[i]))) {
|
||
i++;
|
||
}
|
||
}
|
||
|
||
j = len;
|
||
if (striptype != LEFTSTRIP) {
|
||
do {
|
||
j--;
|
||
} while (j >= i && isspace(Py_CHARMASK(s[j])));
|
||
j++;
|
||
}
|
||
|
||
if (i == 0 && j == len && PyString_CheckExact(self)) {
|
||
Py_INCREF(self);
|
||
return (PyObject*)self;
|
||
}
|
||
else
|
||
return PyString_FromStringAndSize(s+i, j-i);
|
||
}
|
||
|
||
|
||
Py_LOCAL_INLINE(PyObject *)
|
||
do_argstrip(PyStringObject *self, int striptype, PyObject *args)
|
||
{
|
||
PyObject *sep = NULL;
|
||
|
||
if (!PyArg_ParseTuple(args, (char *)stripformat[striptype], &sep))
|
||
return NULL;
|
||
|
||
if (sep != NULL && sep != Py_None) {
|
||
if (PyString_Check(sep))
|
||
return do_xstrip(self, striptype, sep);
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(sep)) {
|
||
PyObject *uniself = PyUnicode_FromObject((PyObject *)self);
|
||
PyObject *res;
|
||
if (uniself==NULL)
|
||
return NULL;
|
||
res = _PyUnicode_XStrip((PyUnicodeObject *)uniself,
|
||
striptype, sep);
|
||
Py_DECREF(uniself);
|
||
return res;
|
||
}
|
||
#endif
|
||
PyErr_Format(PyExc_TypeError,
|
||
#ifdef Py_USING_UNICODE
|
||
"%s arg must be None, str or unicode",
|
||
#else
|
||
"%s arg must be None or str",
|
||
#endif
|
||
STRIPNAME(striptype));
|
||
return NULL;
|
||
}
|
||
|
||
return do_strip(self, striptype);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(strip__doc__,
|
||
"S.strip([chars]) -> string or unicode\n\
|
||
\n\
|
||
Return a copy of the string S with leading and trailing\n\
|
||
whitespace removed.\n\
|
||
If chars is given and not None, remove characters in chars instead.\n\
|
||
If chars is unicode, S will be converted to unicode before stripping");
|
||
|
||
static PyObject *
|
||
string_strip(PyStringObject *self, PyObject *args)
|
||
{
|
||
if (PyTuple_GET_SIZE(args) == 0)
|
||
return do_strip(self, BOTHSTRIP); /* Common case */
|
||
else
|
||
return do_argstrip(self, BOTHSTRIP, args);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(lstrip__doc__,
|
||
"S.lstrip([chars]) -> string or unicode\n\
|
||
\n\
|
||
Return a copy of the string S with leading whitespace removed.\n\
|
||
If chars is given and not None, remove characters in chars instead.\n\
|
||
If chars is unicode, S will be converted to unicode before stripping");
|
||
|
||
static PyObject *
|
||
string_lstrip(PyStringObject *self, PyObject *args)
|
||
{
|
||
if (PyTuple_GET_SIZE(args) == 0)
|
||
return do_strip(self, LEFTSTRIP); /* Common case */
|
||
else
|
||
return do_argstrip(self, LEFTSTRIP, args);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(rstrip__doc__,
|
||
"S.rstrip([chars]) -> string or unicode\n\
|
||
\n\
|
||
Return a copy of the string S with trailing whitespace removed.\n\
|
||
If chars is given and not None, remove characters in chars instead.\n\
|
||
If chars is unicode, S will be converted to unicode before stripping");
|
||
|
||
static PyObject *
|
||
string_rstrip(PyStringObject *self, PyObject *args)
|
||
{
|
||
if (PyTuple_GET_SIZE(args) == 0)
|
||
return do_strip(self, RIGHTSTRIP); /* Common case */
|
||
else
|
||
return do_argstrip(self, RIGHTSTRIP, args);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(lower__doc__,
|
||
"S.lower() -> string\n\
|
||
\n\
|
||
Return a copy of the string S converted to lowercase.");
|
||
|
||
/* _tolower and _toupper are defined by SUSv2, but they're not ISO C */
|
||
#ifndef _tolower
|
||
#define _tolower tolower
|
||
#endif
|
||
|
||
static PyObject *
|
||
string_lower(PyStringObject *self)
|
||
{
|
||
char *s;
|
||
Py_ssize_t i, n = PyString_GET_SIZE(self);
|
||
PyObject *newobj;
|
||
|
||
newobj = PyString_FromStringAndSize(NULL, n);
|
||
if (!newobj)
|
||
return NULL;
|
||
|
||
s = PyString_AS_STRING(newobj);
|
||
|
||
Py_MEMCPY(s, PyString_AS_STRING(self), n);
|
||
|
||
for (i = 0; i < n; i++) {
|
||
int c = Py_CHARMASK(s[i]);
|
||
if (isupper(c))
|
||
s[i] = _tolower(c);
|
||
}
|
||
|
||
return newobj;
|
||
}
|
||
|
||
PyDoc_STRVAR(upper__doc__,
|
||
"S.upper() -> string\n\
|
||
\n\
|
||
Return a copy of the string S converted to uppercase.");
|
||
|
||
#ifndef _toupper
|
||
#define _toupper toupper
|
||
#endif
|
||
|
||
static PyObject *
|
||
string_upper(PyStringObject *self)
|
||
{
|
||
char *s;
|
||
Py_ssize_t i, n = PyString_GET_SIZE(self);
|
||
PyObject *newobj;
|
||
|
||
newobj = PyString_FromStringAndSize(NULL, n);
|
||
if (!newobj)
|
||
return NULL;
|
||
|
||
s = PyString_AS_STRING(newobj);
|
||
|
||
Py_MEMCPY(s, PyString_AS_STRING(self), n);
|
||
|
||
for (i = 0; i < n; i++) {
|
||
int c = Py_CHARMASK(s[i]);
|
||
if (islower(c))
|
||
s[i] = _toupper(c);
|
||
}
|
||
|
||
return newobj;
|
||
}
|
||
|
||
PyDoc_STRVAR(title__doc__,
|
||
"S.title() -> string\n\
|
||
\n\
|
||
Return a titlecased version of S, i.e. words start with uppercase\n\
|
||
characters, all remaining cased characters have lowercase.");
|
||
|
||
static PyObject*
|
||
string_title(PyStringObject *self)
|
||
{
|
||
char *s = PyString_AS_STRING(self), *s_new;
|
||
Py_ssize_t i, n = PyString_GET_SIZE(self);
|
||
int previous_is_cased = 0;
|
||
PyObject *newobj;
|
||
|
||
newobj = PyString_FromStringAndSize(NULL, n);
|
||
if (newobj == NULL)
|
||
return NULL;
|
||
s_new = PyString_AsString(newobj);
|
||
for (i = 0; i < n; i++) {
|
||
int c = Py_CHARMASK(*s++);
|
||
if (islower(c)) {
|
||
if (!previous_is_cased)
|
||
c = toupper(c);
|
||
previous_is_cased = 1;
|
||
} else if (isupper(c)) {
|
||
if (previous_is_cased)
|
||
c = tolower(c);
|
||
previous_is_cased = 1;
|
||
} else
|
||
previous_is_cased = 0;
|
||
*s_new++ = c;
|
||
}
|
||
return newobj;
|
||
}
|
||
|
||
PyDoc_STRVAR(capitalize__doc__,
|
||
"S.capitalize() -> string\n\
|
||
\n\
|
||
Return a copy of the string S with only its first character\n\
|
||
capitalized.");
|
||
|
||
static PyObject *
|
||
string_capitalize(PyStringObject *self)
|
||
{
|
||
char *s = PyString_AS_STRING(self), *s_new;
|
||
Py_ssize_t i, n = PyString_GET_SIZE(self);
|
||
PyObject *newobj;
|
||
|
||
newobj = PyString_FromStringAndSize(NULL, n);
|
||
if (newobj == NULL)
|
||
return NULL;
|
||
s_new = PyString_AsString(newobj);
|
||
if (0 < n) {
|
||
int c = Py_CHARMASK(*s++);
|
||
if (islower(c))
|
||
*s_new = toupper(c);
|
||
else
|
||
*s_new = c;
|
||
s_new++;
|
||
}
|
||
for (i = 1; i < n; i++) {
|
||
int c = Py_CHARMASK(*s++);
|
||
if (isupper(c))
|
||
*s_new = tolower(c);
|
||
else
|
||
*s_new = c;
|
||
s_new++;
|
||
}
|
||
return newobj;
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(count__doc__,
|
||
"S.count(sub[, start[, end]]) -> int\n\
|
||
\n\
|
||
Return the number of non-overlapping occurrences of substring sub in\n\
|
||
string S[start:end]. Optional arguments start and end are interpreted\n\
|
||
as in slice notation.");
|
||
|
||
static PyObject *
|
||
string_count(PyStringObject *self, PyObject *args)
|
||
{
|
||
PyObject *sub_obj;
|
||
const char *str = PyString_AS_STRING(self), *sub;
|
||
Py_ssize_t sub_len;
|
||
Py_ssize_t start = 0, end = PY_SSIZE_T_MAX;
|
||
|
||
if (!PyArg_ParseTuple(args, "O|O&O&:count", &sub_obj,
|
||
_PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
|
||
return NULL;
|
||
|
||
if (PyString_Check(sub_obj)) {
|
||
sub = PyString_AS_STRING(sub_obj);
|
||
sub_len = PyString_GET_SIZE(sub_obj);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(sub_obj)) {
|
||
Py_ssize_t count;
|
||
count = PyUnicode_Count((PyObject *)self, sub_obj, start, end);
|
||
if (count == -1)
|
||
return NULL;
|
||
else
|
||
return PyInt_FromSsize_t(count);
|
||
}
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(sub_obj, &sub, &sub_len))
|
||
return NULL;
|
||
|
||
string_adjust_indices(&start, &end, PyString_GET_SIZE(self));
|
||
|
||
return PyInt_FromSsize_t(
|
||
stringlib_count(str + start, end - start, sub, sub_len)
|
||
);
|
||
}
|
||
|
||
PyDoc_STRVAR(swapcase__doc__,
|
||
"S.swapcase() -> string\n\
|
||
\n\
|
||
Return a copy of the string S with uppercase characters\n\
|
||
converted to lowercase and vice versa.");
|
||
|
||
static PyObject *
|
||
string_swapcase(PyStringObject *self)
|
||
{
|
||
char *s = PyString_AS_STRING(self), *s_new;
|
||
Py_ssize_t i, n = PyString_GET_SIZE(self);
|
||
PyObject *newobj;
|
||
|
||
newobj = PyString_FromStringAndSize(NULL, n);
|
||
if (newobj == NULL)
|
||
return NULL;
|
||
s_new = PyString_AsString(newobj);
|
||
for (i = 0; i < n; i++) {
|
||
int c = Py_CHARMASK(*s++);
|
||
if (islower(c)) {
|
||
*s_new = toupper(c);
|
||
}
|
||
else if (isupper(c)) {
|
||
*s_new = tolower(c);
|
||
}
|
||
else
|
||
*s_new = c;
|
||
s_new++;
|
||
}
|
||
return newobj;
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(translate__doc__,
|
||
"S.translate(table [,deletechars]) -> string\n\
|
||
\n\
|
||
Return a copy of the string S, where all characters occurring\n\
|
||
in the optional argument deletechars are removed, and the\n\
|
||
remaining characters have been mapped through the given\n\
|
||
translation table, which must be a string of length 256.");
|
||
|
||
static PyObject *
|
||
string_translate(PyStringObject *self, PyObject *args)
|
||
{
|
||
register char *input, *output;
|
||
register const char *table;
|
||
register Py_ssize_t i, c, changed = 0;
|
||
PyObject *input_obj = (PyObject*)self;
|
||
const char *table1, *output_start, *del_table=NULL;
|
||
Py_ssize_t inlen, tablen, dellen = 0;
|
||
PyObject *result;
|
||
int trans_table[256];
|
||
PyObject *tableobj, *delobj = NULL;
|
||
|
||
if (!PyArg_UnpackTuple(args, "translate", 1, 2,
|
||
&tableobj, &delobj))
|
||
return NULL;
|
||
|
||
if (PyString_Check(tableobj)) {
|
||
table1 = PyString_AS_STRING(tableobj);
|
||
tablen = PyString_GET_SIZE(tableobj);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(tableobj)) {
|
||
/* Unicode .translate() does not support the deletechars
|
||
parameter; instead a mapping to None will cause characters
|
||
to be deleted. */
|
||
if (delobj != NULL) {
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"deletions are implemented differently for unicode");
|
||
return NULL;
|
||
}
|
||
return PyUnicode_Translate((PyObject *)self, tableobj, NULL);
|
||
}
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(tableobj, &table1, &tablen))
|
||
return NULL;
|
||
|
||
if (tablen != 256) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"translation table must be 256 characters long");
|
||
return NULL;
|
||
}
|
||
|
||
if (delobj != NULL) {
|
||
if (PyString_Check(delobj)) {
|
||
del_table = PyString_AS_STRING(delobj);
|
||
dellen = PyString_GET_SIZE(delobj);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(delobj)) {
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"deletions are implemented differently for unicode");
|
||
return NULL;
|
||
}
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(delobj, &del_table, &dellen))
|
||
return NULL;
|
||
}
|
||
else {
|
||
del_table = NULL;
|
||
dellen = 0;
|
||
}
|
||
|
||
table = table1;
|
||
inlen = PyString_GET_SIZE(input_obj);
|
||
result = PyString_FromStringAndSize((char *)NULL, inlen);
|
||
if (result == NULL)
|
||
return NULL;
|
||
output_start = output = PyString_AsString(result);
|
||
input = PyString_AS_STRING(input_obj);
|
||
|
||
if (dellen == 0) {
|
||
/* If no deletions are required, use faster code */
|
||
for (i = inlen; --i >= 0; ) {
|
||
c = Py_CHARMASK(*input++);
|
||
if (Py_CHARMASK((*output++ = table[c])) != c)
|
||
changed = 1;
|
||
}
|
||
if (changed || !PyString_CheckExact(input_obj))
|
||
return result;
|
||
Py_DECREF(result);
|
||
Py_INCREF(input_obj);
|
||
return input_obj;
|
||
}
|
||
|
||
for (i = 0; i < 256; i++)
|
||
trans_table[i] = Py_CHARMASK(table[i]);
|
||
|
||
for (i = 0; i < dellen; i++)
|
||
trans_table[(int) Py_CHARMASK(del_table[i])] = -1;
|
||
|
||
for (i = inlen; --i >= 0; ) {
|
||
c = Py_CHARMASK(*input++);
|
||
if (trans_table[c] != -1)
|
||
if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c)
|
||
continue;
|
||
changed = 1;
|
||
}
|
||
if (!changed && PyString_CheckExact(input_obj)) {
|
||
Py_DECREF(result);
|
||
Py_INCREF(input_obj);
|
||
return input_obj;
|
||
}
|
||
/* Fix the size of the resulting string */
|
||
if (inlen > 0)
|
||
_PyString_Resize(&result, output - output_start);
|
||
return result;
|
||
}
|
||
|
||
|
||
#define FORWARD 1
|
||
#define REVERSE -1
|
||
|
||
/* find and count characters and substrings */
|
||
|
||
#define findchar(target, target_len, c) \
|
||
((char *)memchr((const void *)(target), c, target_len))
|
||
|
||
/* String ops must return a string. */
|
||
/* If the object is subclass of string, create a copy */
|
||
Py_LOCAL(PyStringObject *)
|
||
return_self(PyStringObject *self)
|
||
{
|
||
if (PyString_CheckExact(self)) {
|
||
Py_INCREF(self);
|
||
return self;
|
||
}
|
||
return (PyStringObject *)PyString_FromStringAndSize(
|
||
PyString_AS_STRING(self),
|
||
PyString_GET_SIZE(self));
|
||
}
|
||
|
||
Py_LOCAL_INLINE(Py_ssize_t)
|
||
countchar(const char *target, int target_len, char c, Py_ssize_t maxcount)
|
||
{
|
||
Py_ssize_t count=0;
|
||
const char *start=target;
|
||
const char *end=target+target_len;
|
||
|
||
while ( (start=findchar(start, end-start, c)) != NULL ) {
|
||
count++;
|
||
if (count >= maxcount)
|
||
break;
|
||
start += 1;
|
||
}
|
||
return count;
|
||
}
|
||
|
||
Py_LOCAL(Py_ssize_t)
|
||
findstring(const char *target, Py_ssize_t target_len,
|
||
const char *pattern, Py_ssize_t pattern_len,
|
||
Py_ssize_t start,
|
||
Py_ssize_t end,
|
||
int direction)
|
||
{
|
||
if (start < 0) {
|
||
start += target_len;
|
||
if (start < 0)
|
||
start = 0;
|
||
}
|
||
if (end > target_len) {
|
||
end = target_len;
|
||
} else if (end < 0) {
|
||
end += target_len;
|
||
if (end < 0)
|
||
end = 0;
|
||
}
|
||
|
||
/* zero-length substrings always match at the first attempt */
|
||
if (pattern_len == 0)
|
||
return (direction > 0) ? start : end;
|
||
|
||
end -= pattern_len;
|
||
|
||
if (direction < 0) {
|
||
for (; end >= start; end--)
|
||
if (Py_STRING_MATCH(target, end, pattern, pattern_len))
|
||
return end;
|
||
} else {
|
||
for (; start <= end; start++)
|
||
if (Py_STRING_MATCH(target, start, pattern, pattern_len))
|
||
return start;
|
||
}
|
||
return -1;
|
||
}
|
||
|
||
Py_LOCAL_INLINE(Py_ssize_t)
|
||
countstring(const char *target, Py_ssize_t target_len,
|
||
const char *pattern, Py_ssize_t pattern_len,
|
||
Py_ssize_t start,
|
||
Py_ssize_t end,
|
||
int direction, Py_ssize_t maxcount)
|
||
{
|
||
Py_ssize_t count=0;
|
||
|
||
if (start < 0) {
|
||
start += target_len;
|
||
if (start < 0)
|
||
start = 0;
|
||
}
|
||
if (end > target_len) {
|
||
end = target_len;
|
||
} else if (end < 0) {
|
||
end += target_len;
|
||
if (end < 0)
|
||
end = 0;
|
||
}
|
||
|
||
/* zero-length substrings match everywhere */
|
||
if (pattern_len == 0 || maxcount == 0) {
|
||
if (target_len+1 < maxcount)
|
||
return target_len+1;
|
||
return maxcount;
|
||
}
|
||
|
||
end -= pattern_len;
|
||
if (direction < 0) {
|
||
for (; (end >= start); end--)
|
||
if (Py_STRING_MATCH(target, end, pattern, pattern_len)) {
|
||
count++;
|
||
if (--maxcount <= 0) break;
|
||
end -= pattern_len-1;
|
||
}
|
||
} else {
|
||
for (; (start <= end); start++)
|
||
if (Py_STRING_MATCH(target, start, pattern, pattern_len)) {
|
||
count++;
|
||
if (--maxcount <= 0)
|
||
break;
|
||
start += pattern_len-1;
|
||
}
|
||
}
|
||
return count;
|
||
}
|
||
|
||
|
||
/* Algorithms for different cases of string replacement */
|
||
|
||
/* len(self)>=1, from="", len(to)>=1, maxcount>=1 */
|
||
Py_LOCAL(PyStringObject *)
|
||
replace_interleave(PyStringObject *self,
|
||
const char *to_s, Py_ssize_t to_len,
|
||
Py_ssize_t maxcount)
|
||
{
|
||
char *self_s, *result_s;
|
||
Py_ssize_t self_len, result_len;
|
||
Py_ssize_t count, i, product;
|
||
PyStringObject *result;
|
||
|
||
self_len = PyString_GET_SIZE(self);
|
||
|
||
/* 1 at the end plus 1 after every character */
|
||
count = self_len+1;
|
||
if (maxcount < count)
|
||
count = maxcount;
|
||
|
||
/* Check for overflow */
|
||
/* result_len = count * to_len + self_len; */
|
||
product = count * to_len;
|
||
if (product / to_len != count) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"replace string is too long");
|
||
return NULL;
|
||
}
|
||
result_len = product + self_len;
|
||
if (result_len < 0) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"replace string is too long");
|
||
return NULL;
|
||
}
|
||
|
||
if (! (result = (PyStringObject *)
|
||
PyString_FromStringAndSize(NULL, result_len)) )
|
||
return NULL;
|
||
|
||
self_s = PyString_AS_STRING(self);
|
||
result_s = PyString_AS_STRING(result);
|
||
|
||
/* TODO: special case single character, which doesn't need memcpy */
|
||
|
||
/* Lay the first one down (guaranteed this will occur) */
|
||
Py_MEMCPY(result_s, to_s, to_len);
|
||
result_s += to_len;
|
||
count -= 1;
|
||
|
||
for (i=0; i<count; i++) {
|
||
*result_s++ = *self_s++;
|
||
Py_MEMCPY(result_s, to_s, to_len);
|
||
result_s += to_len;
|
||
}
|
||
|
||
/* Copy the rest of the original string */
|
||
Py_MEMCPY(result_s, self_s, self_len-i);
|
||
|
||
return result;
|
||
}
|
||
|
||
/* Special case for deleting a single character */
|
||
/* len(self)>=1, len(from)==1, to="", maxcount>=1 */
|
||
Py_LOCAL(PyStringObject *)
|
||
replace_delete_single_character(PyStringObject *self,
|
||
char from_c, Py_ssize_t maxcount)
|
||
{
|
||
char *self_s, *result_s;
|
||
char *start, *next, *end;
|
||
Py_ssize_t self_len, result_len;
|
||
Py_ssize_t count;
|
||
PyStringObject *result;
|
||
|
||
self_len = PyString_GET_SIZE(self);
|
||
self_s = PyString_AS_STRING(self);
|
||
|
||
count = countchar(self_s, self_len, from_c, maxcount);
|
||
if (count == 0) {
|
||
return return_self(self);
|
||
}
|
||
|
||
result_len = self_len - count; /* from_len == 1 */
|
||
assert(result_len>=0);
|
||
|
||
if ( (result = (PyStringObject *)
|
||
PyString_FromStringAndSize(NULL, result_len)) == NULL)
|
||
return NULL;
|
||
result_s = PyString_AS_STRING(result);
|
||
|
||
start = self_s;
|
||
end = self_s + self_len;
|
||
while (count-- > 0) {
|
||
next = findchar(start, end-start, from_c);
|
||
if (next == NULL)
|
||
break;
|
||
Py_MEMCPY(result_s, start, next-start);
|
||
result_s += (next-start);
|
||
start = next+1;
|
||
}
|
||
Py_MEMCPY(result_s, start, end-start);
|
||
|
||
return result;
|
||
}
|
||
|
||
/* len(self)>=1, len(from)>=2, to="", maxcount>=1 */
|
||
|
||
Py_LOCAL(PyStringObject *)
|
||
replace_delete_substring(PyStringObject *self,
|
||
const char *from_s, Py_ssize_t from_len,
|
||
Py_ssize_t maxcount) {
|
||
char *self_s, *result_s;
|
||
char *start, *next, *end;
|
||
Py_ssize_t self_len, result_len;
|
||
Py_ssize_t count, offset;
|
||
PyStringObject *result;
|
||
|
||
self_len = PyString_GET_SIZE(self);
|
||
self_s = PyString_AS_STRING(self);
|
||
|
||
count = countstring(self_s, self_len,
|
||
from_s, from_len,
|
||
0, self_len, 1,
|
||
maxcount);
|
||
|
||
if (count == 0) {
|
||
/* no matches */
|
||
return return_self(self);
|
||
}
|
||
|
||
result_len = self_len - (count * from_len);
|
||
assert (result_len>=0);
|
||
|
||
if ( (result = (PyStringObject *)
|
||
PyString_FromStringAndSize(NULL, result_len)) == NULL )
|
||
return NULL;
|
||
|
||
result_s = PyString_AS_STRING(result);
|
||
|
||
start = self_s;
|
||
end = self_s + self_len;
|
||
while (count-- > 0) {
|
||
offset = findstring(start, end-start,
|
||
from_s, from_len,
|
||
0, end-start, FORWARD);
|
||
if (offset == -1)
|
||
break;
|
||
next = start + offset;
|
||
|
||
Py_MEMCPY(result_s, start, next-start);
|
||
|
||
result_s += (next-start);
|
||
start = next+from_len;
|
||
}
|
||
Py_MEMCPY(result_s, start, end-start);
|
||
return result;
|
||
}
|
||
|
||
/* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */
|
||
Py_LOCAL(PyStringObject *)
|
||
replace_single_character_in_place(PyStringObject *self,
|
||
char from_c, char to_c,
|
||
Py_ssize_t maxcount)
|
||
{
|
||
char *self_s, *result_s, *start, *end, *next;
|
||
Py_ssize_t self_len;
|
||
PyStringObject *result;
|
||
|
||
/* The result string will be the same size */
|
||
self_s = PyString_AS_STRING(self);
|
||
self_len = PyString_GET_SIZE(self);
|
||
|
||
next = findchar(self_s, self_len, from_c);
|
||
|
||
if (next == NULL) {
|
||
/* No matches; return the original string */
|
||
return return_self(self);
|
||
}
|
||
|
||
/* Need to make a new string */
|
||
result = (PyStringObject *) PyString_FromStringAndSize(NULL, self_len);
|
||
if (result == NULL)
|
||
return NULL;
|
||
result_s = PyString_AS_STRING(result);
|
||
Py_MEMCPY(result_s, self_s, self_len);
|
||
|
||
/* change everything in-place, starting with this one */
|
||
start = result_s + (next-self_s);
|
||
*start = to_c;
|
||
start++;
|
||
end = result_s + self_len;
|
||
|
||
while (--maxcount > 0) {
|
||
next = findchar(start, end-start, from_c);
|
||
if (next == NULL)
|
||
break;
|
||
*next = to_c;
|
||
start = next+1;
|
||
}
|
||
|
||
return result;
|
||
}
|
||
|
||
/* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */
|
||
Py_LOCAL(PyStringObject *)
|
||
replace_substring_in_place(PyStringObject *self,
|
||
const char *from_s, Py_ssize_t from_len,
|
||
const char *to_s, Py_ssize_t to_len,
|
||
Py_ssize_t maxcount)
|
||
{
|
||
char *result_s, *start, *end;
|
||
char *self_s;
|
||
Py_ssize_t self_len, offset;
|
||
PyStringObject *result;
|
||
|
||
/* The result string will be the same size */
|
||
|
||
self_s = PyString_AS_STRING(self);
|
||
self_len = PyString_GET_SIZE(self);
|
||
|
||
offset = findstring(self_s, self_len,
|
||
from_s, from_len,
|
||
0, self_len, FORWARD);
|
||
if (offset == -1) {
|
||
/* No matches; return the original string */
|
||
return return_self(self);
|
||
}
|
||
|
||
/* Need to make a new string */
|
||
result = (PyStringObject *) PyString_FromStringAndSize(NULL, self_len);
|
||
if (result == NULL)
|
||
return NULL;
|
||
result_s = PyString_AS_STRING(result);
|
||
Py_MEMCPY(result_s, self_s, self_len);
|
||
|
||
/* change everything in-place, starting with this one */
|
||
start = result_s + offset;
|
||
Py_MEMCPY(start, to_s, from_len);
|
||
start += from_len;
|
||
end = result_s + self_len;
|
||
|
||
while ( --maxcount > 0) {
|
||
offset = findstring(start, end-start,
|
||
from_s, from_len,
|
||
0, end-start, FORWARD);
|
||
if (offset==-1)
|
||
break;
|
||
Py_MEMCPY(start+offset, to_s, from_len);
|
||
start += offset+from_len;
|
||
}
|
||
|
||
return result;
|
||
}
|
||
|
||
/* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */
|
||
Py_LOCAL(PyStringObject *)
|
||
replace_single_character(PyStringObject *self,
|
||
char from_c,
|
||
const char *to_s, Py_ssize_t to_len,
|
||
Py_ssize_t maxcount)
|
||
{
|
||
char *self_s, *result_s;
|
||
char *start, *next, *end;
|
||
Py_ssize_t self_len, result_len;
|
||
Py_ssize_t count, product;
|
||
PyStringObject *result;
|
||
|
||
self_s = PyString_AS_STRING(self);
|
||
self_len = PyString_GET_SIZE(self);
|
||
|
||
count = countchar(self_s, self_len, from_c, maxcount);
|
||
if (count == 0) {
|
||
/* no matches, return unchanged */
|
||
return return_self(self);
|
||
}
|
||
|
||
/* use the difference between current and new, hence the "-1" */
|
||
/* result_len = self_len + count * (to_len-1) */
|
||
product = count * (to_len-1);
|
||
if (product / (to_len-1) != count) {
|
||
PyErr_SetString(PyExc_OverflowError, "replace string is too long");
|
||
return NULL;
|
||
}
|
||
result_len = self_len + product;
|
||
if (result_len < 0) {
|
||
PyErr_SetString(PyExc_OverflowError, "replace string is too long");
|
||
return NULL;
|
||
}
|
||
|
||
if ( (result = (PyStringObject *)
|
||
PyString_FromStringAndSize(NULL, result_len)) == NULL)
|
||
return NULL;
|
||
result_s = PyString_AS_STRING(result);
|
||
|
||
start = self_s;
|
||
end = self_s + self_len;
|
||
while (count-- > 0) {
|
||
next = findchar(start, end-start, from_c);
|
||
if (next == NULL)
|
||
break;
|
||
|
||
if (next == start) {
|
||
/* replace with the 'to' */
|
||
Py_MEMCPY(result_s, to_s, to_len);
|
||
result_s += to_len;
|
||
start += 1;
|
||
} else {
|
||
/* copy the unchanged old then the 'to' */
|
||
Py_MEMCPY(result_s, start, next-start);
|
||
result_s += (next-start);
|
||
Py_MEMCPY(result_s, to_s, to_len);
|
||
result_s += to_len;
|
||
start = next+1;
|
||
}
|
||
}
|
||
/* Copy the remainder of the remaining string */
|
||
Py_MEMCPY(result_s, start, end-start);
|
||
|
||
return result;
|
||
}
|
||
|
||
/* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */
|
||
Py_LOCAL(PyStringObject *)
|
||
replace_substring(PyStringObject *self,
|
||
const char *from_s, Py_ssize_t from_len,
|
||
const char *to_s, Py_ssize_t to_len,
|
||
Py_ssize_t maxcount) {
|
||
char *self_s, *result_s;
|
||
char *start, *next, *end;
|
||
Py_ssize_t self_len, result_len;
|
||
Py_ssize_t count, offset, product;
|
||
PyStringObject *result;
|
||
|
||
self_s = PyString_AS_STRING(self);
|
||
self_len = PyString_GET_SIZE(self);
|
||
|
||
count = countstring(self_s, self_len,
|
||
from_s, from_len,
|
||
0, self_len, FORWARD, maxcount);
|
||
if (count == 0) {
|
||
/* no matches, return unchanged */
|
||
return return_self(self);
|
||
}
|
||
|
||
/* Check for overflow */
|
||
/* result_len = self_len + count * (to_len-from_len) */
|
||
product = count * (to_len-from_len);
|
||
if (product / (to_len-from_len) != count) {
|
||
PyErr_SetString(PyExc_OverflowError, "replace string is too long");
|
||
return NULL;
|
||
}
|
||
result_len = self_len + product;
|
||
if (result_len < 0) {
|
||
PyErr_SetString(PyExc_OverflowError, "replace string is too long");
|
||
return NULL;
|
||
}
|
||
|
||
if ( (result = (PyStringObject *)
|
||
PyString_FromStringAndSize(NULL, result_len)) == NULL)
|
||
return NULL;
|
||
result_s = PyString_AS_STRING(result);
|
||
|
||
start = self_s;
|
||
end = self_s + self_len;
|
||
while (count-- > 0) {
|
||
offset = findstring(start, end-start,
|
||
from_s, from_len,
|
||
0, end-start, FORWARD);
|
||
if (offset == -1)
|
||
break;
|
||
next = start+offset;
|
||
if (next == start) {
|
||
/* replace with the 'to' */
|
||
Py_MEMCPY(result_s, to_s, to_len);
|
||
result_s += to_len;
|
||
start += from_len;
|
||
} else {
|
||
/* copy the unchanged old then the 'to' */
|
||
Py_MEMCPY(result_s, start, next-start);
|
||
result_s += (next-start);
|
||
Py_MEMCPY(result_s, to_s, to_len);
|
||
result_s += to_len;
|
||
start = next+from_len;
|
||
}
|
||
}
|
||
/* Copy the remainder of the remaining string */
|
||
Py_MEMCPY(result_s, start, end-start);
|
||
|
||
return result;
|
||
}
|
||
|
||
|
||
Py_LOCAL(PyStringObject *)
|
||
replace(PyStringObject *self,
|
||
const char *from_s, Py_ssize_t from_len,
|
||
const char *to_s, Py_ssize_t to_len,
|
||
Py_ssize_t maxcount)
|
||
{
|
||
if (maxcount < 0) {
|
||
maxcount = PY_SSIZE_T_MAX;
|
||
} else if (maxcount == 0 || PyString_GET_SIZE(self) == 0) {
|
||
/* nothing to do; return the original string */
|
||
return return_self(self);
|
||
}
|
||
|
||
if (maxcount == 0 ||
|
||
(from_len == 0 && to_len == 0)) {
|
||
/* nothing to do; return the original string */
|
||
return return_self(self);
|
||
}
|
||
|
||
/* Handle zero-length special cases */
|
||
|
||
if (from_len == 0) {
|
||
/* insert the 'to' string everywhere. */
|
||
/* >>> "Python".replace("", ".") */
|
||
/* '.P.y.t.h.o.n.' */
|
||
return replace_interleave(self, to_s, to_len, maxcount);
|
||
}
|
||
|
||
/* Except for "".replace("", "A") == "A" there is no way beyond this */
|
||
/* point for an empty self string to generate a non-empty string */
|
||
/* Special case so the remaining code always gets a non-empty string */
|
||
if (PyString_GET_SIZE(self) == 0) {
|
||
return return_self(self);
|
||
}
|
||
|
||
if (to_len == 0) {
|
||
/* delete all occurances of 'from' string */
|
||
if (from_len == 1) {
|
||
return replace_delete_single_character(
|
||
self, from_s[0], maxcount);
|
||
} else {
|
||
return replace_delete_substring(self, from_s, from_len, maxcount);
|
||
}
|
||
}
|
||
|
||
/* Handle special case where both strings have the same length */
|
||
|
||
if (from_len == to_len) {
|
||
if (from_len == 1) {
|
||
return replace_single_character_in_place(
|
||
self,
|
||
from_s[0],
|
||
to_s[0],
|
||
maxcount);
|
||
} else {
|
||
return replace_substring_in_place(
|
||
self, from_s, from_len, to_s, to_len, maxcount);
|
||
}
|
||
}
|
||
|
||
/* Otherwise use the more generic algorithms */
|
||
if (from_len == 1) {
|
||
return replace_single_character(self, from_s[0],
|
||
to_s, to_len, maxcount);
|
||
} else {
|
||
/* len('from')>=2, len('to')>=1 */
|
||
return replace_substring(self, from_s, from_len, to_s, to_len, maxcount);
|
||
}
|
||
}
|
||
|
||
PyDoc_STRVAR(replace__doc__,
|
||
"S.replace (old, new[, count]) -> string\n\
|
||
\n\
|
||
Return a copy of string S with all occurrences of substring\n\
|
||
old replaced by new. If the optional argument count is\n\
|
||
given, only the first count occurrences are replaced.");
|
||
|
||
static PyObject *
|
||
string_replace(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t count = -1;
|
||
PyObject *from, *to;
|
||
const char *from_s, *to_s;
|
||
Py_ssize_t from_len, to_len;
|
||
|
||
if (!PyArg_ParseTuple(args, "OO|n:replace", &from, &to, &count))
|
||
return NULL;
|
||
|
||
if (PyString_Check(from)) {
|
||
from_s = PyString_AS_STRING(from);
|
||
from_len = PyString_GET_SIZE(from);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
if (PyUnicode_Check(from))
|
||
return PyUnicode_Replace((PyObject *)self,
|
||
from, to, count);
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(from, &from_s, &from_len))
|
||
return NULL;
|
||
|
||
if (PyString_Check(to)) {
|
||
to_s = PyString_AS_STRING(to);
|
||
to_len = PyString_GET_SIZE(to);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(to))
|
||
return PyUnicode_Replace((PyObject *)self,
|
||
from, to, count);
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(to, &to_s, &to_len))
|
||
return NULL;
|
||
|
||
return (PyObject *)replace((PyStringObject *) self,
|
||
from_s, from_len,
|
||
to_s, to_len, count);
|
||
}
|
||
|
||
/** End DALKE **/
|
||
|
||
/* Matches the end (direction >= 0) or start (direction < 0) of self
|
||
* against substr, using the start and end arguments. Returns
|
||
* -1 on error, 0 if not found and 1 if found.
|
||
*/
|
||
Py_LOCAL(int)
|
||
_string_tailmatch(PyStringObject *self, PyObject *substr, Py_ssize_t start,
|
||
Py_ssize_t end, int direction)
|
||
{
|
||
Py_ssize_t len = PyString_GET_SIZE(self);
|
||
Py_ssize_t slen;
|
||
const char* sub;
|
||
const char* str;
|
||
|
||
if (PyString_Check(substr)) {
|
||
sub = PyString_AS_STRING(substr);
|
||
slen = PyString_GET_SIZE(substr);
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(substr))
|
||
return PyUnicode_Tailmatch((PyObject *)self,
|
||
substr, start, end, direction);
|
||
#endif
|
||
else if (PyObject_AsCharBuffer(substr, &sub, &slen))
|
||
return -1;
|
||
str = PyString_AS_STRING(self);
|
||
|
||
string_adjust_indices(&start, &end, len);
|
||
|
||
if (direction < 0) {
|
||
/* startswith */
|
||
if (start+slen > len)
|
||
return 0;
|
||
} else {
|
||
/* endswith */
|
||
if (end-start < slen || start > len)
|
||
return 0;
|
||
|
||
if (end-slen > start)
|
||
start = end - slen;
|
||
}
|
||
if (end-start >= slen)
|
||
return ! memcmp(str+start, sub, slen);
|
||
return 0;
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(startswith__doc__,
|
||
"S.startswith(prefix[, start[, end]]) -> bool\n\
|
||
\n\
|
||
Return True if S starts with the specified prefix, False otherwise.\n\
|
||
With optional start, test S beginning at that position.\n\
|
||
With optional end, stop comparing S at that position.\n\
|
||
prefix can also be a tuple of strings to try.");
|
||
|
||
static PyObject *
|
||
string_startswith(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t start = 0;
|
||
Py_ssize_t end = PY_SSIZE_T_MAX;
|
||
PyObject *subobj;
|
||
int result;
|
||
|
||
if (!PyArg_ParseTuple(args, "O|O&O&:startswith", &subobj,
|
||
_PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
|
||
return NULL;
|
||
if (PyTuple_Check(subobj)) {
|
||
Py_ssize_t i;
|
||
for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) {
|
||
result = _string_tailmatch(self,
|
||
PyTuple_GET_ITEM(subobj, i),
|
||
start, end, -1);
|
||
if (result == -1)
|
||
return NULL;
|
||
else if (result) {
|
||
Py_RETURN_TRUE;
|
||
}
|
||
}
|
||
Py_RETURN_FALSE;
|
||
}
|
||
result = _string_tailmatch(self, subobj, start, end, -1);
|
||
if (result == -1)
|
||
return NULL;
|
||
else
|
||
return PyBool_FromLong(result);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(endswith__doc__,
|
||
"S.endswith(suffix[, start[, end]]) -> bool\n\
|
||
\n\
|
||
Return True if S ends with the specified suffix, False otherwise.\n\
|
||
With optional start, test S beginning at that position.\n\
|
||
With optional end, stop comparing S at that position.\n\
|
||
suffix can also be a tuple of strings to try.");
|
||
|
||
static PyObject *
|
||
string_endswith(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t start = 0;
|
||
Py_ssize_t end = PY_SSIZE_T_MAX;
|
||
PyObject *subobj;
|
||
int result;
|
||
|
||
if (!PyArg_ParseTuple(args, "O|O&O&:endswith", &subobj,
|
||
_PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
|
||
return NULL;
|
||
if (PyTuple_Check(subobj)) {
|
||
Py_ssize_t i;
|
||
for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) {
|
||
result = _string_tailmatch(self,
|
||
PyTuple_GET_ITEM(subobj, i),
|
||
start, end, +1);
|
||
if (result == -1)
|
||
return NULL;
|
||
else if (result) {
|
||
Py_RETURN_TRUE;
|
||
}
|
||
}
|
||
Py_RETURN_FALSE;
|
||
}
|
||
result = _string_tailmatch(self, subobj, start, end, +1);
|
||
if (result == -1)
|
||
return NULL;
|
||
else
|
||
return PyBool_FromLong(result);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(encode__doc__,
|
||
"S.encode([encoding[,errors]]) -> object\n\
|
||
\n\
|
||
Encodes S using the codec registered for encoding. encoding defaults\n\
|
||
to the default encoding. errors may be given to set a different error\n\
|
||
handling scheme. Default is 'strict' meaning that encoding errors raise\n\
|
||
a UnicodeEncodeError. Other possible values are 'ignore', 'replace' and\n\
|
||
'xmlcharrefreplace' as well as any other name registered with\n\
|
||
codecs.register_error that is able to handle UnicodeEncodeErrors.");
|
||
|
||
static PyObject *
|
||
string_encode(PyStringObject *self, PyObject *args)
|
||
{
|
||
char *encoding = NULL;
|
||
char *errors = NULL;
|
||
PyObject *v;
|
||
|
||
if (!PyArg_ParseTuple(args, "|ss:encode", &encoding, &errors))
|
||
return NULL;
|
||
v = PyString_AsEncodedObject((PyObject *)self, encoding, errors);
|
||
if (v == NULL)
|
||
goto onError;
|
||
if (!PyString_Check(v) && !PyUnicode_Check(v)) {
|
||
PyErr_Format(PyExc_TypeError,
|
||
"encoder did not return a string/unicode object "
|
||
"(type=%.400s)",
|
||
v->ob_type->tp_name);
|
||
Py_DECREF(v);
|
||
return NULL;
|
||
}
|
||
return v;
|
||
|
||
onError:
|
||
return NULL;
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(decode__doc__,
|
||
"S.decode([encoding[,errors]]) -> object\n\
|
||
\n\
|
||
Decodes S using the codec registered for encoding. encoding defaults\n\
|
||
to the default encoding. errors may be given to set a different error\n\
|
||
handling scheme. Default is 'strict' meaning that encoding errors raise\n\
|
||
a UnicodeDecodeError. Other possible values are 'ignore' and 'replace'\n\
|
||
as well as any other name registerd with codecs.register_error that is\n\
|
||
able to handle UnicodeDecodeErrors.");
|
||
|
||
static PyObject *
|
||
string_decode(PyStringObject *self, PyObject *args)
|
||
{
|
||
char *encoding = NULL;
|
||
char *errors = NULL;
|
||
PyObject *v;
|
||
|
||
if (!PyArg_ParseTuple(args, "|ss:decode", &encoding, &errors))
|
||
return NULL;
|
||
v = PyString_AsDecodedObject((PyObject *)self, encoding, errors);
|
||
if (v == NULL)
|
||
goto onError;
|
||
if (!PyString_Check(v) && !PyUnicode_Check(v)) {
|
||
PyErr_Format(PyExc_TypeError,
|
||
"decoder did not return a string/unicode object "
|
||
"(type=%.400s)",
|
||
v->ob_type->tp_name);
|
||
Py_DECREF(v);
|
||
return NULL;
|
||
}
|
||
return v;
|
||
|
||
onError:
|
||
return NULL;
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(expandtabs__doc__,
|
||
"S.expandtabs([tabsize]) -> string\n\
|
||
\n\
|
||
Return a copy of S where all tab characters are expanded using spaces.\n\
|
||
If tabsize is not given, a tab size of 8 characters is assumed.");
|
||
|
||
static PyObject*
|
||
string_expandtabs(PyStringObject *self, PyObject *args)
|
||
{
|
||
const char *e, *p;
|
||
char *q;
|
||
Py_ssize_t i, j;
|
||
PyObject *u;
|
||
int tabsize = 8;
|
||
|
||
if (!PyArg_ParseTuple(args, "|i:expandtabs", &tabsize))
|
||
return NULL;
|
||
|
||
/* First pass: determine size of output string */
|
||
i = j = 0;
|
||
e = PyString_AS_STRING(self) + PyString_GET_SIZE(self);
|
||
for (p = PyString_AS_STRING(self); p < e; p++)
|
||
if (*p == '\t') {
|
||
if (tabsize > 0)
|
||
j += tabsize - (j % tabsize);
|
||
}
|
||
else {
|
||
j++;
|
||
if (*p == '\n' || *p == '\r') {
|
||
i += j;
|
||
j = 0;
|
||
}
|
||
}
|
||
|
||
/* Second pass: create output string and fill it */
|
||
u = PyString_FromStringAndSize(NULL, i + j);
|
||
if (!u)
|
||
return NULL;
|
||
|
||
j = 0;
|
||
q = PyString_AS_STRING(u);
|
||
|
||
for (p = PyString_AS_STRING(self); p < e; p++)
|
||
if (*p == '\t') {
|
||
if (tabsize > 0) {
|
||
i = tabsize - (j % tabsize);
|
||
j += i;
|
||
while (i--)
|
||
*q++ = ' ';
|
||
}
|
||
}
|
||
else {
|
||
j++;
|
||
*q++ = *p;
|
||
if (*p == '\n' || *p == '\r')
|
||
j = 0;
|
||
}
|
||
|
||
return u;
|
||
}
|
||
|
||
Py_LOCAL_INLINE(PyObject *)
|
||
pad(PyStringObject *self, Py_ssize_t left, Py_ssize_t right, char fill)
|
||
{
|
||
PyObject *u;
|
||
|
||
if (left < 0)
|
||
left = 0;
|
||
if (right < 0)
|
||
right = 0;
|
||
|
||
if (left == 0 && right == 0 && PyString_CheckExact(self)) {
|
||
Py_INCREF(self);
|
||
return (PyObject *)self;
|
||
}
|
||
|
||
u = PyString_FromStringAndSize(NULL,
|
||
left + PyString_GET_SIZE(self) + right);
|
||
if (u) {
|
||
if (left)
|
||
memset(PyString_AS_STRING(u), fill, left);
|
||
Py_MEMCPY(PyString_AS_STRING(u) + left,
|
||
PyString_AS_STRING(self),
|
||
PyString_GET_SIZE(self));
|
||
if (right)
|
||
memset(PyString_AS_STRING(u) + left + PyString_GET_SIZE(self),
|
||
fill, right);
|
||
}
|
||
|
||
return u;
|
||
}
|
||
|
||
PyDoc_STRVAR(ljust__doc__,
|
||
"S.ljust(width[, fillchar]) -> string\n"
|
||
"\n"
|
||
"Return S left justified in a string of length width. Padding is\n"
|
||
"done using the specified fill character (default is a space).");
|
||
|
||
static PyObject *
|
||
string_ljust(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t width;
|
||
char fillchar = ' ';
|
||
|
||
if (!PyArg_ParseTuple(args, "n|c:ljust", &width, &fillchar))
|
||
return NULL;
|
||
|
||
if (PyString_GET_SIZE(self) >= width && PyString_CheckExact(self)) {
|
||
Py_INCREF(self);
|
||
return (PyObject*) self;
|
||
}
|
||
|
||
return pad(self, 0, width - PyString_GET_SIZE(self), fillchar);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(rjust__doc__,
|
||
"S.rjust(width[, fillchar]) -> string\n"
|
||
"\n"
|
||
"Return S right justified in a string of length width. Padding is\n"
|
||
"done using the specified fill character (default is a space)");
|
||
|
||
static PyObject *
|
||
string_rjust(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t width;
|
||
char fillchar = ' ';
|
||
|
||
if (!PyArg_ParseTuple(args, "n|c:rjust", &width, &fillchar))
|
||
return NULL;
|
||
|
||
if (PyString_GET_SIZE(self) >= width && PyString_CheckExact(self)) {
|
||
Py_INCREF(self);
|
||
return (PyObject*) self;
|
||
}
|
||
|
||
return pad(self, width - PyString_GET_SIZE(self), 0, fillchar);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(center__doc__,
|
||
"S.center(width[, fillchar]) -> string\n"
|
||
"\n"
|
||
"Return S centered in a string of length width. Padding is\n"
|
||
"done using the specified fill character (default is a space)");
|
||
|
||
static PyObject *
|
||
string_center(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t marg, left;
|
||
Py_ssize_t width;
|
||
char fillchar = ' ';
|
||
|
||
if (!PyArg_ParseTuple(args, "n|c:center", &width, &fillchar))
|
||
return NULL;
|
||
|
||
if (PyString_GET_SIZE(self) >= width && PyString_CheckExact(self)) {
|
||
Py_INCREF(self);
|
||
return (PyObject*) self;
|
||
}
|
||
|
||
marg = width - PyString_GET_SIZE(self);
|
||
left = marg / 2 + (marg & width & 1);
|
||
|
||
return pad(self, left, marg - left, fillchar);
|
||
}
|
||
|
||
PyDoc_STRVAR(zfill__doc__,
|
||
"S.zfill(width) -> string\n"
|
||
"\n"
|
||
"Pad a numeric string S with zeros on the left, to fill a field\n"
|
||
"of the specified width. The string S is never truncated.");
|
||
|
||
static PyObject *
|
||
string_zfill(PyStringObject *self, PyObject *args)
|
||
{
|
||
Py_ssize_t fill;
|
||
PyObject *s;
|
||
char *p;
|
||
Py_ssize_t width;
|
||
|
||
if (!PyArg_ParseTuple(args, "n:zfill", &width))
|
||
return NULL;
|
||
|
||
if (PyString_GET_SIZE(self) >= width) {
|
||
if (PyString_CheckExact(self)) {
|
||
Py_INCREF(self);
|
||
return (PyObject*) self;
|
||
}
|
||
else
|
||
return PyString_FromStringAndSize(
|
||
PyString_AS_STRING(self),
|
||
PyString_GET_SIZE(self)
|
||
);
|
||
}
|
||
|
||
fill = width - PyString_GET_SIZE(self);
|
||
|
||
s = pad(self, fill, 0, '0');
|
||
|
||
if (s == NULL)
|
||
return NULL;
|
||
|
||
p = PyString_AS_STRING(s);
|
||
if (p[fill] == '+' || p[fill] == '-') {
|
||
/* move sign to beginning of string */
|
||
p[0] = p[fill];
|
||
p[fill] = '0';
|
||
}
|
||
|
||
return (PyObject*) s;
|
||
}
|
||
|
||
PyDoc_STRVAR(isspace__doc__,
|
||
"S.isspace() -> bool\n\
|
||
\n\
|
||
Return True if all characters in S are whitespace\n\
|
||
and there is at least one character in S, False otherwise.");
|
||
|
||
static PyObject*
|
||
string_isspace(PyStringObject *self)
|
||
{
|
||
register const unsigned char *p
|
||
= (unsigned char *) PyString_AS_STRING(self);
|
||
register const unsigned char *e;
|
||
|
||
/* Shortcut for single character strings */
|
||
if (PyString_GET_SIZE(self) == 1 &&
|
||
isspace(*p))
|
||
return PyBool_FromLong(1);
|
||
|
||
/* Special case for empty strings */
|
||
if (PyString_GET_SIZE(self) == 0)
|
||
return PyBool_FromLong(0);
|
||
|
||
e = p + PyString_GET_SIZE(self);
|
||
for (; p < e; p++) {
|
||
if (!isspace(*p))
|
||
return PyBool_FromLong(0);
|
||
}
|
||
return PyBool_FromLong(1);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(isalpha__doc__,
|
||
"S.isalpha() -> bool\n\
|
||
\n\
|
||
Return True if all characters in S are alphabetic\n\
|
||
and there is at least one character in S, False otherwise.");
|
||
|
||
static PyObject*
|
||
string_isalpha(PyStringObject *self)
|
||
{
|
||
register const unsigned char *p
|
||
= (unsigned char *) PyString_AS_STRING(self);
|
||
register const unsigned char *e;
|
||
|
||
/* Shortcut for single character strings */
|
||
if (PyString_GET_SIZE(self) == 1 &&
|
||
isalpha(*p))
|
||
return PyBool_FromLong(1);
|
||
|
||
/* Special case for empty strings */
|
||
if (PyString_GET_SIZE(self) == 0)
|
||
return PyBool_FromLong(0);
|
||
|
||
e = p + PyString_GET_SIZE(self);
|
||
for (; p < e; p++) {
|
||
if (!isalpha(*p))
|
||
return PyBool_FromLong(0);
|
||
}
|
||
return PyBool_FromLong(1);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(isalnum__doc__,
|
||
"S.isalnum() -> bool\n\
|
||
\n\
|
||
Return True if all characters in S are alphanumeric\n\
|
||
and there is at least one character in S, False otherwise.");
|
||
|
||
static PyObject*
|
||
string_isalnum(PyStringObject *self)
|
||
{
|
||
register const unsigned char *p
|
||
= (unsigned char *) PyString_AS_STRING(self);
|
||
register const unsigned char *e;
|
||
|
||
/* Shortcut for single character strings */
|
||
if (PyString_GET_SIZE(self) == 1 &&
|
||
isalnum(*p))
|
||
return PyBool_FromLong(1);
|
||
|
||
/* Special case for empty strings */
|
||
if (PyString_GET_SIZE(self) == 0)
|
||
return PyBool_FromLong(0);
|
||
|
||
e = p + PyString_GET_SIZE(self);
|
||
for (; p < e; p++) {
|
||
if (!isalnum(*p))
|
||
return PyBool_FromLong(0);
|
||
}
|
||
return PyBool_FromLong(1);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(isdigit__doc__,
|
||
"S.isdigit() -> bool\n\
|
||
\n\
|
||
Return True if all characters in S are digits\n\
|
||
and there is at least one character in S, False otherwise.");
|
||
|
||
static PyObject*
|
||
string_isdigit(PyStringObject *self)
|
||
{
|
||
register const unsigned char *p
|
||
= (unsigned char *) PyString_AS_STRING(self);
|
||
register const unsigned char *e;
|
||
|
||
/* Shortcut for single character strings */
|
||
if (PyString_GET_SIZE(self) == 1 &&
|
||
isdigit(*p))
|
||
return PyBool_FromLong(1);
|
||
|
||
/* Special case for empty strings */
|
||
if (PyString_GET_SIZE(self) == 0)
|
||
return PyBool_FromLong(0);
|
||
|
||
e = p + PyString_GET_SIZE(self);
|
||
for (; p < e; p++) {
|
||
if (!isdigit(*p))
|
||
return PyBool_FromLong(0);
|
||
}
|
||
return PyBool_FromLong(1);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(islower__doc__,
|
||
"S.islower() -> bool\n\
|
||
\n\
|
||
Return True if all cased characters in S are lowercase and there is\n\
|
||
at least one cased character in S, False otherwise.");
|
||
|
||
static PyObject*
|
||
string_islower(PyStringObject *self)
|
||
{
|
||
register const unsigned char *p
|
||
= (unsigned char *) PyString_AS_STRING(self);
|
||
register const unsigned char *e;
|
||
int cased;
|
||
|
||
/* Shortcut for single character strings */
|
||
if (PyString_GET_SIZE(self) == 1)
|
||
return PyBool_FromLong(islower(*p) != 0);
|
||
|
||
/* Special case for empty strings */
|
||
if (PyString_GET_SIZE(self) == 0)
|
||
return PyBool_FromLong(0);
|
||
|
||
e = p + PyString_GET_SIZE(self);
|
||
cased = 0;
|
||
for (; p < e; p++) {
|
||
if (isupper(*p))
|
||
return PyBool_FromLong(0);
|
||
else if (!cased && islower(*p))
|
||
cased = 1;
|
||
}
|
||
return PyBool_FromLong(cased);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(isupper__doc__,
|
||
"S.isupper() -> bool\n\
|
||
\n\
|
||
Return True if all cased characters in S are uppercase and there is\n\
|
||
at least one cased character in S, False otherwise.");
|
||
|
||
static PyObject*
|
||
string_isupper(PyStringObject *self)
|
||
{
|
||
register const unsigned char *p
|
||
= (unsigned char *) PyString_AS_STRING(self);
|
||
register const unsigned char *e;
|
||
int cased;
|
||
|
||
/* Shortcut for single character strings */
|
||
if (PyString_GET_SIZE(self) == 1)
|
||
return PyBool_FromLong(isupper(*p) != 0);
|
||
|
||
/* Special case for empty strings */
|
||
if (PyString_GET_SIZE(self) == 0)
|
||
return PyBool_FromLong(0);
|
||
|
||
e = p + PyString_GET_SIZE(self);
|
||
cased = 0;
|
||
for (; p < e; p++) {
|
||
if (islower(*p))
|
||
return PyBool_FromLong(0);
|
||
else if (!cased && isupper(*p))
|
||
cased = 1;
|
||
}
|
||
return PyBool_FromLong(cased);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(istitle__doc__,
|
||
"S.istitle() -> bool\n\
|
||
\n\
|
||
Return True if S is a titlecased string and there is at least one\n\
|
||
character in S, i.e. uppercase characters may only follow uncased\n\
|
||
characters and lowercase characters only cased ones. Return False\n\
|
||
otherwise.");
|
||
|
||
static PyObject*
|
||
string_istitle(PyStringObject *self, PyObject *uncased)
|
||
{
|
||
register const unsigned char *p
|
||
= (unsigned char *) PyString_AS_STRING(self);
|
||
register const unsigned char *e;
|
||
int cased, previous_is_cased;
|
||
|
||
/* Shortcut for single character strings */
|
||
if (PyString_GET_SIZE(self) == 1)
|
||
return PyBool_FromLong(isupper(*p) != 0);
|
||
|
||
/* Special case for empty strings */
|
||
if (PyString_GET_SIZE(self) == 0)
|
||
return PyBool_FromLong(0);
|
||
|
||
e = p + PyString_GET_SIZE(self);
|
||
cased = 0;
|
||
previous_is_cased = 0;
|
||
for (; p < e; p++) {
|
||
register const unsigned char ch = *p;
|
||
|
||
if (isupper(ch)) {
|
||
if (previous_is_cased)
|
||
return PyBool_FromLong(0);
|
||
previous_is_cased = 1;
|
||
cased = 1;
|
||
}
|
||
else if (islower(ch)) {
|
||
if (!previous_is_cased)
|
||
return PyBool_FromLong(0);
|
||
previous_is_cased = 1;
|
||
cased = 1;
|
||
}
|
||
else
|
||
previous_is_cased = 0;
|
||
}
|
||
return PyBool_FromLong(cased);
|
||
}
|
||
|
||
|
||
PyDoc_STRVAR(splitlines__doc__,
|
||
"S.splitlines([keepends]) -> list of strings\n\
|
||
\n\
|
||
Return a list of the lines in S, breaking at line boundaries.\n\
|
||
Line breaks are not included in the resulting list unless keepends\n\
|
||
is given and true.");
|
||
|
||
static PyObject*
|
||
string_splitlines(PyStringObject *self, PyObject *args)
|
||
{
|
||
register Py_ssize_t i;
|
||
register Py_ssize_t j;
|
||
Py_ssize_t len;
|
||
int keepends = 0;
|
||
PyObject *list;
|
||
PyObject *str;
|
||
char *data;
|
||
|
||
if (!PyArg_ParseTuple(args, "|i:splitlines", &keepends))
|
||
return NULL;
|
||
|
||
data = PyString_AS_STRING(self);
|
||
len = PyString_GET_SIZE(self);
|
||
|
||
/* This does not use the preallocated list because splitlines is
|
||
usually run with hundreds of newlines. The overhead of
|
||
switching between PyList_SET_ITEM and append causes about a
|
||
2-3% slowdown for that common case. A smarter implementation
|
||
could move the if check out, so the SET_ITEMs are done first
|
||
and the appends only done when the prealloc buffer is full.
|
||
That's too much work for little gain.*/
|
||
|
||
list = PyList_New(0);
|
||
if (!list)
|
||
goto onError;
|
||
|
||
for (i = j = 0; i < len; ) {
|
||
Py_ssize_t eol;
|
||
|
||
/* Find a line and append it */
|
||
while (i < len && data[i] != '\n' && data[i] != '\r')
|
||
i++;
|
||
|
||
/* Skip the line break reading CRLF as one line break */
|
||
eol = i;
|
||
if (i < len) {
|
||
if (data[i] == '\r' && i + 1 < len &&
|
||
data[i+1] == '\n')
|
||
i += 2;
|
||
else
|
||
i++;
|
||
if (keepends)
|
||
eol = i;
|
||
}
|
||
SPLIT_APPEND(data, j, eol);
|
||
j = i;
|
||
}
|
||
if (j < len) {
|
||
SPLIT_APPEND(data, j, len);
|
||
}
|
||
|
||
return list;
|
||
|
||
onError:
|
||
Py_XDECREF(list);
|
||
return NULL;
|
||
}
|
||
|
||
#undef SPLIT_APPEND
|
||
#undef SPLIT_ADD
|
||
#undef MAX_PREALLOC
|
||
#undef PREALLOC_SIZE
|
||
|
||
static PyObject *
|
||
string_getnewargs(PyStringObject *v)
|
||
{
|
||
return Py_BuildValue("(s#)", v->ob_sval, v->ob_size);
|
||
}
|
||
|
||
|
||
static PyMethodDef
|
||
string_methods[] = {
|
||
/* Counterparts of the obsolete stropmodule functions; except
|
||
string.maketrans(). */
|
||
{"join", (PyCFunction)string_join, METH_O, join__doc__},
|
||
{"split", (PyCFunction)string_split, METH_VARARGS, split__doc__},
|
||
{"rsplit", (PyCFunction)string_rsplit, METH_VARARGS, rsplit__doc__},
|
||
{"lower", (PyCFunction)string_lower, METH_NOARGS, lower__doc__},
|
||
{"upper", (PyCFunction)string_upper, METH_NOARGS, upper__doc__},
|
||
{"islower", (PyCFunction)string_islower, METH_NOARGS, islower__doc__},
|
||
{"isupper", (PyCFunction)string_isupper, METH_NOARGS, isupper__doc__},
|
||
{"isspace", (PyCFunction)string_isspace, METH_NOARGS, isspace__doc__},
|
||
{"isdigit", (PyCFunction)string_isdigit, METH_NOARGS, isdigit__doc__},
|
||
{"istitle", (PyCFunction)string_istitle, METH_NOARGS, istitle__doc__},
|
||
{"isalpha", (PyCFunction)string_isalpha, METH_NOARGS, isalpha__doc__},
|
||
{"isalnum", (PyCFunction)string_isalnum, METH_NOARGS, isalnum__doc__},
|
||
{"capitalize", (PyCFunction)string_capitalize, METH_NOARGS,
|
||
capitalize__doc__},
|
||
{"count", (PyCFunction)string_count, METH_VARARGS, count__doc__},
|
||
{"endswith", (PyCFunction)string_endswith, METH_VARARGS,
|
||
endswith__doc__},
|
||
{"partition", (PyCFunction)string_partition, METH_O, partition__doc__},
|
||
{"find", (PyCFunction)string_find, METH_VARARGS, find__doc__},
|
||
{"index", (PyCFunction)string_index, METH_VARARGS, index__doc__},
|
||
{"lstrip", (PyCFunction)string_lstrip, METH_VARARGS, lstrip__doc__},
|
||
{"replace", (PyCFunction)string_replace, METH_VARARGS, replace__doc__},
|
||
{"rfind", (PyCFunction)string_rfind, METH_VARARGS, rfind__doc__},
|
||
{"rindex", (PyCFunction)string_rindex, METH_VARARGS, rindex__doc__},
|
||
{"rstrip", (PyCFunction)string_rstrip, METH_VARARGS, rstrip__doc__},
|
||
{"rpartition", (PyCFunction)string_rpartition, METH_O,
|
||
rpartition__doc__},
|
||
{"startswith", (PyCFunction)string_startswith, METH_VARARGS,
|
||
startswith__doc__},
|
||
{"strip", (PyCFunction)string_strip, METH_VARARGS, strip__doc__},
|
||
{"swapcase", (PyCFunction)string_swapcase, METH_NOARGS,
|
||
swapcase__doc__},
|
||
{"translate", (PyCFunction)string_translate, METH_VARARGS,
|
||
translate__doc__},
|
||
{"title", (PyCFunction)string_title, METH_NOARGS, title__doc__},
|
||
{"ljust", (PyCFunction)string_ljust, METH_VARARGS, ljust__doc__},
|
||
{"rjust", (PyCFunction)string_rjust, METH_VARARGS, rjust__doc__},
|
||
{"center", (PyCFunction)string_center, METH_VARARGS, center__doc__},
|
||
{"zfill", (PyCFunction)string_zfill, METH_VARARGS, zfill__doc__},
|
||
{"encode", (PyCFunction)string_encode, METH_VARARGS, encode__doc__},
|
||
{"decode", (PyCFunction)string_decode, METH_VARARGS, decode__doc__},
|
||
{"expandtabs", (PyCFunction)string_expandtabs, METH_VARARGS,
|
||
expandtabs__doc__},
|
||
{"splitlines", (PyCFunction)string_splitlines, METH_VARARGS,
|
||
splitlines__doc__},
|
||
{"__getnewargs__", (PyCFunction)string_getnewargs, METH_NOARGS},
|
||
{NULL, NULL} /* sentinel */
|
||
};
|
||
|
||
static PyObject *
|
||
str_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
|
||
|
||
static PyObject *
|
||
string_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
||
{
|
||
PyObject *x = NULL;
|
||
static char *kwlist[] = {"object", 0};
|
||
|
||
if (type != &PyString_Type)
|
||
return str_subtype_new(type, args, kwds);
|
||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:str", kwlist, &x))
|
||
return NULL;
|
||
if (x == NULL)
|
||
return PyString_FromString("");
|
||
return PyObject_Str(x);
|
||
}
|
||
|
||
static PyObject *
|
||
str_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
||
{
|
||
PyObject *tmp, *pnew;
|
||
Py_ssize_t n;
|
||
|
||
assert(PyType_IsSubtype(type, &PyString_Type));
|
||
tmp = string_new(&PyString_Type, args, kwds);
|
||
if (tmp == NULL)
|
||
return NULL;
|
||
assert(PyString_CheckExact(tmp));
|
||
n = PyString_GET_SIZE(tmp);
|
||
pnew = type->tp_alloc(type, n);
|
||
if (pnew != NULL) {
|
||
Py_MEMCPY(PyString_AS_STRING(pnew), PyString_AS_STRING(tmp), n+1);
|
||
((PyStringObject *)pnew)->ob_shash =
|
||
((PyStringObject *)tmp)->ob_shash;
|
||
((PyStringObject *)pnew)->ob_sstate = SSTATE_NOT_INTERNED;
|
||
}
|
||
Py_DECREF(tmp);
|
||
return pnew;
|
||
}
|
||
|
||
static PyObject *
|
||
basestring_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
||
{
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"The basestring type cannot be instantiated");
|
||
return NULL;
|
||
}
|
||
|
||
static PyObject *
|
||
string_mod(PyObject *v, PyObject *w)
|
||
{
|
||
if (!PyString_Check(v)) {
|
||
Py_INCREF(Py_NotImplemented);
|
||
return Py_NotImplemented;
|
||
}
|
||
return PyString_Format(v, w);
|
||
}
|
||
|
||
PyDoc_STRVAR(basestring_doc,
|
||
"Type basestring cannot be instantiated; it is the base for str and unicode.");
|
||
|
||
static PyNumberMethods string_as_number = {
|
||
0, /*nb_add*/
|
||
0, /*nb_subtract*/
|
||
0, /*nb_multiply*/
|
||
string_mod, /*nb_remainder*/
|
||
};
|
||
|
||
|
||
PyTypeObject PyBaseString_Type = {
|
||
PyObject_HEAD_INIT(&PyType_Type)
|
||
0,
|
||
"basestring",
|
||
0,
|
||
0,
|
||
0, /* tp_dealloc */
|
||
0, /* tp_print */
|
||
0, /* tp_getattr */
|
||
0, /* tp_setattr */
|
||
0, /* tp_compare */
|
||
0, /* tp_repr */
|
||
0, /* tp_as_number */
|
||
0, /* tp_as_sequence */
|
||
0, /* tp_as_mapping */
|
||
0, /* tp_hash */
|
||
0, /* tp_call */
|
||
0, /* tp_str */
|
||
0, /* tp_getattro */
|
||
0, /* tp_setattro */
|
||
0, /* tp_as_buffer */
|
||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
||
basestring_doc, /* tp_doc */
|
||
0, /* tp_traverse */
|
||
0, /* tp_clear */
|
||
0, /* tp_richcompare */
|
||
0, /* tp_weaklistoffset */
|
||
0, /* tp_iter */
|
||
0, /* tp_iternext */
|
||
0, /* tp_methods */
|
||
0, /* tp_members */
|
||
0, /* tp_getset */
|
||
&PyBaseObject_Type, /* tp_base */
|
||
0, /* tp_dict */
|
||
0, /* tp_descr_get */
|
||
0, /* tp_descr_set */
|
||
0, /* tp_dictoffset */
|
||
0, /* tp_init */
|
||
0, /* tp_alloc */
|
||
basestring_new, /* tp_new */
|
||
0, /* tp_free */
|
||
};
|
||
|
||
PyDoc_STRVAR(string_doc,
|
||
"str(object) -> string\n\
|
||
\n\
|
||
Return a nice string representation of the object.\n\
|
||
If the argument is a string, the return value is the same object.");
|
||
|
||
static PyObject *str_iter(PyObject *seq);
|
||
|
||
PyTypeObject PyString_Type = {
|
||
PyObject_HEAD_INIT(&PyType_Type)
|
||
0,
|
||
"str",
|
||
sizeof(PyStringObject),
|
||
sizeof(char),
|
||
string_dealloc, /* tp_dealloc */
|
||
(printfunc)string_print, /* tp_print */
|
||
0, /* tp_getattr */
|
||
0, /* tp_setattr */
|
||
0, /* tp_compare */
|
||
string_repr, /* tp_repr */
|
||
&string_as_number, /* tp_as_number */
|
||
&string_as_sequence, /* tp_as_sequence */
|
||
&string_as_mapping, /* tp_as_mapping */
|
||
(hashfunc)string_hash, /* tp_hash */
|
||
0, /* tp_call */
|
||
string_str, /* tp_str */
|
||
PyObject_GenericGetAttr, /* tp_getattro */
|
||
0, /* tp_setattro */
|
||
&string_as_buffer, /* tp_as_buffer */
|
||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
||
string_doc, /* tp_doc */
|
||
0, /* tp_traverse */
|
||
0, /* tp_clear */
|
||
(richcmpfunc)string_richcompare, /* tp_richcompare */
|
||
0, /* tp_weaklistoffset */
|
||
str_iter, /* tp_iter */
|
||
0, /* tp_iternext */
|
||
string_methods, /* tp_methods */
|
||
0, /* tp_members */
|
||
0, /* tp_getset */
|
||
&PyBaseString_Type, /* tp_base */
|
||
0, /* tp_dict */
|
||
0, /* tp_descr_get */
|
||
0, /* tp_descr_set */
|
||
0, /* tp_dictoffset */
|
||
0, /* tp_init */
|
||
0, /* tp_alloc */
|
||
string_new, /* tp_new */
|
||
PyObject_Del, /* tp_free */
|
||
};
|
||
|
||
void
|
||
PyString_Concat(register PyObject **pv, register PyObject *w)
|
||
{
|
||
register PyObject *v;
|
||
if (*pv == NULL)
|
||
return;
|
||
if (w == NULL || !PyString_Check(*pv)) {
|
||
Py_DECREF(*pv);
|
||
*pv = NULL;
|
||
return;
|
||
}
|
||
v = string_concat((PyStringObject *) *pv, w);
|
||
Py_DECREF(*pv);
|
||
*pv = v;
|
||
}
|
||
|
||
void
|
||
PyString_ConcatAndDel(register PyObject **pv, register PyObject *w)
|
||
{
|
||
PyString_Concat(pv, w);
|
||
Py_XDECREF(w);
|
||
}
|
||
|
||
|
||
/* The following function breaks the notion that strings are immutable:
|
||
it changes the size of a string. We get away with this only if there
|
||
is only one module referencing the object. You can also think of it
|
||
as creating a new string object and destroying the old one, only
|
||
more efficiently. In any case, don't use this if the string may
|
||
already be known to some other part of the code...
|
||
Note that if there's not enough memory to resize the string, the original
|
||
string object at *pv is deallocated, *pv is set to NULL, an "out of
|
||
memory" exception is set, and -1 is returned. Else (on success) 0 is
|
||
returned, and the value in *pv may or may not be the same as on input.
|
||
As always, an extra byte is allocated for a trailing \0 byte (newsize
|
||
does *not* include that), and a trailing \0 byte is stored.
|
||
*/
|
||
|
||
int
|
||
_PyString_Resize(PyObject **pv, Py_ssize_t newsize)
|
||
{
|
||
register PyObject *v;
|
||
register PyStringObject *sv;
|
||
v = *pv;
|
||
if (!PyString_Check(v) || v->ob_refcnt != 1 || newsize < 0 ||
|
||
PyString_CHECK_INTERNED(v)) {
|
||
*pv = 0;
|
||
Py_DECREF(v);
|
||
PyErr_BadInternalCall();
|
||
return -1;
|
||
}
|
||
/* XXX UNREF/NEWREF interface should be more symmetrical */
|
||
_Py_DEC_REFTOTAL;
|
||
_Py_ForgetReference(v);
|
||
*pv = (PyObject *)
|
||
PyObject_REALLOC((char *)v, sizeof(PyStringObject) + newsize);
|
||
if (*pv == NULL) {
|
||
PyObject_Del(v);
|
||
PyErr_NoMemory();
|
||
return -1;
|
||
}
|
||
_Py_NewReference(*pv);
|
||
sv = (PyStringObject *) *pv;
|
||
sv->ob_size = newsize;
|
||
sv->ob_sval[newsize] = '\0';
|
||
sv->ob_shash = -1; /* invalidate cached hash value */
|
||
return 0;
|
||
}
|
||
|
||
/* Helpers for formatstring */
|
||
|
||
Py_LOCAL_INLINE(PyObject *)
|
||
getnextarg(PyObject *args, Py_ssize_t arglen, Py_ssize_t *p_argidx)
|
||
{
|
||
Py_ssize_t argidx = *p_argidx;
|
||
if (argidx < arglen) {
|
||
(*p_argidx)++;
|
||
if (arglen < 0)
|
||
return args;
|
||
else
|
||
return PyTuple_GetItem(args, argidx);
|
||
}
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"not enough arguments for format string");
|
||
return NULL;
|
||
}
|
||
|
||
/* Format codes
|
||
* F_LJUST '-'
|
||
* F_SIGN '+'
|
||
* F_BLANK ' '
|
||
* F_ALT '#'
|
||
* F_ZERO '0'
|
||
*/
|
||
#define F_LJUST (1<<0)
|
||
#define F_SIGN (1<<1)
|
||
#define F_BLANK (1<<2)
|
||
#define F_ALT (1<<3)
|
||
#define F_ZERO (1<<4)
|
||
|
||
Py_LOCAL_INLINE(int)
|
||
formatfloat(char *buf, size_t buflen, int flags,
|
||
int prec, int type, PyObject *v)
|
||
{
|
||
/* fmt = '%#.' + `prec` + `type`
|
||
worst case length = 3 + 10 (len of INT_MAX) + 1 = 14 (use 20)*/
|
||
char fmt[20];
|
||
double x;
|
||
x = PyFloat_AsDouble(v);
|
||
if (x == -1.0 && PyErr_Occurred()) {
|
||
PyErr_Format(PyExc_TypeError, "float argument required, "
|
||
"not %.200s", v->ob_type->tp_name);
|
||
return -1;
|
||
}
|
||
if (prec < 0)
|
||
prec = 6;
|
||
if (type == 'f' && fabs(x)/1e25 >= 1e25)
|
||
type = 'g';
|
||
/* Worst case length calc to ensure no buffer overrun:
|
||
|
||
'g' formats:
|
||
fmt = %#.<prec>g
|
||
buf = '-' + [0-9]*prec + '.' + 'e+' + (longest exp
|
||
for any double rep.)
|
||
len = 1 + prec + 1 + 2 + 5 = 9 + prec
|
||
|
||
'f' formats:
|
||
buf = '-' + [0-9]*x + '.' + [0-9]*prec (with x < 50)
|
||
len = 1 + 50 + 1 + prec = 52 + prec
|
||
|
||
If prec=0 the effective precision is 1 (the leading digit is
|
||
always given), therefore increase the length by one.
|
||
|
||
*/
|
||
if ((type == 'g' && buflen <= (size_t)10 + (size_t)prec) ||
|
||
(type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"formatted float is too long (precision too large?)");
|
||
return -1;
|
||
}
|
||
PyOS_snprintf(fmt, sizeof(fmt), "%%%s.%d%c",
|
||
(flags&F_ALT) ? "#" : "",
|
||
prec, type);
|
||
PyOS_ascii_formatd(buf, buflen, fmt, x);
|
||
return (int)strlen(buf);
|
||
}
|
||
|
||
/* _PyString_FormatLong emulates the format codes d, u, o, x and X, and
|
||
* the F_ALT flag, for Python's long (unbounded) ints. It's not used for
|
||
* Python's regular ints.
|
||
* Return value: a new PyString*, or NULL if error.
|
||
* . *pbuf is set to point into it,
|
||
* *plen set to the # of chars following that.
|
||
* Caller must decref it when done using pbuf.
|
||
* The string starting at *pbuf is of the form
|
||
* "-"? ("0x" | "0X")? digit+
|
||
* "0x"/"0X" are present only for x and X conversions, with F_ALT
|
||
* set in flags. The case of hex digits will be correct,
|
||
* There will be at least prec digits, zero-filled on the left if
|
||
* necessary to get that many.
|
||
* val object to be converted
|
||
* flags bitmask of format flags; only F_ALT is looked at
|
||
* prec minimum number of digits; 0-fill on left if needed
|
||
* type a character in [duoxX]; u acts the same as d
|
||
*
|
||
* CAUTION: o, x and X conversions on regular ints can never
|
||
* produce a '-' sign, but can for Python's unbounded ints.
|
||
*/
|
||
PyObject*
|
||
_PyString_FormatLong(PyObject *val, int flags, int prec, int type,
|
||
char **pbuf, int *plen)
|
||
{
|
||
PyObject *result = NULL;
|
||
char *buf;
|
||
Py_ssize_t i;
|
||
int sign; /* 1 if '-', else 0 */
|
||
int len; /* number of characters */
|
||
Py_ssize_t llen;
|
||
int numdigits; /* len == numnondigits + numdigits */
|
||
int numnondigits = 0;
|
||
|
||
switch (type) {
|
||
case 'd':
|
||
case 'u':
|
||
result = val->ob_type->tp_str(val);
|
||
break;
|
||
case 'o':
|
||
result = val->ob_type->tp_as_number->nb_oct(val);
|
||
break;
|
||
case 'x':
|
||
case 'X':
|
||
numnondigits = 2;
|
||
result = val->ob_type->tp_as_number->nb_hex(val);
|
||
break;
|
||
default:
|
||
assert(!"'type' not in [duoxX]");
|
||
}
|
||
if (!result)
|
||
return NULL;
|
||
|
||
buf = PyString_AsString(result);
|
||
if (!buf) {
|
||
Py_DECREF(result);
|
||
return NULL;
|
||
}
|
||
|
||
/* To modify the string in-place, there can only be one reference. */
|
||
if (result->ob_refcnt != 1) {
|
||
PyErr_BadInternalCall();
|
||
return NULL;
|
||
}
|
||
llen = PyString_Size(result);
|
||
if (llen > INT_MAX) {
|
||
PyErr_SetString(PyExc_ValueError, "string too large in _PyString_FormatLong");
|
||
return NULL;
|
||
}
|
||
len = (int)llen;
|
||
if (buf[len-1] == 'L') {
|
||
--len;
|
||
buf[len] = '\0';
|
||
}
|
||
sign = buf[0] == '-';
|
||
numnondigits += sign;
|
||
numdigits = len - numnondigits;
|
||
assert(numdigits > 0);
|
||
|
||
/* Get rid of base marker unless F_ALT */
|
||
if ((flags & F_ALT) == 0) {
|
||
/* Need to skip 0x, 0X or 0. */
|
||
int skipped = 0;
|
||
switch (type) {
|
||
case 'o':
|
||
assert(buf[sign] == '0');
|
||
/* If 0 is only digit, leave it alone. */
|
||
if (numdigits > 1) {
|
||
skipped = 1;
|
||
--numdigits;
|
||
}
|
||
break;
|
||
case 'x':
|
||
case 'X':
|
||
assert(buf[sign] == '0');
|
||
assert(buf[sign + 1] == 'x');
|
||
skipped = 2;
|
||
numnondigits -= 2;
|
||
break;
|
||
}
|
||
if (skipped) {
|
||
buf += skipped;
|
||
len -= skipped;
|
||
if (sign)
|
||
buf[0] = '-';
|
||
}
|
||
assert(len == numnondigits + numdigits);
|
||
assert(numdigits > 0);
|
||
}
|
||
|
||
/* Fill with leading zeroes to meet minimum width. */
|
||
if (prec > numdigits) {
|
||
PyObject *r1 = PyString_FromStringAndSize(NULL,
|
||
numnondigits + prec);
|
||
char *b1;
|
||
if (!r1) {
|
||
Py_DECREF(result);
|
||
return NULL;
|
||
}
|
||
b1 = PyString_AS_STRING(r1);
|
||
for (i = 0; i < numnondigits; ++i)
|
||
*b1++ = *buf++;
|
||
for (i = 0; i < prec - numdigits; i++)
|
||
*b1++ = '0';
|
||
for (i = 0; i < numdigits; i++)
|
||
*b1++ = *buf++;
|
||
*b1 = '\0';
|
||
Py_DECREF(result);
|
||
result = r1;
|
||
buf = PyString_AS_STRING(result);
|
||
len = numnondigits + prec;
|
||
}
|
||
|
||
/* Fix up case for hex conversions. */
|
||
if (type == 'X') {
|
||
/* Need to convert all lower case letters to upper case.
|
||
and need to convert 0x to 0X (and -0x to -0X). */
|
||
for (i = 0; i < len; i++)
|
||
if (buf[i] >= 'a' && buf[i] <= 'x')
|
||
buf[i] -= 'a'-'A';
|
||
}
|
||
*pbuf = buf;
|
||
*plen = len;
|
||
return result;
|
||
}
|
||
|
||
Py_LOCAL_INLINE(int)
|
||
formatint(char *buf, size_t buflen, int flags,
|
||
int prec, int type, PyObject *v)
|
||
{
|
||
/* fmt = '%#.' + `prec` + 'l' + `type`
|
||
worst case length = 3 + 19 (worst len of INT_MAX on 64-bit machine)
|
||
+ 1 + 1 = 24 */
|
||
char fmt[64]; /* plenty big enough! */
|
||
char *sign;
|
||
long x;
|
||
|
||
x = PyInt_AsLong(v);
|
||
if (x == -1 && PyErr_Occurred()) {
|
||
PyErr_Format(PyExc_TypeError, "int argument required, not %.200s",
|
||
v->ob_type->tp_name);
|
||
return -1;
|
||
}
|
||
if (x < 0 && type == 'u') {
|
||
type = 'd';
|
||
}
|
||
if (x < 0 && (type == 'x' || type == 'X' || type == 'o'))
|
||
sign = "-";
|
||
else
|
||
sign = "";
|
||
if (prec < 0)
|
||
prec = 1;
|
||
|
||
if ((flags & F_ALT) &&
|
||
(type == 'x' || type == 'X')) {
|
||
/* When converting under %#x or %#X, there are a number
|
||
* of issues that cause pain:
|
||
* - when 0 is being converted, the C standard leaves off
|
||
* the '0x' or '0X', which is inconsistent with other
|
||
* %#x/%#X conversions and inconsistent with Python's
|
||
* hex() function
|
||
* - there are platforms that violate the standard and
|
||
* convert 0 with the '0x' or '0X'
|
||
* (Metrowerks, Compaq Tru64)
|
||
* - there are platforms that give '0x' when converting
|
||
* under %#X, but convert 0 in accordance with the
|
||
* standard (OS/2 EMX)
|
||
*
|
||
* We can achieve the desired consistency by inserting our
|
||
* own '0x' or '0X' prefix, and substituting %x/%X in place
|
||
* of %#x/%#X.
|
||
*
|
||
* Note that this is the same approach as used in
|
||
* formatint() in unicodeobject.c
|
||
*/
|
||
PyOS_snprintf(fmt, sizeof(fmt), "%s0%c%%.%dl%c",
|
||
sign, type, prec, type);
|
||
}
|
||
else {
|
||
PyOS_snprintf(fmt, sizeof(fmt), "%s%%%s.%dl%c",
|
||
sign, (flags&F_ALT) ? "#" : "",
|
||
prec, type);
|
||
}
|
||
|
||
/* buf = '+'/'-'/'' + '0'/'0x'/'' + '[0-9]'*max(prec, len(x in octal))
|
||
* worst case buf = '-0x' + [0-9]*prec, where prec >= 11
|
||
*/
|
||
if (buflen <= 14 || buflen <= (size_t)3 + (size_t)prec) {
|
||
PyErr_SetString(PyExc_OverflowError,
|
||
"formatted integer is too long (precision too large?)");
|
||
return -1;
|
||
}
|
||
if (sign[0])
|
||
PyOS_snprintf(buf, buflen, fmt, -x);
|
||
else
|
||
PyOS_snprintf(buf, buflen, fmt, x);
|
||
return (int)strlen(buf);
|
||
}
|
||
|
||
Py_LOCAL_INLINE(int)
|
||
formatchar(char *buf, size_t buflen, PyObject *v)
|
||
{
|
||
/* presume that the buffer is at least 2 characters long */
|
||
if (PyString_Check(v)) {
|
||
if (!PyArg_Parse(v, "c;%c requires int or char", &buf[0]))
|
||
return -1;
|
||
}
|
||
else {
|
||
if (!PyArg_Parse(v, "b;%c requires int or char", &buf[0]))
|
||
return -1;
|
||
}
|
||
buf[1] = '\0';
|
||
return 1;
|
||
}
|
||
|
||
/* fmt%(v1,v2,...) is roughly equivalent to sprintf(fmt, v1, v2, ...)
|
||
|
||
FORMATBUFLEN is the length of the buffer in which the floats, ints, &
|
||
chars are formatted. XXX This is a magic number. Each formatting
|
||
routine does bounds checking to ensure no overflow, but a better
|
||
solution may be to malloc a buffer of appropriate size for each
|
||
format. For now, the current solution is sufficient.
|
||
*/
|
||
#define FORMATBUFLEN (size_t)120
|
||
|
||
PyObject *
|
||
PyString_Format(PyObject *format, PyObject *args)
|
||
{
|
||
char *fmt, *res;
|
||
Py_ssize_t arglen, argidx;
|
||
Py_ssize_t reslen, rescnt, fmtcnt;
|
||
int args_owned = 0;
|
||
PyObject *result, *orig_args;
|
||
#ifdef Py_USING_UNICODE
|
||
PyObject *v, *w;
|
||
#endif
|
||
PyObject *dict = NULL;
|
||
if (format == NULL || !PyString_Check(format) || args == NULL) {
|
||
PyErr_BadInternalCall();
|
||
return NULL;
|
||
}
|
||
orig_args = args;
|
||
fmt = PyString_AS_STRING(format);
|
||
fmtcnt = PyString_GET_SIZE(format);
|
||
reslen = rescnt = fmtcnt + 100;
|
||
result = PyString_FromStringAndSize((char *)NULL, reslen);
|
||
if (result == NULL)
|
||
return NULL;
|
||
res = PyString_AsString(result);
|
||
if (PyTuple_Check(args)) {
|
||
arglen = PyTuple_GET_SIZE(args);
|
||
argidx = 0;
|
||
}
|
||
else {
|
||
arglen = -1;
|
||
argidx = -2;
|
||
}
|
||
if (args->ob_type->tp_as_mapping && !PyTuple_Check(args) &&
|
||
!PyObject_TypeCheck(args, &PyBaseString_Type))
|
||
dict = args;
|
||
while (--fmtcnt >= 0) {
|
||
if (*fmt != '%') {
|
||
if (--rescnt < 0) {
|
||
rescnt = fmtcnt + 100;
|
||
reslen += rescnt;
|
||
if (_PyString_Resize(&result, reslen) < 0)
|
||
return NULL;
|
||
res = PyString_AS_STRING(result)
|
||
+ reslen - rescnt;
|
||
--rescnt;
|
||
}
|
||
*res++ = *fmt++;
|
||
}
|
||
else {
|
||
/* Got a format specifier */
|
||
int flags = 0;
|
||
Py_ssize_t width = -1;
|
||
int prec = -1;
|
||
int c = '\0';
|
||
int fill;
|
||
PyObject *v = NULL;
|
||
PyObject *temp = NULL;
|
||
char *pbuf;
|
||
int sign;
|
||
Py_ssize_t len;
|
||
char formatbuf[FORMATBUFLEN];
|
||
/* For format{float,int,char}() */
|
||
#ifdef Py_USING_UNICODE
|
||
char *fmt_start = fmt;
|
||
Py_ssize_t argidx_start = argidx;
|
||
#endif
|
||
|
||
fmt++;
|
||
if (*fmt == '(') {
|
||
char *keystart;
|
||
Py_ssize_t keylen;
|
||
PyObject *key;
|
||
int pcount = 1;
|
||
|
||
if (dict == NULL) {
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"format requires a mapping");
|
||
goto error;
|
||
}
|
||
++fmt;
|
||
--fmtcnt;
|
||
keystart = fmt;
|
||
/* Skip over balanced parentheses */
|
||
while (pcount > 0 && --fmtcnt >= 0) {
|
||
if (*fmt == ')')
|
||
--pcount;
|
||
else if (*fmt == '(')
|
||
++pcount;
|
||
fmt++;
|
||
}
|
||
keylen = fmt - keystart - 1;
|
||
if (fmtcnt < 0 || pcount > 0) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"incomplete format key");
|
||
goto error;
|
||
}
|
||
key = PyString_FromStringAndSize(keystart,
|
||
keylen);
|
||
if (key == NULL)
|
||
goto error;
|
||
if (args_owned) {
|
||
Py_DECREF(args);
|
||
args_owned = 0;
|
||
}
|
||
args = PyObject_GetItem(dict, key);
|
||
Py_DECREF(key);
|
||
if (args == NULL) {
|
||
goto error;
|
||
}
|
||
args_owned = 1;
|
||
arglen = -1;
|
||
argidx = -2;
|
||
}
|
||
while (--fmtcnt >= 0) {
|
||
switch (c = *fmt++) {
|
||
case '-': flags |= F_LJUST; continue;
|
||
case '+': flags |= F_SIGN; continue;
|
||
case ' ': flags |= F_BLANK; continue;
|
||
case '#': flags |= F_ALT; continue;
|
||
case '0': flags |= F_ZERO; continue;
|
||
}
|
||
break;
|
||
}
|
||
if (c == '*') {
|
||
v = getnextarg(args, arglen, &argidx);
|
||
if (v == NULL)
|
||
goto error;
|
||
if (!PyInt_Check(v)) {
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"* wants int");
|
||
goto error;
|
||
}
|
||
width = PyInt_AsLong(v);
|
||
if (width < 0) {
|
||
flags |= F_LJUST;
|
||
width = -width;
|
||
}
|
||
if (--fmtcnt >= 0)
|
||
c = *fmt++;
|
||
}
|
||
else if (c >= 0 && isdigit(c)) {
|
||
width = c - '0';
|
||
while (--fmtcnt >= 0) {
|
||
c = Py_CHARMASK(*fmt++);
|
||
if (!isdigit(c))
|
||
break;
|
||
if ((width*10) / 10 != width) {
|
||
PyErr_SetString(
|
||
PyExc_ValueError,
|
||
"width too big");
|
||
goto error;
|
||
}
|
||
width = width*10 + (c - '0');
|
||
}
|
||
}
|
||
if (c == '.') {
|
||
prec = 0;
|
||
if (--fmtcnt >= 0)
|
||
c = *fmt++;
|
||
if (c == '*') {
|
||
v = getnextarg(args, arglen, &argidx);
|
||
if (v == NULL)
|
||
goto error;
|
||
if (!PyInt_Check(v)) {
|
||
PyErr_SetString(
|
||
PyExc_TypeError,
|
||
"* wants int");
|
||
goto error;
|
||
}
|
||
prec = PyInt_AsLong(v);
|
||
if (prec < 0)
|
||
prec = 0;
|
||
if (--fmtcnt >= 0)
|
||
c = *fmt++;
|
||
}
|
||
else if (c >= 0 && isdigit(c)) {
|
||
prec = c - '0';
|
||
while (--fmtcnt >= 0) {
|
||
c = Py_CHARMASK(*fmt++);
|
||
if (!isdigit(c))
|
||
break;
|
||
if ((prec*10) / 10 != prec) {
|
||
PyErr_SetString(
|
||
PyExc_ValueError,
|
||
"prec too big");
|
||
goto error;
|
||
}
|
||
prec = prec*10 + (c - '0');
|
||
}
|
||
}
|
||
} /* prec */
|
||
if (fmtcnt >= 0) {
|
||
if (c == 'h' || c == 'l' || c == 'L') {
|
||
if (--fmtcnt >= 0)
|
||
c = *fmt++;
|
||
}
|
||
}
|
||
if (fmtcnt < 0) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"incomplete format");
|
||
goto error;
|
||
}
|
||
if (c != '%') {
|
||
v = getnextarg(args, arglen, &argidx);
|
||
if (v == NULL)
|
||
goto error;
|
||
}
|
||
sign = 0;
|
||
fill = ' ';
|
||
switch (c) {
|
||
case '%':
|
||
pbuf = "%";
|
||
len = 1;
|
||
break;
|
||
case 's':
|
||
#ifdef Py_USING_UNICODE
|
||
if (PyUnicode_Check(v)) {
|
||
fmt = fmt_start;
|
||
argidx = argidx_start;
|
||
goto unicode;
|
||
}
|
||
#endif
|
||
temp = _PyObject_Str(v);
|
||
#ifdef Py_USING_UNICODE
|
||
if (temp != NULL && PyUnicode_Check(temp)) {
|
||
Py_DECREF(temp);
|
||
fmt = fmt_start;
|
||
argidx = argidx_start;
|
||
goto unicode;
|
||
}
|
||
#endif
|
||
/* Fall through */
|
||
case 'r':
|
||
if (c == 'r')
|
||
temp = PyObject_Repr(v);
|
||
if (temp == NULL)
|
||
goto error;
|
||
if (!PyString_Check(temp)) {
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"%s argument has non-string str()");
|
||
Py_DECREF(temp);
|
||
goto error;
|
||
}
|
||
pbuf = PyString_AS_STRING(temp);
|
||
len = PyString_GET_SIZE(temp);
|
||
if (prec >= 0 && len > prec)
|
||
len = prec;
|
||
break;
|
||
case 'i':
|
||
case 'd':
|
||
case 'u':
|
||
case 'o':
|
||
case 'x':
|
||
case 'X':
|
||
if (c == 'i')
|
||
c = 'd';
|
||
if (PyLong_Check(v)) {
|
||
int ilen;
|
||
temp = _PyString_FormatLong(v, flags,
|
||
prec, c, &pbuf, &ilen);
|
||
len = ilen;
|
||
if (!temp)
|
||
goto error;
|
||
sign = 1;
|
||
}
|
||
else {
|
||
pbuf = formatbuf;
|
||
len = formatint(pbuf,
|
||
sizeof(formatbuf),
|
||
flags, prec, c, v);
|
||
if (len < 0)
|
||
goto error;
|
||
sign = 1;
|
||
}
|
||
if (flags & F_ZERO)
|
||
fill = '0';
|
||
break;
|
||
case 'e':
|
||
case 'E':
|
||
case 'f':
|
||
case 'F':
|
||
case 'g':
|
||
case 'G':
|
||
if (c == 'F')
|
||
c = 'f';
|
||
pbuf = formatbuf;
|
||
len = formatfloat(pbuf, sizeof(formatbuf),
|
||
flags, prec, c, v);
|
||
if (len < 0)
|
||
goto error;
|
||
sign = 1;
|
||
if (flags & F_ZERO)
|
||
fill = '0';
|
||
break;
|
||
case 'c':
|
||
#ifdef Py_USING_UNICODE
|
||
if (PyUnicode_Check(v)) {
|
||
fmt = fmt_start;
|
||
argidx = argidx_start;
|
||
goto unicode;
|
||
}
|
||
#endif
|
||
pbuf = formatbuf;
|
||
len = formatchar(pbuf, sizeof(formatbuf), v);
|
||
if (len < 0)
|
||
goto error;
|
||
break;
|
||
default:
|
||
PyErr_Format(PyExc_ValueError,
|
||
"unsupported format character '%c' (0x%x) "
|
||
"at index %zd",
|
||
c, c,
|
||
(Py_ssize_t)(fmt - 1 -
|
||
PyString_AsString(format)));
|
||
goto error;
|
||
}
|
||
if (sign) {
|
||
if (*pbuf == '-' || *pbuf == '+') {
|
||
sign = *pbuf++;
|
||
len--;
|
||
}
|
||
else if (flags & F_SIGN)
|
||
sign = '+';
|
||
else if (flags & F_BLANK)
|
||
sign = ' ';
|
||
else
|
||
sign = 0;
|
||
}
|
||
if (width < len)
|
||
width = len;
|
||
if (rescnt - (sign != 0) < width) {
|
||
reslen -= rescnt;
|
||
rescnt = width + fmtcnt + 100;
|
||
reslen += rescnt;
|
||
if (reslen < 0) {
|
||
Py_DECREF(result);
|
||
return PyErr_NoMemory();
|
||
}
|
||
if (_PyString_Resize(&result, reslen) < 0)
|
||
return NULL;
|
||
res = PyString_AS_STRING(result)
|
||
+ reslen - rescnt;
|
||
}
|
||
if (sign) {
|
||
if (fill != ' ')
|
||
*res++ = sign;
|
||
rescnt--;
|
||
if (width > len)
|
||
width--;
|
||
}
|
||
if ((flags & F_ALT) && (c == 'x' || c == 'X')) {
|
||
assert(pbuf[0] == '0');
|
||
assert(pbuf[1] == c);
|
||
if (fill != ' ') {
|
||
*res++ = *pbuf++;
|
||
*res++ = *pbuf++;
|
||
}
|
||
rescnt -= 2;
|
||
width -= 2;
|
||
if (width < 0)
|
||
width = 0;
|
||
len -= 2;
|
||
}
|
||
if (width > len && !(flags & F_LJUST)) {
|
||
do {
|
||
--rescnt;
|
||
*res++ = fill;
|
||
} while (--width > len);
|
||
}
|
||
if (fill == ' ') {
|
||
if (sign)
|
||
*res++ = sign;
|
||
if ((flags & F_ALT) &&
|
||
(c == 'x' || c == 'X')) {
|
||
assert(pbuf[0] == '0');
|
||
assert(pbuf[1] == c);
|
||
*res++ = *pbuf++;
|
||
*res++ = *pbuf++;
|
||
}
|
||
}
|
||
Py_MEMCPY(res, pbuf, len);
|
||
res += len;
|
||
rescnt -= len;
|
||
while (--width >= len) {
|
||
--rescnt;
|
||
*res++ = ' ';
|
||
}
|
||
if (dict && (argidx < arglen) && c != '%') {
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"not all arguments converted during string formatting");
|
||
goto error;
|
||
}
|
||
Py_XDECREF(temp);
|
||
} /* '%' */
|
||
} /* until end */
|
||
if (argidx < arglen && !dict) {
|
||
PyErr_SetString(PyExc_TypeError,
|
||
"not all arguments converted during string formatting");
|
||
goto error;
|
||
}
|
||
if (args_owned) {
|
||
Py_DECREF(args);
|
||
}
|
||
_PyString_Resize(&result, reslen - rescnt);
|
||
return result;
|
||
|
||
#ifdef Py_USING_UNICODE
|
||
unicode:
|
||
if (args_owned) {
|
||
Py_DECREF(args);
|
||
args_owned = 0;
|
||
}
|
||
/* Fiddle args right (remove the first argidx arguments) */
|
||
if (PyTuple_Check(orig_args) && argidx > 0) {
|
||
PyObject *v;
|
||
Py_ssize_t n = PyTuple_GET_SIZE(orig_args) - argidx;
|
||
v = PyTuple_New(n);
|
||
if (v == NULL)
|
||
goto error;
|
||
while (--n >= 0) {
|
||
PyObject *w = PyTuple_GET_ITEM(orig_args, n + argidx);
|
||
Py_INCREF(w);
|
||
PyTuple_SET_ITEM(v, n, w);
|
||
}
|
||
args = v;
|
||
} else {
|
||
Py_INCREF(orig_args);
|
||
args = orig_args;
|
||
}
|
||
args_owned = 1;
|
||
/* Take what we have of the result and let the Unicode formatting
|
||
function format the rest of the input. */
|
||
rescnt = res - PyString_AS_STRING(result);
|
||
if (_PyString_Resize(&result, rescnt))
|
||
goto error;
|
||
fmtcnt = PyString_GET_SIZE(format) - \
|
||
(fmt - PyString_AS_STRING(format));
|
||
format = PyUnicode_Decode(fmt, fmtcnt, NULL, NULL);
|
||
if (format == NULL)
|
||
goto error;
|
||
v = PyUnicode_Format(format, args);
|
||
Py_DECREF(format);
|
||
if (v == NULL)
|
||
goto error;
|
||
/* Paste what we have (result) to what the Unicode formatting
|
||
function returned (v) and return the result (or error) */
|
||
w = PyUnicode_Concat(result, v);
|
||
Py_DECREF(result);
|
||
Py_DECREF(v);
|
||
Py_DECREF(args);
|
||
return w;
|
||
#endif /* Py_USING_UNICODE */
|
||
|
||
error:
|
||
Py_DECREF(result);
|
||
if (args_owned) {
|
||
Py_DECREF(args);
|
||
}
|
||
return NULL;
|
||
}
|
||
|
||
void
|
||
PyString_InternInPlace(PyObject **p)
|
||
{
|
||
register PyStringObject *s = (PyStringObject *)(*p);
|
||
PyObject *t;
|
||
if (s == NULL || !PyString_Check(s))
|
||
Py_FatalError("PyString_InternInPlace: strings only please!");
|
||
/* If it's a string subclass, we don't really know what putting
|
||
it in the interned dict might do. */
|
||
if (!PyString_CheckExact(s))
|
||
return;
|
||
if (PyString_CHECK_INTERNED(s))
|
||
return;
|
||
if (interned == NULL) {
|
||
interned = PyDict_New();
|
||
if (interned == NULL) {
|
||
PyErr_Clear(); /* Don't leave an exception */
|
||
return;
|
||
}
|
||
}
|
||
t = PyDict_GetItem(interned, (PyObject *)s);
|
||
if (t) {
|
||
Py_INCREF(t);
|
||
Py_DECREF(*p);
|
||
*p = t;
|
||
return;
|
||
}
|
||
|
||
if (PyDict_SetItem(interned, (PyObject *)s, (PyObject *)s) < 0) {
|
||
PyErr_Clear();
|
||
return;
|
||
}
|
||
/* The two references in interned are not counted by refcnt.
|
||
The string deallocator will take care of this */
|
||
s->ob_refcnt -= 2;
|
||
PyString_CHECK_INTERNED(s) = SSTATE_INTERNED_MORTAL;
|
||
}
|
||
|
||
void
|
||
PyString_InternImmortal(PyObject **p)
|
||
{
|
||
PyString_InternInPlace(p);
|
||
if (PyString_CHECK_INTERNED(*p) != SSTATE_INTERNED_IMMORTAL) {
|
||
PyString_CHECK_INTERNED(*p) = SSTATE_INTERNED_IMMORTAL;
|
||
Py_INCREF(*p);
|
||
}
|
||
}
|
||
|
||
|
||
PyObject *
|
||
PyString_InternFromString(const char *cp)
|
||
{
|
||
PyObject *s = PyString_FromString(cp);
|
||
if (s == NULL)
|
||
return NULL;
|
||
PyString_InternInPlace(&s);
|
||
return s;
|
||
}
|
||
|
||
void
|
||
PyString_Fini(void)
|
||
{
|
||
int i;
|
||
for (i = 0; i < UCHAR_MAX + 1; i++) {
|
||
Py_XDECREF(characters[i]);
|
||
characters[i] = NULL;
|
||
}
|
||
Py_XDECREF(nullstring);
|
||
nullstring = NULL;
|
||
}
|
||
|
||
void _Py_ReleaseInternedStrings(void)
|
||
{
|
||
PyObject *keys;
|
||
PyStringObject *s;
|
||
Py_ssize_t i, n;
|
||
|
||
if (interned == NULL || !PyDict_Check(interned))
|
||
return;
|
||
keys = PyDict_Keys(interned);
|
||
if (keys == NULL || !PyList_Check(keys)) {
|
||
PyErr_Clear();
|
||
return;
|
||
}
|
||
|
||
/* Since _Py_ReleaseInternedStrings() is intended to help a leak
|
||
detector, interned strings are not forcibly deallocated; rather, we
|
||
give them their stolen references back, and then clear and DECREF
|
||
the interned dict. */
|
||
|
||
fprintf(stderr, "releasing interned strings\n");
|
||
n = PyList_GET_SIZE(keys);
|
||
for (i = 0; i < n; i++) {
|
||
s = (PyStringObject *) PyList_GET_ITEM(keys, i);
|
||
switch (s->ob_sstate) {
|
||
case SSTATE_NOT_INTERNED:
|
||
/* XXX Shouldn't happen */
|
||
break;
|
||
case SSTATE_INTERNED_IMMORTAL:
|
||
s->ob_refcnt += 1;
|
||
break;
|
||
case SSTATE_INTERNED_MORTAL:
|
||
s->ob_refcnt += 2;
|
||
break;
|
||
default:
|
||
Py_FatalError("Inconsistent interned string state.");
|
||
}
|
||
s->ob_sstate = SSTATE_NOT_INTERNED;
|
||
}
|
||
Py_DECREF(keys);
|
||
PyDict_Clear(interned);
|
||
Py_DECREF(interned);
|
||
interned = NULL;
|
||
}
|
||
|
||
|
||
/*********************** Str Iterator ****************************/
|
||
|
||
typedef struct {
|
||
PyObject_HEAD
|
||
Py_ssize_t it_index;
|
||
PyStringObject *it_seq; /* Set to NULL when iterator is exhausted */
|
||
} striterobject;
|
||
|
||
static void
|
||
striter_dealloc(striterobject *it)
|
||
{
|
||
_PyObject_GC_UNTRACK(it);
|
||
Py_XDECREF(it->it_seq);
|
||
PyObject_GC_Del(it);
|
||
}
|
||
|
||
static int
|
||
striter_traverse(striterobject *it, visitproc visit, void *arg)
|
||
{
|
||
Py_VISIT(it->it_seq);
|
||
return 0;
|
||
}
|
||
|
||
static PyObject *
|
||
striter_next(striterobject *it)
|
||
{
|
||
PyStringObject *seq;
|
||
PyObject *item;
|
||
|
||
assert(it != NULL);
|
||
seq = it->it_seq;
|
||
if (seq == NULL)
|
||
return NULL;
|
||
assert(PyString_Check(seq));
|
||
|
||
if (it->it_index < PyString_GET_SIZE(seq)) {
|
||
item = PyString_FromStringAndSize(
|
||
PyString_AS_STRING(seq)+it->it_index, 1);
|
||
if (item != NULL)
|
||
++it->it_index;
|
||
return item;
|
||
}
|
||
|
||
Py_DECREF(seq);
|
||
it->it_seq = NULL;
|
||
return NULL;
|
||
}
|
||
|
||
static PyObject *
|
||
striter_len(striterobject *it)
|
||
{
|
||
Py_ssize_t len = 0;
|
||
if (it->it_seq)
|
||
len = PyString_GET_SIZE(it->it_seq) - it->it_index;
|
||
return PyInt_FromSsize_t(len);
|
||
}
|
||
|
||
PyDoc_STRVAR(length_hint_doc,
|
||
"Private method returning an estimate of len(list(it)).");
|
||
|
||
static PyMethodDef striter_methods[] = {
|
||
{"__length_hint__", (PyCFunction)striter_len, METH_NOARGS,
|
||
length_hint_doc},
|
||
{NULL, NULL} /* sentinel */
|
||
};
|
||
|
||
PyTypeObject PyStringIter_Type = {
|
||
PyObject_HEAD_INIT(&PyType_Type)
|
||
0, /* ob_size */
|
||
"striterator", /* tp_name */
|
||
sizeof(striterobject), /* tp_basicsize */
|
||
0, /* tp_itemsize */
|
||
/* methods */
|
||
(destructor)striter_dealloc, /* tp_dealloc */
|
||
0, /* tp_print */
|
||
0, /* tp_getattr */
|
||
0, /* tp_setattr */
|
||
0, /* tp_compare */
|
||
0, /* tp_repr */
|
||
0, /* tp_as_number */
|
||
0, /* tp_as_sequence */
|
||
0, /* tp_as_mapping */
|
||
0, /* tp_hash */
|
||
0, /* tp_call */
|
||
0, /* tp_str */
|
||
PyObject_GenericGetAttr, /* tp_getattro */
|
||
0, /* tp_setattro */
|
||
0, /* tp_as_buffer */
|
||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
||
0, /* tp_doc */
|
||
(traverseproc)striter_traverse, /* tp_traverse */
|
||
0, /* tp_clear */
|
||
0, /* tp_richcompare */
|
||
0, /* tp_weaklistoffset */
|
||
PyObject_SelfIter, /* tp_iter */
|
||
(iternextfunc)striter_next, /* tp_iternext */
|
||
striter_methods, /* tp_methods */
|
||
0,
|
||
};
|
||
|
||
static PyObject *
|
||
str_iter(PyObject *seq)
|
||
{
|
||
striterobject *it;
|
||
|
||
if (!PyString_Check(seq)) {
|
||
PyErr_BadInternalCall();
|
||
return NULL;
|
||
}
|
||
it = PyObject_GC_New(striterobject, &PyStringIter_Type);
|
||
if (it == NULL)
|
||
return NULL;
|
||
it->it_index = 0;
|
||
Py_INCREF(seq);
|
||
it->it_seq = (PyStringObject *)seq;
|
||
_PyObject_GC_TRACK(it);
|
||
return (PyObject *)it;
|
||
}
|