cpython

Commit Graph

Author	SHA1	Message	Date
Antoine Pitrou	4a90ef0363	Issue #14177 : marshal.loads() now raises TypeError when given an unicode string. Patch by Guilherme Gonçalves.	14 years ago
Antoine Pitrou	679e9d36f7	Issue #14172 : Fix reference leak when marshalling a buffer-like object (other than a bytes object).	14 years ago
Éric Araujo	6c0ba447bd	Fix style in code added by edba722f3b02	15 years ago
Vinay Sajip	623e8b86af	Removed some unused local variables.	15 years ago
Vinay Sajip	5bdae3bb7c	Closes #12291 : Fixed bug which was found when doing multiple loads from one stream.	15 years ago
Antoine Pitrou	7f14f0d8a0	Recorded merge of revisions 81032 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81032 \| antoine.pitrou \| 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) \| 9 lines Recorded merge of revisions 81029 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 \| antoine.pitrou \| 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) \| 3 lines Untabify C files. Will watch buildbots. ........ ................	16 years ago
Antoine Pitrou	f95a1b3c53	Recorded merge of revisions 81029 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 \| antoine.pitrou \| 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) \| 3 lines Untabify C files. Will watch buildbots. ........	16 years ago
Antoine Pitrou	5bc7ec9476	Merged revisions 80325 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80325 \| antoine.pitrou \| 2010-04-22 00:53:29 +0200 (jeu., 22 avril 2010) \| 6 lines Issue #7332: Remove the 16KB stack-based buffer in PyMarshal_ReadLastObjectFromFile, which doesn't bring any noticeable benefit compared to the dynamic memory allocation fallback. Patch by Charles-François Natali. ........	16 years ago
Skip Montanaro	ba1e0f46ab	Issue 7147 - remove ability to attempt to build Python without complex number support (was broken anyway)	16 years ago
Mark Dickinson	2bbeb0eacd	Merged revisions 75145 via svnmerge from svn+ssh://pythondev@www.python.org/python/branches/py3k ................ r75145 \| mark.dickinson \| 2009-09-29 20:21:35 +0100 (Tue, 29 Sep 2009) \| 10 lines Merged revisions 75141 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75141 \| mark.dickinson \| 2009-09-29 20:01:06 +0100 (Tue, 29 Sep 2009) \| 3 lines Issue #7019: Unmarshalling of bad long data could produce unnormalized PyLongs. Raise ValueError instead. ........ ................	16 years ago
Mark Dickinson	2683ab04a6	Merged revisions 75141 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75141 \| mark.dickinson \| 2009-09-29 20:01:06 +0100 (Tue, 29 Sep 2009) \| 3 lines Issue #7019: Unmarshalling of bad long data could produce unnormalized PyLongs. Raise ValueError instead. ........	16 years ago
R. David Murray	dd226eabe9	Merged revisions 72597 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72597 \| r.david.murray \| 2009-05-12 20:30:29 -0400 (Tue, 12 May 2009) \| 2 lines Issue 5994: add docstrings to marshal. ........	17 years ago
Martin v. Löwis	e0a2b72e61	Rename the surrogates error handler to surrogatepass.	17 years ago
Mark Dickinson	725bfd8489	Issue #5914 : Add new C-API function PyOS_string_to_double, to complement PyOS_double_to_string, and deprecate PyOS_ascii_strtod and PyOS_ascii_atof.	17 years ago
Martin v. Löwis	db12d454e6	Issue #3672 : Reject surrogates in utf-8 codec; add surrogates error handler.	17 years ago
Eric Smith	b1a03cf716	Added handling of PyOS_double_to_string out-of-memory errors. Closes issue 5775.	17 years ago
Mark Dickinson	3e09f43e06	Make sure that marshal and pickle continue to output 17 digits of precision for floats.	17 years ago
Eric Smith	0923d1d8d7	The other half of Issue #1580 : use short float repr where possible. Addresses the float -> string conversion, using David Gay's code which was added in Mark Dickinson's checkin r71663. Also addresses these, which are intertwined with the short repr changes: - Issue #5772: format(1e100, '<') produces '1e+100', not '1.0e+100' - Issue #5515: 'n' formatting with commas no longer works poorly with leading zeros. - PEP 378 Format Specifier for Thousands Separator: implemented for floats.	17 years ago
Mark Dickinson	bd7926478d	Issue #4258 : Make it possible to use 30-bit digits for PyLongs: - new configure option --enable-big-digits - new structseq sys.int_info giving information about the internal format By default, 30-bit digits are enabled on 64-bit machines but disabled on 32-bit machines.	17 years ago
Nick Coghlan	9309583176	Merged revisions 70378 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r70378 \| nick.coghlan \| 2009-03-15 13:24:46 +1000 (Sun, 15 Mar 2009) \| 1 line Make marshalling errors a little more informative as to what went wrong ........	17 years ago
Gregory P. Smith	0a608fdaac	fixes deferred/release blocker issue #3797 : Fixed the dbm, marshal, mmap, ossaudiodev, & winreg modules to return bytes objects instead of bytearray objects.	18 years ago
Martin v. Löwis	423be95dcf	Merged revisions 65654 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r65654 \| martin.v.loewis \| 2008-08-12 16:49:50 +0200 (Tue, 12 Aug 2008) \| 6 lines Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, by denying s# to parse objects that have a releasebuffer procedure, and introducing s. More module might need to get converted to use s. ........	18 years ago
Brett Cannon	429ef650b7	Rename a variable to be more in line with the name of the module.	18 years ago
Amaury Forgeot d'Arc	35c8658a74	Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r64119 \| andrew.kuchling \| 2008-06-11 14:53:14 +0200 (mer., 11 juin 2008) \| 1 line Note PEP 371 section ........ r64147 \| benjamin.peterson \| 2008-06-11 22:04:30 +0200 (mer., 11 juin 2008) \| 2 lines update ACKS and NEWs for multiprocessing ........ r64150 \| georg.brandl \| 2008-06-11 22:28:06 +0200 (mer., 11 juin 2008) \| 2 lines Can we agree to put dots at entry ends? Thanks. ........ r64165 \| armin.rigo \| 2008-06-12 11:50:58 +0200 (jeu., 12 juin 2008) \| 3 lines Sounds obvious, but I didn't even realize that you can put non-string keys in type dictionaries without using this locals() hack. ........ r64219 \| neal.norwitz \| 2008-06-13 08:00:46 +0200 (ven., 13 juin 2008) \| 1 line Check for memory alloc failure ........ r64220 \| neal.norwitz \| 2008-06-13 08:02:26 +0200 (ven., 13 juin 2008) \| 3 lines Fix some memory dealloc problems when exceptions occur. It caused: "Fatal Python error: UNREF invalid object" in the DoubleTest. ........ r64221 \| neal.norwitz \| 2008-06-13 08:03:25 +0200 (ven., 13 juin 2008) \| 3 lines Fix typo in method name. The LT class implemented less than. The LE class should implement less than or equal to (as the code does). ........ r64229 \| georg.brandl \| 2008-06-13 15:26:54 +0200 (ven., 13 juin 2008) \| 2 lines Clarification. ........ r64230 \| robert.schuppenies \| 2008-06-13 15:29:37 +0200 (ven., 13 juin 2008) \| 2 lines Fixed: sys.getsizeof does not take the actual length of the tuples into account. ........ r64233 \| benjamin.peterson \| 2008-06-13 17:11:50 +0200 (ven., 13 juin 2008) \| 2 lines platform.uname now tries to fill empty values even when os.uname is present ........ r64235 \| benjamin.peterson \| 2008-06-13 17:41:09 +0200 (ven., 13 juin 2008) \| 1 line set svn:ignore on multiprocessing ........ r64253 \| andrew.kuchling \| 2008-06-13 21:38:18 +0200 (ven., 13 juin 2008) \| 1 line Typo fixes ........ r64278 \| martin.v.loewis \| 2008-06-14 16:24:47 +0200 (sam., 14 juin 2008) \| 2 lines Disable UAC by default. ........ r64280 \| gregory.p.smith \| 2008-06-14 19:34:09 +0200 (sam., 14 juin 2008) \| 3 lines silence the test when it is skipped on some platforms. should fix a buildbot. ........ r64301 \| georg.brandl \| 2008-06-15 21:54:36 +0200 (dim., 15 juin 2008) \| 2 lines Forward-port new test from r64300. ........ r64303 \| raymond.hettinger \| 2008-06-16 03:42:40 +0200 (lun., 16 juin 2008) \| 1 line Issue 3116: fix quadratic behavior in marshal.dumps(). ........ r64320 \| georg.brandl \| 2008-06-16 23:00:47 +0200 (lun., 16 juin 2008) \| 2 lines Add Jesse Noller to the developers list. ........ r64328 \| georg.brandl \| 2008-06-17 11:01:35 +0200 (mar., 17 juin 2008) \| 2 lines Split the HTML index. ........ r64338 \| vinay.sajip \| 2008-06-17 13:02:14 +0200 (mar., 17 juin 2008) \| 1 line Bug #3126: StreamHandler and FileHandler check before calling "flush" and "close" that the stream object has these, using hasattr (thanks to bobf for the patch). ........ r64339 \| vinay.sajip \| 2008-06-17 13:04:02 +0200 (mar., 17 juin 2008) \| 1 line Updated with fix for #3126. ........	18 years ago
Martin v. Löwis	1a21451b1d	Implement PEP 3121: new module initialization and finalization API.	18 years ago
Amaury Forgeot d'Arc	74c71f5a62	#2957 : marshal recursion limit exceeded when importing a large .pyc file	18 years ago
Christian Heimes	72b710a596	Renamed PyString to PyBytes	18 years ago
Christian Heimes	9c4756ea26	Renamed PyBytes to PyByteArray	18 years ago
Alexandre Vassalotti	5f8ced2b95	Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62998 \| andrew.kuchling \| 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) \| 7 lines #1858 from Tarek Ziade: Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI for discussion. The patch is slightly revised from Tarek's last patch: I've simplified the PyPIRCCommand.finalize_options() method to not look at sys.argv. Tests still pass. ........ r63000 \| alexandre.vassalotti \| 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) \| 5 lines Cleaned up io._BytesIO.write(). I am amazed that the old code, for inserting null-bytes, actually worked. Who wrote that thing? Oh, it is me... doh. ........ r63002 \| brett.cannon \| 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) \| 2 lines Revert r62998 as it broke the build (seems distutils.config is missing). ........ r63014 \| andrew.kuchling \| 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) \| 1 line #1858: add distutils.config module ........ r63027 \| brett.cannon \| 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) \| 2 lines Flesh out the 3.0 deprecation to suggest using the ctypes module. ........ r63028 \| skip.montanaro \| 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) \| 4 lines Copied two versions of the example from the interactive session. Delete one. ........ r63037 \| georg.brandl \| 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) \| 2 lines reload() takes the module itself. ........ r63038 \| alexandre.vassalotti \| 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) \| 4 lines Added test framework for handling module renames. Factored the import guard in test_py3kwarn.TestStdlibRemovals into a context manager, namely test_support.CleanImport. ........ r63039 \| georg.brandl \| 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) \| 2 lines #2742: ``''`` is not converted to NULL in getaddrinfo. ........ r63040 \| alexandre.vassalotti \| 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) \| 2 lines Fixed typo in a comment of test_support.CleanImport. ........ r63041 \| alexandre.vassalotti \| 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) \| 2 lines Removed a dead line of code. ........ r63043 \| georg.brandl \| 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) \| 2 lines #2812: document property.getter/setter/deleter. ........ r63049 \| georg.brandl \| 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) \| 2 lines #1153769: document PEP 237 changes to string formatting. ........ r63050 \| georg.brandl \| 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) \| 2 lines #2809: elaborate str.split docstring a bit. ........ r63051 \| georg.brandl \| 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) \| 2 lines Fix typo. ........ r63052 \| georg.brandl \| 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) \| 2 lines #2709: clarification. ........ r63053 \| georg.brandl \| 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) \| 2 lines #2659: add ``break_on_hyphens`` to TextWrapper. ........ r63057 \| georg.brandl \| 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) \| 2 lines #2741: clarification of value range for address_family. ........ r63058 \| georg.brandl \| 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) \| 2 lines #2452: timeout is used for all blocking operations. ........ r63059 \| andrew.kuchling \| 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) \| 2 lines #1792: Improve performance of marshal.dumps() on large objects by increasing the size of the buffer more quickly. ........ r63060 \| andrew.kuchling \| 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) \| 1 line #1858: re-apply patch for this, adding the missing files ........ r63061 \| benjamin.peterson \| 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) \| 2 lines Add the "until" command to pdb ........ r63062 \| georg.brandl \| 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) \| 2 lines Add some sentence endings. ........	18 years ago
Christian Heimes	400adb030a	Merged revisions 60475-60479,60481-60488 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r60482 \| raymond.hettinger \| 2008-01-31 23:07:16 +0100 (Thu, 31 Jan 2008) \| 1 line Minor wordsmithing on docstring ........ r60483 \| mark.dickinson \| 2008-01-31 23:17:37 +0100 (Thu, 31 Jan 2008) \| 5 lines Issue #1678380. Fix a bug that identifies 0j and -0j when they appear in the same code unit. The fix is essentially the same as the fix for a previous bug identifying 0. and -0. ........ r60484 \| christian.heimes \| 2008-02-01 00:08:23 +0100 (Fri, 01 Feb 2008) \| 1 line Fixed bug #1983: Return from fork() is pid_t, not int ........ r60486 \| jeffrey.yasskin \| 2008-02-01 07:22:46 +0100 (Fri, 01 Feb 2008) \| 4 lines Move __builtins__.trunc() to math.trunc() per http://mail.python.org/pipermail/python-dev/2008-January/076626.html and issue 1965. ........ r60487 \| jeffrey.yasskin \| 2008-02-01 08:05:46 +0100 (Fri, 01 Feb 2008) \| 3 lines Roll back r60248. It's useful to encourage users not to change Rational instances. ........ r60488 \| neal.norwitz \| 2008-02-01 08:22:59 +0100 (Fri, 01 Feb 2008) \| 1 line Fix refleak ........	18 years ago
Christian Heimes	7b3ce6a17e	Merged revisions 60441-60474 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r60441 \| christian.heimes \| 2008-01-30 12:46:00 +0100 (Wed, 30 Jan 2008) \| 1 line Removed unused var ........ r60448 \| christian.heimes \| 2008-01-30 18:21:22 +0100 (Wed, 30 Jan 2008) \| 1 line Fixed some references leaks in sys. ........ r60450 \| christian.heimes \| 2008-01-30 19:58:29 +0100 (Wed, 30 Jan 2008) \| 1 line The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). ........ r60463 \| raymond.hettinger \| 2008-01-30 23:17:31 +0100 (Wed, 30 Jan 2008) \| 1 line Update itertool recipes ........ r60464 \| christian.heimes \| 2008-01-30 23:54:18 +0100 (Wed, 30 Jan 2008) \| 1 line Bug #1234: Fixed semaphore errors on AIX 5.2 ........ r60469 \| raymond.hettinger \| 2008-01-31 02:38:15 +0100 (Thu, 31 Jan 2008) \| 6 lines Fix defect in __ixor__ which would get the wrong answer if the input iterable had a duplicate element (two calls to toggle() reverse each other). Borrow the correct code from sets.py. ........ r60470 \| raymond.hettinger \| 2008-01-31 02:42:11 +0100 (Thu, 31 Jan 2008) \| 1 line Missing return ........ r60471 \| jeffrey.yasskin \| 2008-01-31 08:44:11 +0100 (Thu, 31 Jan 2008) \| 4 lines Added more documentation on how mixed-mode arithmetic should be implemented. I also noticed and fixed a bug in Rational's forward operators (they were claiming all instances of numbers.Rational instead of just the concrete types). ........	18 years ago
Christian Heimes	fd66e51c4c	Merged revisions 60383-60407 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r60388 \| thomas.heller \| 2008-01-28 09:44:13 +0100 (Mon, 28 Jan 2008) \| 1 line Revert rev. 59925, it breaks comtypes (I need to further examine this). ........ r60397 \| raymond.hettinger \| 2008-01-28 21:34:33 +0100 (Mon, 28 Jan 2008) \| 5 lines Make PySet_Add() work with frozensets. Works like PyTuple_SetItem() to build-up values in a brand new frozenset. Also, PyFrozenSet_New() is now guaranteed to produce a distinct new frozenset. ........ r60398 \| raymond.hettinger \| 2008-01-28 22:34:30 +0100 (Mon, 28 Jan 2008) \| 1 line Let marshal built-up sets and frozensets one element at a time (without creating an intermediate tuple). ........ r60399 \| raymond.hettinger \| 2008-01-28 22:47:42 +0100 (Mon, 28 Jan 2008) \| 1 line Factor-out common code with a new macro ........ r60400 \| raymond.hettinger \| 2008-01-28 22:48:07 +0100 (Mon, 28 Jan 2008) \| 1 line Factor-out common code with a new macro ........ r60401 \| raymond.hettinger \| 2008-01-28 22:51:25 +0100 (Mon, 28 Jan 2008) \| 1 line Removed unnecessary conditional (spotted by Neal Norwitz). ........ r60403 \| gregory.p.smith \| 2008-01-29 00:21:00 +0100 (Tue, 29 Jan 2008) \| 4 lines Disable use of BerkeleyDB 4.6.x to see what the odd platform buildbots think. In particular, neal norwitz has traced an Ubuntu sparc64 crash to the Lib/test/bsddb/test_basics.py test when opening a db with DB_THREAD. ........ r60405 \| brett.cannon \| 2008-01-29 05:13:07 +0100 (Tue, 29 Jan 2008) \| 2 lines Fix the reindent rule to use $(BUILDPYTHON). ........ r60406 \| brett.cannon \| 2008-01-29 05:18:04 +0100 (Tue, 29 Jan 2008) \| 3 lines Update Vim syntax highlighting to specify what revision was used to generate the file. ........ r60407 \| brett.cannon \| 2008-01-29 05:20:56 +0100 (Tue, 29 Jan 2008) \| 2 lines Ignore .pyc and .pyo files. ........	18 years ago
Christian Heimes	90aa7646af	#1629 : Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.	18 years ago
Christian Heimes	217cfd1c86	Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h	18 years ago
Guido van Rossum	58da931da9	Merged revisions 58886-58929 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r58892 \| guido.van.rossum \| 2007-11-06 15:32:56 -0800 (Tue, 06 Nov 2007) \| 2 lines Add missing "return NULL" in overflow check in PyObject_Repr(). ........ r58893 \| raymond.hettinger \| 2007-11-06 17:13:09 -0800 (Tue, 06 Nov 2007) \| 1 line Fix marshal's incorrect handling of subclasses of builtin types (backport candidate). ........ r58895 \| raymond.hettinger \| 2007-11-06 18:26:17 -0800 (Tue, 06 Nov 2007) \| 1 line Optimize dict.fromkeys() with dict inputs. Useful for resetting bag/muliset counts for example. ........ r58896 \| raymond.hettinger \| 2007-11-06 18:45:46 -0800 (Tue, 06 Nov 2007) \| 1 line Add build option for faster loop execution. ........ r58900 \| nick.coghlan \| 2007-11-07 03:57:51 -0800 (Wed, 07 Nov 2007) \| 1 line Add missing NEWS entry ........ r58905 \| christian.heimes \| 2007-11-07 09:50:54 -0800 (Wed, 07 Nov 2007) \| 1 line Backported fix for bug #1392 from py3k branch r58903. ........ r58906 \| christian.heimes \| 2007-11-07 10:30:22 -0800 (Wed, 07 Nov 2007) \| 1 line Backport of Guido's review of my patch. ........ r58908 \| raymond.hettinger \| 2007-11-07 18:52:43 -0800 (Wed, 07 Nov 2007) \| 1 line Add set.isdisjoint() ........ r58915 \| raymond.hettinger \| 2007-11-08 10:47:51 -0800 (Thu, 08 Nov 2007) \| 1 line Reposition the decref (spotted by eagle-eye norwitz). ........ r58920 \| georg.brandl \| 2007-11-09 04:31:43 -0800 (Fri, 09 Nov 2007) \| 2 lines Fix seealso link to sets docs. Do not merge to Py3k. ........ r58921 \| georg.brandl \| 2007-11-09 05:08:48 -0800 (Fri, 09 Nov 2007) \| 2 lines Fix misleading example. ........ r58923 \| georg.brandl \| 2007-11-09 09:33:23 -0800 (Fri, 09 Nov 2007) \| 3 lines Correct a comment about testing methods - nowadays most tests don't run directly on import. ........ r58924 \| martin.v.loewis \| 2007-11-09 14:56:30 -0800 (Fri, 09 Nov 2007) \| 2 lines Add Amaury Forgeot d'Arc. ........ r58925 \| raymond.hettinger \| 2007-11-09 15:14:44 -0800 (Fri, 09 Nov 2007) \| 1 line Optimize common case for dict.fromkeys(). ........ r58927 \| raymond.hettinger \| 2007-11-09 17:54:03 -0800 (Fri, 09 Nov 2007) \| 1 line Use a freelist to speed-up block allocation and deallocation in collections.deque(). ........ r58929 \| guido.van.rossum \| 2007-11-10 14:12:24 -0800 (Sat, 10 Nov 2007) \| 3 lines Issue 1416. Add getter, setter, deleter methods to properties that can be used as decorators to create fully-populated properties. ........	18 years ago
Guido van Rossum	98297ee781	Merging the py3k-pep3137 branch back into the py3k branch. No detailed change log; just check out the change log for the py3k-pep3137 branch. The most obvious changes: - str8 renamed to bytes (PyString at the C level); - bytes renamed to buffer (PyBytes at the C level); - PyString and PyUnicode are no longer compatible. I.e. we now have an immutable bytes type and a mutable bytes type. The behavior of PyString was modified quite a bit, to make it more bytes-like. Some changes are still on the to-do list.	18 years ago
Guido van Rossum	8ce8a784bd	Merged revisions 58221-58741 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r58221 \| georg.brandl \| 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) \| 2 lines Patch #1181: add os.environ.clear() method. ........ r58225 \| sean.reifschneider \| 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) \| 3 lines Issue1704287: "make install" fails unless you do "make" first. Make oldsharedmods and sharedmods in "libinstall". ........ r58232 \| guido.van.rossum \| 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) \| 4 lines Patch # 188 by Philip Jenvey. Make tell() mark CRLF as a newline. With unit test. ........ r58242 \| georg.brandl \| 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) \| 2 lines Fix typo and double word. ........ r58245 \| georg.brandl \| 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) \| 2 lines #1196: document default radix for int(). ........ r58247 \| georg.brandl \| 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) \| 2 lines #1177: accept 2xx responses for https too, not only http. ........ r58249 \| andrew.kuchling \| 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) \| 1 line Remove stray odd character; grammar fix ........ r58250 \| andrew.kuchling \| 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) \| 1 line Typo fix ........ r58251 \| andrew.kuchling \| 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) \| 1 line Add various items ........ r58268 \| vinay.sajip \| 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) \| 1 line Change to flush and close logic to fix #1760556. ........ r58269 \| vinay.sajip \| 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) \| 1 line Change to basicConfig() to fix #1021. ........ r58270 \| georg.brandl \| 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) \| 2 lines #1208: document match object's boolean value. ........ r58271 \| vinay.sajip \| 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) \| 1 line Minor date change. ........ r58272 \| vinay.sajip \| 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) \| 1 line Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time. ........ r58288 \| brett.cannon \| 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) \| 9 lines tuple.__repr__ did not consider a reference loop as it is not possible from Python code; but it is possible from C. object.__str__ had the issue of not expecting a type to doing something within it's tp_str implementation that could trigger an infinite recursion, but it could in C code.. Both found thanks to BaseException and how it handles its repr. Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at coming up with a solution. ........ r58289 \| brett.cannon \| 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) \| 3 lines Fix error introduced by r58288; if a tuple is length 0 return its repr and don't worry about any self-referring tuples. ........ r58294 \| facundo.batista \| 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) \| 11 lines Made the various is_* operations return booleans. This was discussed with Cawlishaw by mail, and he basically confirmed that to these is_* operations, there's no need to return Decimal(0) and Decimal(1) if the language supports the False and True booleans. Also added a few tests for the these functions in extra.decTest, since they are mostly untested (apart from the doctests). Thanks Mark Dickinson ........ r58295 \| facundo.batista \| 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) \| 4 lines Added a class to store the digits of log(10), so that they can be made available when necessary without recomputing. Thanks Mark Dickinson ........ r58299 \| mark.summerfield \| 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) \| 4 lines Added note in footnote about string comparisons about unicodedata.normalize(). ........ r58304 \| raymond.hettinger \| 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) \| 1 line enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy. ........ r58305 \| raymond.hettinger \| 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) \| 1 line itertools.count() no longer limited to sys.maxint. ........ r58306 \| kurt.kaiser \| 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) \| 3 lines Assume that the user knows when he wants to end the line; don't insert something he didn't select or complete. ........ r58307 \| kurt.kaiser \| 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) \| 2 lines Remove unused theme that was causing a fault in p3k. ........ r58308 \| kurt.kaiser \| 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) \| 2 lines Clean up EditorWindow close. ........ r58309 \| kurt.kaiser \| 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) \| 7 lines textView cleanup. Patch 1718043 Tal Einat. M idlelib/EditorWindow.py M idlelib/aboutDialog.py M idlelib/textView.py M idlelib/NEWS.txt ........ r58310 \| kurt.kaiser \| 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) \| 3 lines configDialog cleanup. Patch 1730217 Tal Einat. ........ r58311 \| neal.norwitz \| 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) \| 4 lines Coverity #151: Remove deadcode. All this code already exists above starting at line 653. ........ r58325 \| fred.drake \| 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) \| 1 line wrap lines to <80 characters before fixing errors ........ r58326 \| raymond.hettinger \| 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) \| 6 lines Add __asdict__() to NamedTuple and refine the docs. Add maxlen support to deque() and fixup docs. Partially fix __reduce__(). The None as a third arg was no longer supported. Still needs work on __reduce__() to handle recursive inputs. ........ r58327 \| fred.drake \| 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) \| 3 lines move descriptions of ac_(in\|out)_buffer_size to the right place http://bugs.python.org/issue1053 ........ r58329 \| neal.norwitz \| 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) \| 3 lines dict could be NULL, so we need to XDECREF. Fix a compiler warning about passing a PyTypeObject* instead of PyObject. ........ r58330 \| neal.norwitz \| 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) \| 2 lines Fix Coverity #158: Check the correct variable. ........ r58332 \| neal.norwitz \| 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) \| 7 lines Fix Coverity #159. This code was broken if save() returned a negative number since i contained a boolean value and then we compared i < 0 which should never be true. Will backport (assuming it's necessary) ........ r58334 \| neal.norwitz \| 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) \| 1 line Add a note about fixing some more warnings found by Coverity. ........ r58338 \| raymond.hettinger \| 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) \| 1 line Restore BEGIN/END THREADS macros which were squashed in the previous checkin ........ r58343 \| gregory.p.smith \| 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) \| 3 lines Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390 ubuntu buildbots. ........ r58344 \| gregory.p.smith \| 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) \| 2 lines Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module. ........ r58348 \| gregory.p.smith \| 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) \| 3 lines Use the host the author likely meant in the first place. pop.gmail.com is reliable. gmail.org is someones personal domain. ........ r58351 \| neal.norwitz \| 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) \| 3 lines Ensure that this test will pass even if another test left an unwritable TESTFN. Also use the safe unlink in test_support instead of rolling our own here. ........ r58368 \| georg.brandl \| 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) \| 3 lines #1123: fix the docs for the str.split(None, sep) case. Also expand a few other methods' docs, which had more info in the deprecated string module docs. ........ r58369 \| georg.brandl \| 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) \| 2 lines Update docstring of sched, also remove an unused assignment. ........ r58370 \| raymond.hettinger \| 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) \| 5 lines Add comments to NamedTuple code. Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases). Improve the error message in the case of a SyntaxError (caused by a duplicate field name). ........ r58371 \| raymond.hettinger \| 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) \| 1 line Missed a line in the docs ........ r58372 \| raymond.hettinger \| 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) \| 1 line Better variable names ........ r58376 \| georg.brandl \| 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) \| 3 lines #1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc. No need to merge this to py3k! ........ r58380 \| raymond.hettinger \| 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) \| 1 line Eliminate camelcase function name ........ r58381 \| andrew.kuchling \| 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) \| 1 line Eliminate camelcase function name ........ r58382 \| raymond.hettinger \| 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) \| 1 line Make the error messages more specific ........ r58384 \| gregory.p.smith \| 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) \| 10 lines Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API object available as bsddb.db.api. This is based on the patch submitted by Duncan Grisby here: http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900 See this thread for additional info: http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users It also cleans up the code a little by removing some ifdef/endifs for python prior to 2.1 and for unsupported Berkeley DB <= 3.2. ........ r58385 \| gregory.p.smith \| 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) \| 5 lines Fix a double free when positioning a database cursor to a non-existant string key (and probably a few other situations with string keys). This was reported with a patch as pybsddb sourceforge bug 1708868 by jjjhhhlll at gmail. ........ r58386 \| gregory.p.smith \| 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) \| 3 lines Use the highest cPickle protocol in bsddb.dbshelve. This comes from sourceforge pybsddb patch 1551443 by w_barnes. ........ r58394 \| gregory.p.smith \| 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) \| 2 lines remove another sleepycat reference ........ r58396 \| kurt.kaiser \| 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) \| 3 lines Allow interrupt only when executing user code in subprocess Patch 1225 Tal Einat modified from IDLE-Spoon. ........ r58399 \| brett.cannon \| 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) \| 5 lines Remove file-level typedefs that were inconsistently used throughout the file. Just move over to the public API names. Closes issue1238. ........ r58401 \| raymond.hettinger \| 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) \| 1 line Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques. ........ r58403 \| kurt.kaiser \| 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) \| 2 lines Allow cursor color change w/o restart. Patch 1725576 Tal Einat. ........ r58404 \| kurt.kaiser \| 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) \| 2 lines show paste if > 80 columns. Patch 1659326 Tal Einat. ........ r58415 \| thomas.heller \| 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) \| 5 lines On OS X, use os.uname() instead of gestalt.sysv(...) to get the operating system version. This allows to use ctypes when Python was configured with --disable-toolbox-glue. ........ r58419 \| neal.norwitz \| 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) \| 1 line Get rid of warning about not being able to create an existing directory. ........ r58420 \| neal.norwitz \| 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) \| 1 line Get rid of warnings on a bunch of platforms by using a proper prototype. ........ r58421 \| neal.norwitz \| 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) \| 4 lines Get rid of compiler warning about retval being used (returned) without being initialized. (gcc warning and Coverity 202) ........ r58422 \| neal.norwitz \| 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) \| 1 line Fix Coverity 168: Close the file before returning (exiting). ........ r58423 \| neal.norwitz \| 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) \| 4 lines Fix Coverity 180: Don't overallocate. We don't need structs, but pointers. Also fix a memory leak. ........ r58424 \| neal.norwitz \| 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) \| 5 lines Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory would be accessed. Will backport. ........ r58425 \| neal.norwitz \| 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) \| 1 line Get this module to compile with bsddb versions prior to 4.3 ........ r58430 \| martin.v.loewis \| 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) \| 3 lines Bug #1216: Restore support for Visual Studio 2002. Will backport to 2.5. ........ r58433 \| raymond.hettinger \| 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) \| 1 line Fix test of count.__repr__() to ignore the 'L' if the count is a long ........ r58434 \| gregory.p.smith \| 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) \| 4 lines Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append was useless due to inverted logic. Also adds a test case for RECNO dbs to test_dbshelve. ........ r58445 \| georg.brandl \| 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) \| 2 lines Fix email example. ........ r58450 \| gregory.p.smith \| 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) \| 2 lines Fix an uncollectable reference leak in bsddb.db.DBShelf.append ........ r58453 \| neal.norwitz \| 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) \| 8 lines Let the O/S supply a port if none of the default ports can be used. This should make the tests more robust at the expense of allowing tests to be sloppier by not requiring them to cleanup after themselves. (It will legitamitely help when running two test suites simultaneously or if another process is already using one of the predefined ports.) Also simplifies (slightLy) the exception handling elsewhere. ........ r58459 \| neal.norwitz \| 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) \| 2 lines Don't raise a string exception, they don't work anymore. ........ r58460 \| neal.norwitz \| 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) \| 1 line Use unittest for assertions ........ r58468 \| armin.rigo \| 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) \| 2 lines test_bigbits was not testing what it seemed to. ........ r58471 \| guido.van.rossum \| 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) \| 3 lines Change a PyErr_Print() into a PyErr_Clear(), per discussion in issue 1031213. ........ r58500 \| raymond.hettinger \| 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) \| 1 line Improve error messages ........ r58506 \| raymond.hettinger \| 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) \| 1 line More docs, error messages, and tests ........ r58507 \| andrew.kuchling \| 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) \| 1 line Add items ........ r58508 \| brett.cannon \| 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) \| 3 lines Remove ``:const:`` notation on None in parameter list. Since the markup is not rendered for parameters it just showed up as ``:const:`None` `` in the output. ........ r58509 \| brett.cannon \| 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) \| 3 lines Re-order some functions whose parameters differ between PyObject and const char so that they are next to each other. ........ r58522 \| armin.rigo \| 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) \| 5 lines Fix the overflow checking of list_repeat. Introduce overflow checking into list_inplace_repeat. Backport candidate, possibly. ........ r58530 \| facundo.batista \| 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) \| 7 lines Issue #1580738. When HTTPConnection reads the whole stream with read(), it closes itself. When the stream is read in several calls to read(n), it should behave in the same way if HTTPConnection knows where the end of the stream is (through self.length). Added a test case for this behaviour. ........ r58531 \| facundo.batista \| 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) \| 3 lines Issue 1289, just a typo. ........ r58532 \| gregory.p.smith \| 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) \| 4 lines cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a keyword argument whenever possible to avoid bugs and confusion. (dbtables.py line 447 self.db.get using txn as a non-keyword was an actual bug due to this) ........ r58533 \| gregory.p.smith \| 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) \| 4 lines Fix a weird bug in dbtables: if it chose a random rowid string that contained NULL bytes it would cause the database all sorts of problems in the future leading to very strange random failures and corrupt dbtables.bsdTableDb dbs. ........ r58534 \| gregory.p.smith \| 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) \| 3 lines A cleaner fix than the one committed last night. Generate random rowids that do not contain null bytes. ........ r58537 \| gregory.p.smith \| 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) \| 2 lines mention bsddb fixes. ........ r58538 \| raymond.hettinger \| 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) \| 1 line Remove useless warning ........ r58539 \| gregory.p.smith \| 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) \| 2 lines squelch the warning that this test is supposed to trigger. ........ r58542 \| georg.brandl \| 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) \| 2 lines Clarify wording for apply(). ........ r58544 \| mark.summerfield \| 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) \| 3 lines Added a cross-ref to each other. ........ r58545 \| georg.brandl \| 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) \| 2 lines #1284: "S" means "seen", not unread. ........ r58548 \| thomas.heller \| 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) \| 4 lines Fix ctypes on 32-bit systems when Python is configured --with-system-ffi. See also https://bugs.launchpad.net/bugs/72505. Ported from release25-maint branch. ........ r58550 \| facundo.batista \| 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) \| 8 lines The constructor from tuple was way too permissive: it allowed bad coefficient numbers, floats in the sign, and other details that generated directly the wrong number in the best case, or triggered misfunctionality in the alorithms. Test cases added for these issues. Thanks Mark Dickinson. ........ r58559 \| georg.brandl \| 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) \| 2 lines Fix code being interpreted as a target. ........ r58561 \| georg.brandl \| 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) \| 2 lines Document new "cmdoption" directive. ........ r58562 \| georg.brandl \| 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) \| 2 lines Make a path more Unix-standardy. ........ r58564 \| georg.brandl \| 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) \| 2 lines Document new directive "envvar". ........ r58567 \| georg.brandl \| 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) \| 6 lines * Add new toplevel chapter, "Using Python." (how to install, configure and setup python on different platforms -- at least in theory.) * Move the Python on Mac docs in that chapter. * Add a new chapter about the command line invocation, by stargaming. ........ r58568 \| georg.brandl \| 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) \| 2 lines Change title, for now. ........ r58569 \| georg.brandl \| 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) \| 2 lines Add entry to ACKS. ........ r58570 \| georg.brandl \| 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) \| 2 lines Clarify -E docs. ........ r58571 \| georg.brandl \| 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) \| 2 lines Even more clarification. ........ r58572 \| andrew.kuchling \| 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) \| 1 line Fix protocol name ........ r58573 \| andrew.kuchling \| 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) \| 1 line Various items ........ r58574 \| andrew.kuchling \| 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) \| 1 line Use correct header line ........ r58576 \| armin.rigo \| 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) \| 3 lines Add a crasher for the long-standing issue with closing a file while another thread uses it. ........ r58577 \| georg.brandl \| 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) \| 2 lines Remove duplicate crasher. ........ r58578 \| georg.brandl \| 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) \| 2 lines Unify "byte code" to "bytecode". Also sprinkle :term: markup for it. ........ r58579 \| georg.brandl \| 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) \| 2 lines Add markup to new function descriptions. ........ r58580 \| georg.brandl \| 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) \| 2 lines Add :term:s for descriptors. ........ r58581 \| georg.brandl \| 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) \| 2 lines Unify "file-descriptor" to "file descriptor". ........ r58582 \| georg.brandl \| 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) \| 2 lines Add :term: for generators. ........ r58583 \| georg.brandl \| 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) \| 2 lines Add :term:s for iterator. ........ r58584 \| georg.brandl \| 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) \| 2 lines Add :term:s for "new-style class". ........ r58588 \| neal.norwitz \| 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) \| 1 line Add Chris Monson so he can edit PEPs. ........ r58594 \| guido.van.rossum \| 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) \| 4 lines Issue #1307, patch by Derek Shockey. When "MAIL" is received without args, an exception happens instead of sending a 501 syntax error response. ........ r58598 \| travis.oliphant \| 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) \| 1 line Add phuang patch from Issue 708374 which adds offset parameter to mmap module. ........ r58601 \| neal.norwitz \| 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) \| 2 lines Bug #1313, fix typo (wrong variable name) in example. ........ r58609 \| georg.brandl \| 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) \| 2 lines Update Pygments version from externals. ........ r58618 \| guido.van.rossum \| 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) \| 3 lines Issue 1307 by Derek Shockey, fox the same bug for RCPT. Neal: please backport! ........ r58620 \| raymond.hettinger \| 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) \| 1 line Shorter name for namedtuple() ........ r58621 \| andrew.kuchling \| 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) \| 1 line Update name ........ r58622 \| raymond.hettinger \| 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) \| 1 line Fixup news entry ........ r58623 \| raymond.hettinger \| 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) \| 1 line Optimize sum() for integer and float inputs. ........ r58624 \| raymond.hettinger \| 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) \| 1 line Fixup error return and add support for intermixed ints and floats/ ........ r58628 \| vinay.sajip \| 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) \| 1 line Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__() ........ r58641 \| facundo.batista \| 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) \| 4 lines Issue 1290. CharacterData.__repr__ was constructing a string in response that keeped having a non-ascii character. ........ r58643 \| thomas.heller \| 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) \| 1 line Added unittest for calling a function with paramflags (backport from py3k branch). ........ r58645 \| matthias.klose \| 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) \| 2 lines - Build using system ffi library on arm-linux. ........ r58651 \| georg.brandl \| 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) \| 2 lines Bug #1287: make os.environ.pop() work as expected. ........ r58652 \| raymond.hettinger \| 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) \| 1 line Missing DECREFs ........ r58653 \| matthias.klose \| 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) \| 2 lines - Build using system ffi library on arm-linux, pass --with-system-ffi to CONFIG_ARGS ........ r58655 \| thomas.heller \| 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) \| 2 lines ffi_type_longdouble may be already #defined. See issue 1324. ........ r58656 \| kurt.kaiser \| 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) \| 3 lines Correct an ancient bug in an unused path by removing that path: register() is now idempotent. ........ r58660 \| kurt.kaiser \| 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) \| 4 lines 1. Add comments to provide top-level documentation. 2. Refactor to use more descriptive names. 3. Enhance tests in main(). ........ r58675 \| georg.brandl \| 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) \| 2 lines Fix new pop() method on os.environ on ignorecase-platforms. ........ r58696 \| neal.norwitz \| 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) \| 1 line Update URL for Pygments. 0.8.1 is no longer available ........ r58697 \| hyeshik.chang \| 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) \| 3 lines - Add support for FreeBSD 8 which is recently forked from FreeBSD 7. - Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7. ........ r58698 \| hyeshik.chang \| 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) \| 2 lines Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet) ........ r58700 \| kurt.kaiser \| 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) \| 2 lines Add confirmation dialog before printing. Patch 1717170 Tal Einat. ........ r58706 \| guido.van.rossum \| 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) \| 3 lines Patch 1353 by Jacob Winther. Add mp4 mapping to mimetypes.py. ........ r58709 \| guido.van.rossum \| 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) \| 6 lines Backport fixes for the code that decodes octal escapes (and for PyString also hex escapes) -- this was reaching beyond the end of the input string buffer, even though it is not supposed to be \0-terminated. This has no visible effect but is clearly the correct thing to do. (In 3.0 it had a visible effect after removing ob_sstate from PyString.) ........ r58710 \| kurt.kaiser \| 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) \| 7 lines check in Tal Einat's update to tabpage.py Patch 1612746 M configDialog.py M NEWS.txt AM tabbedpages.py ........ r58715 \| georg.brandl \| 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) \| 2 lines Use correct markup. ........ r58716 \| georg.brandl \| 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) \| 2 lines Make example about hiding None return values at the prompt clearer. ........ r58728 \| neal.norwitz \| 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) \| 1 line Fix some compiler warnings for signed comparisons on Unix and Windows. ........ r58731 \| martin.v.loewis \| 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) \| 2 lines Adding Christian Heimes. ........ r58737 \| raymond.hettinger \| 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) \| 1 line Clarify the reasons why pickle is almost always better than marshal ........ r58739 \| raymond.hettinger \| 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) \| 1 line Sets are marshalable. ........	18 years ago
Travis E. Oliphant	8ae62b6094	Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object.	19 years ago
Guido van Rossum	63175a1330	[Oops, I forgot half of the patch.] Patch # 1050 by Amaury Forgeot d'Arc. On Windows, debug builds insert stack probes, and recursive functions tend to exhaust the stack faster. This patch reduces the marshal maximum depth from 2000 to 1500 for debug builds only. Optimized builds are not affected. This allows test_marshal to pass with debug builds.	19 years ago
Travis E. Oliphant	b99f762f10	Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118.	19 years ago
Guido van Rossum	7a2653438a	Add a missing "rf.depth = 0;" to marshal_load(). Reported by Joe Smith. This makes the CYGWIN tests pass; it's a miracle it didn't fail on other platforms. Seems like it was accidentally dropped (maybe a merge artifact?).	19 years ago
Martin v. Löwis	9f2e346911	Merged revisions 56467-56482 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56477 \| martin.v.loewis \| 2007-07-21 09:04:38 +0200 (Sa, 21 Jul 2007) \| 11 lines Merged revisions 56466-56476 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56476 \| martin.v.loewis \| 2007-07-21 08:55:02 +0200 (Sa, 21 Jul 2007) \| 4 lines PEP 3123: Provide forward compatibility with Python 3.0, while keeping backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and PyVarObject_HEAD_INIT. ........ ................ r56478 \| martin.v.loewis \| 2007-07-21 09:47:23 +0200 (Sa, 21 Jul 2007) \| 2 lines PEP 3123: Use proper C inheritance for PyObject. ................ r56479 \| martin.v.loewis \| 2007-07-21 10:06:55 +0200 (Sa, 21 Jul 2007) \| 3 lines Add longintrepr.h to Python.h, so that the compiler can see that PyFalse is really some kind of PyObject*. ................ r56480 \| martin.v.loewis \| 2007-07-21 10:47:18 +0200 (Sa, 21 Jul 2007) \| 2 lines Qualify SHIFT, MASK, BASE. ................ r56482 \| martin.v.loewis \| 2007-07-21 19:10:57 +0200 (Sa, 21 Jul 2007) \| 2 lines Correctly refer to _ob_next. ................	19 years ago
Guido van Rossum	da5b8f2d28	Rip out the file object's implementation. Fixed test_import.py while I was at it. However, there's still a problem in import.c -- get_file() can leak a FILE struct (not a file descriptor though). I'm not sure how to fix this; closing the FILE* closes the file descriptor, and that's the wrong thing to do when there's still a Python file object keeping the file descriptor open. I also would rather not mess with dup(), as it won't port to Windows.	19 years ago
Guido van Rossum	d59da4b432	Merged revisions 55407-55513 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55413 \| fred.drake \| 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) \| 1 line fix argument name in documentation; match the implementation ................ r55430 \| jack.diederich \| 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) \| 1 line Implements class decorators, PEP 3129. ................ r55432 \| guido.van.rossum \| 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) \| 2 lines obsubmit. ................ r55434 \| guido.van.rossum \| 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) \| 3 lines Fix bug in test_inspect. (I presume this is how it should be fixed; Jack Diedrich, please verify.) ................ r55460 \| brett.cannon \| 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) \| 4 lines Remove the imageop module. With imgfile already removed in Python 3.0 and rgbimg gone in Python 2.6 the unit tests themselves were made worthless. Plus third-party libraries perform the same function much better. ................ r55469 \| neal.norwitz \| 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) \| 118 lines Merged revisions 55324-55467 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55348 \| georg.brandl \| 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) \| 4 lines HTML-escape the plain traceback in cgitb's HTML output, to prevent the traceback inadvertently or maliciously closing the comment and injecting HTML into the error page. ........ r55372 \| neal.norwitz \| 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) \| 6 lines Port rev 55353 from Guido: Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC() fails. Will backport. ........ r55377 \| neal.norwitz \| 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) \| 1 line Mention removal of some directories for obsolete platforms ........ r55380 \| brett.cannon \| 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) \| 2 lines Change the maintainer of the BeOS port. ........ r55383 \| georg.brandl \| 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) \| 2 lines Bug #1719995: don't use deprecated method in sets example. ........ r55386 \| neal.norwitz \| 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) \| 5 lines Fix bug in marshal where bad data would cause a segfault due to lack of an infinite recursion check. Contributed by Damien Miller at Google. ........ r55389 \| brett.cannon \| 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) \| 6 lines Remove the gopherlib module. It has been raising a DeprecationWarning since Python 2.5. Also remove gopher support from urllib/urllib2. As both imported gopherlib the usage of the support would have raised a DeprecationWarning. ........ r55394 \| raymond.hettinger \| 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) \| 1 line calendar.py gets no benefit from xrange() instead of range() ........ r55395 \| brett.cannon \| 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) \| 3 lines Complete deprecation of BaseException.message. Some subclasses were directly accessing the message attribute instead of using the descriptor. ........ r55396 \| neal.norwitz \| 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) \| 4 lines Reduce the max stack depth to see if this fixes the segfaults on Windows and some other boxes. If this is successful, this rev should be backported. I'm not sure how close to the limit we should push this. ........ r55397 \| neal.norwitz \| 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) \| 4 lines Set the depth to something very small to try to determine if the crashes on Windows are really due to the stack size or possibly some other problem. ........ r55398 \| neal.norwitz \| 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) \| 4 lines Last try for tweaking the max stack depth. 5000 was the original value, 4000 didn't work either. 1000 does work on Windows. If 2000 works, that will hopefully be a reasonable balance. ........ r55412 \| fred.drake \| 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) \| 1 line fix argument name in documentation; match the implementation ........ r55427 \| neal.norwitz \| 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) \| 1 line Verify neither dumps or loads overflow the stack and segfault. ........ r55446 \| collin.winter \| 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) \| 1 line Backport PEP 3110's new 'except' syntax to 2.6. ........ r55448 \| raymond.hettinger \| 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) \| 1 line Improvements to NamedTuple's implementation, tests, and documentation ........ r55449 \| raymond.hettinger \| 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) \| 1 line Fix beginner mistake -- don't mix spaces and tabs. ........ r55450 \| neal.norwitz \| 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) \| 1 line Clear data so random memory does not get freed. Will backport. ........ r55452 \| neal.norwitz \| 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) \| 3 lines Whoops, need to pay attention to those test failures. Move the clear to before the first use, not after. ........ r55453 \| neal.norwitz \| 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) \| 1 line Give some clue as to what happened if the test fails. ........ r55455 \| georg.brandl \| 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) \| 2 lines Fix docstring for add_package in site.py. ........ r55458 \| brett.cannon \| 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) \| 2 lines Remove the rgbimg module. It has been deprecated since Python 2.5. ........ r55465 \| nick.coghlan \| 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) \| 1 line Fix typo in example (should be backported, but my maintenance branch is woefully out of date) ........ ................ r55472 \| brett.cannon \| 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) \| 2 lines Remove imageop from the Windows build process. ................ r55486 \| neal.norwitz \| 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) \| 1 line Remove callable() builtin ................ r55506 \| neal.norwitz \| 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) \| 78 lines Merged revisions 55468-55505 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55468 \| neal.norwitz \| 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) \| 1 line rotor is long gone. ........ r55470 \| neal.norwitz \| 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) \| 1 line Update directories/files at the top-level. ........ r55471 \| brett.cannon \| 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) \| 2 lines Try to remove rgbimg from Windows builds. ........ r55474 \| brett.cannon \| 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) \| 4 lines Remove the macfs module. This led to the deprecation of macostools.touched(); it completely relied on macfs and is a no-op on OS X according to code comments. ........ r55476 \| brett.cannon \| 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) \| 3 lines Move imgfile import to the global namespace to trigger an import error ASAP to prevent creation of a test file. ........ r55477 \| brett.cannon \| 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) \| 3 lines Cause posixfile to raise a DeprecationWarning. Documented as deprecated since Ptyhon 1.5. ........ r55479 \| andrew.kuchling \| 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) \| 1 line Note removed modules ........ r55481 \| martin.v.loewis \| 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) \| 2 lines Add Alexandre Vassalotti. ........ r55482 \| george.yoshida \| 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) \| 4 lines fix against r55474 [Remove the macfs module] Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex. ........ r55487 \| raymond.hettinger \| 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) \| 1 line Replace assertion with straight error-checking. ........ r55489 \| raymond.hettinger \| 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) \| 1 line Allow all alphanumeric and underscores in type and field names. ........ r55490 \| facundo.batista \| 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) \| 5 lines Added timeout support to HTTPSConnection, through the socket.create_connection function. Also added a small test for this, and updated NEWS file. ........ r55495 \| georg.brandl \| 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) \| 2 lines Patch #1686487: you can now pass any mapping after '**' in function calls. ........ r55502 \| neal.norwitz \| 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) \| 1 line Document new params to HTTPSConnection ........ r55504 \| neal.norwitz \| 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) \| 1 line Stop using METH_OLDARGS ........ r55505 \| neal.norwitz \| 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) \| 1 line Stop using METH_OLDARGS implicitly ........ ................	19 years ago
Guido van Rossum	a8add0ec5e	Merged revisions 55270-55324 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55271 \| fred.drake \| 2007-05-11 10:14:47 -0700 (Fri, 11 May 2007) \| 3 lines remove jpeg, panel libraries for SGI; there is more IRIX stuff left over, I guess that should be removed too, but will leave for someone who is sure ........ r55280 \| fred.drake \| 2007-05-11 19:11:37 -0700 (Fri, 11 May 2007) \| 1 line remove mention of file that has been removed ........ r55301 \| brett.cannon \| 2007-05-13 17:38:05 -0700 (Sun, 13 May 2007) \| 4 lines Remove rexec and Bastion from the stdlib. This also eliminates the need for f_restricted on frames. This in turn negates the need for PyEval_GetRestricted() and PyFrame_IsRestricted(). ........ r55303 \| brett.cannon \| 2007-05-13 19:22:22 -0700 (Sun, 13 May 2007) \| 2 lines Remove the md5 and sha modules. ........ r55305 \| george.yoshida \| 2007-05-13 19:45:55 -0700 (Sun, 13 May 2007) \| 2 lines fix markup ........ r55306 \| neal.norwitz \| 2007-05-13 19:47:57 -0700 (Sun, 13 May 2007) \| 1 line Get the doc building again after some removals. ........ r55307 \| neal.norwitz \| 2007-05-13 19:50:45 -0700 (Sun, 13 May 2007) \| 1 line Get test_pyclbr passing again after getstatus was removed from commands. This "test case" was weird since it was just importing a seemingly random module. Remove the import ........ r55322 \| brett.cannon \| 2007-05-14 14:09:20 -0700 (Mon, 14 May 2007) \| 3 lines Remove the compiler package. Will eventually need a mechanism to byte compile an AST. ........	19 years ago
Guido van Rossum	e6d3904c22	Make test_marshal pass. Not my best work. :-(	19 years ago
Guido van Rossum	f15a29f975	More coding by random modification. Encoding now return bytes instead of str8. eval(), exec(), compile() now accept unicode or bytes.	19 years ago
Guido van Rossum	8d30cc0144	Get rid of all #ifdef Py_USING_UNICODE (it is always present now). (With the help of unifdef from freshmeat.)	19 years ago
Guido van Rossum	98f9746740	Support marshal.dump(x, f) where f is not a real file. Support ord(b) where b is a 1-byte string. In zipfile.py, work around bytes being ints instead of chars, sometimes.	19 years ago
Guido van Rossum	ddefaf31b3	Merged the int/long unification branch, by very crude means (sorry Thomas!). I banged on the code (beyond what's in that branch) to make fewer tests fail; the only tests that fail now are: test_descr -- can't pickle ints?! test_pickletools -- ??? test_socket -- See python.org/sf/1619659 test_sqlite -- ??? I'll deal with those later.	19 years ago

1 2 3 4

151 Commits (e27faac45f5b55a22b15c4faff76c3ab676f190d)