Mercurial > cpython-lru_cache-weakref

comparison Python/sysmodule.c @ 46478:beb7abcd6c01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 62350-62355,62358-62359,62364-62365,62370,62372-62375,62378-62379,62381 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62350 | nick.coghlan | 2008-04-15 12:25:31 +0200 (Tue, 15 Apr 2008) | 1 line Issue 2439: add pkgutils.get_data() as a convenience wrapper for the PEP 302 get_data() API (contributed by Paul Moore) ........ r62351 | nick.coghlan | 2008-04-15 12:28:14 +0200 (Tue, 15 Apr 2008) | 1 line Add test file missing from rev 62350 ........ r62352 | benjamin.peterson | 2008-04-15 13:58:46 +0200 (Tue, 15 Apr 2008) | 2 lines Add myself to Doc/ACKS.txt ........ r62353 | andrew.kuchling | 2008-04-15 15:10:07 +0200 (Tue, 15 Apr 2008) | 6 lines Add *,**,@ to index, as suggested by http://farmdev.com/thoughts/24/what-does-the-def-star-variable-or-def-asterisk-parameter-syntax-do-in-python-/ The right entry type to use isn't clear; operator seems wrong, because *,**,@ aren't being used in expressions here. I put them as 'statement'; 'syntax' might be better. ........ r62354 | andrew.kuchling | 2008-04-15 15:10:41 +0200 (Tue, 15 Apr 2008) | 1 line Typo fix ........ r62355 | mark.dickinson | 2008-04-15 22:51:18 +0200 (Tue, 15 Apr 2008) | 3 lines Fix for possible signed overflow: the behaviour of -LONG_MIN is undefined in ANSI C. ........ r62358 | jeroen.ruigrok | 2008-04-16 14:47:01 +0200 (Wed, 16 Apr 2008) | 2 lines Reformat to 80 columns prior to adding documentation. ........ r62359 | jeroen.ruigrok | 2008-04-16 14:57:43 +0200 (Wed, 16 Apr 2008) | 2 lines Add details about the return value for mmap.flush(). ........ r62364 | raymond.hettinger | 2008-04-17 12:48:31 +0200 (Thu, 17 Apr 2008) | 1 line Issue 2648: Add leading zero to money format recipe in the docs. ........ r62365 | jeroen.ruigrok | 2008-04-17 14:39:45 +0200 (Thu, 17 Apr 2008) | 2 lines Be consistent in the use of read-only. ........ r62370 | andrew.kuchling | 2008-04-17 22:44:06 +0200 (Thu, 17 Apr 2008) | 1 line Typo fixes ........ r62372 | andrew.kuchling | 2008-04-18 04:40:47 +0200 (Fri, 18 Apr 2008) | 1 line Use correct parameter name ........ r62373 | andrew.kuchling | 2008-04-18 18:53:09 +0200 (Fri, 18 Apr 2008) | 1 line #2654: fix typo ........ r62374 | andrew.kuchling | 2008-04-18 20:28:23 +0200 (Fri, 18 Apr 2008) | 4 lines Remove personal note from Jim Roskind; it no longer applies, and the e-mail address is for a previous employer. Can we move the big long copyright statement into a sidebar or something? ........ r62375 | andrew.kuchling | 2008-04-18 20:39:55 +0200 (Fri, 18 Apr 2008) | 1 line Rewrite introductory section, and remove old section. (It was already commented-out, but why keep it?) ........ r62378 | skip.montanaro | 2008-04-18 22:35:46 +0200 (Fri, 18 Apr 2008) | 1 line resolve issue 2014 ........ r62379 | benjamin.peterson | 2008-04-18 22:45:33 +0200 (Fri, 18 Apr 2008) | 2 lines Fix indentation in sysmodule.c ........ r62381 | amaury.forgeotdarc | 2008-04-19 01:31:33 +0200 (Sat, 19 Apr 2008) | 3 lines Some tests did not pass on repeated calls (regrtest -R::) Perform additional cleanup, mostly deleting from sys.modules, or clearing the warnings registry. ........
author Christian Heimes <christian@cheimes.de>
date Sat, 19 Apr 2008 00:55:37 +0000
parents 47d9bbe10897
children 74b9c85361f8
comparison
equal deleted inserted replaced
46477:b69f443ef480 46478:beb7abcd6c01
1189 } 1189 }
1190 1190
1191 /* stdin/stdout/stderr are now set by pythonrun.c */ 1191 /* stdin/stdout/stderr are now set by pythonrun.c */
1192 1192
1193 PyDict_SetItemString(sysdict, "__displayhook__", 1193 PyDict_SetItemString(sysdict, "__displayhook__",
1194 PyDict_GetItemString(sysdict, "displayhook")); 1194 PyDict_GetItemString(sysdict, "displayhook"));
1195 PyDict_SetItemString(sysdict, "__excepthook__", 1195 PyDict_SetItemString(sysdict, "__excepthook__",
1196 PyDict_GetItemString(sysdict, "excepthook")); 1196 PyDict_GetItemString(sysdict, "excepthook"));
1197 SET_SYS_FROM_STRING("version", 1197 SET_SYS_FROM_STRING("version",
1198 PyUnicode_FromString(Py_GetVersion())); 1198 PyUnicode_FromString(Py_GetVersion()));
1199 SET_SYS_FROM_STRING("hexversion", 1199 SET_SYS_FROM_STRING("hexversion",
1200 PyLong_FromLong(PY_VERSION_HEX)); 1200 PyLong_FromLong(PY_VERSION_HEX));
1201 svnversion_init(); 1201 svnversion_init();
1202 SET_SYS_FROM_STRING("subversion", 1202 SET_SYS_FROM_STRING("subversion",
1203 Py_BuildValue("(UUU)", "CPython", branch, 1203 Py_BuildValue("(UUU)", "CPython", branch,
1204 svn_revision)); 1204 svn_revision));
1205 SET_SYS_FROM_STRING("dont_write_bytecode", 1205 SET_SYS_FROM_STRING("dont_write_bytecode",
1206 PyBool_FromLong(Py_DontWriteBytecodeFlag)); 1206 PyBool_FromLong(Py_DontWriteBytecodeFlag));
1207 /* 1207 /*
1208 * These release level checks are mutually exclusive and cover 1208 * These release level checks are mutually exclusive and cover
1209 * the field, so don't get too fancy with the pre-processor! 1209 * the field, so don't get too fancy with the pre-processor!
1210 */ 1210 */
1211 #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_ALPHA 1211 #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_ALPHA