diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-22 22:10:59 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-22 22:10:59 (GMT) |
| commit | 9bc9351c0495f78f8350c7fc5368e77b51883330 (patch) | |
| tree | 43db46166f227544a954da2f68cc62e3a28013ec /Modules | |
| parent | 81817ad5cd03682a237882d82ae143262d94a39a (diff) | |
| download | cpython-9bc9351c0495f78f8350c7fc5368e77b51883330.zip cpython-9bc9351c0495f78f8350c7fc5368e77b51883330.tar.gz cpython-9bc9351c0495f78f8350c7fc5368e77b51883330.tar.bz2 | |
Merged revisions 66508,66510,66512-66513,66523-66526,66529-66530,66532,66535,66538,66544,66546 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66508 | benjamin.peterson | 2008-09-18 18:20:28 -0500 (Thu, 18 Sep 2008) | 1 line
tabify
........
r66510 | josiah.carlson | 2008-09-18 21:07:22 -0500 (Thu, 18 Sep 2008) | 2 lines
Fix for documentation bug. Fixes issue 3904.
........
r66512 | raymond.hettinger | 2008-09-19 03:07:48 -0500 (Fri, 19 Sep 2008) | 1 line
Improve docs for super().
........
r66513 | lars.gustaebel | 2008-09-19 07:39:23 -0500 (Fri, 19 Sep 2008) | 2 lines
Correct information about the tarfile module.
........
r66523 | georg.brandl | 2008-09-21 02:14:44 -0500 (Sun, 21 Sep 2008) | 2 lines
#3852: fix some select.kqueue and kevent docs.
........
r66524 | georg.brandl | 2008-09-21 02:15:59 -0500 (Sun, 21 Sep 2008) | 2 lines
#3912: document default for *places* arg.
........
r66525 | georg.brandl | 2008-09-21 02:17:00 -0500 (Sun, 21 Sep 2008) | 2 lines
#3916: fixes for docs wrt. Windows directory layout
........
r66526 | georg.brandl | 2008-09-21 02:18:28 -0500 (Sun, 21 Sep 2008) | 2 lines
#3914: add //= to the augmented assign operators.
........
r66529 | georg.brandl | 2008-09-21 02:24:11 -0500 (Sun, 21 Sep 2008) | 2 lines
#3901: bsddb fix.
........
r66530 | georg.brandl | 2008-09-21 02:31:52 -0500 (Sun, 21 Sep 2008) | 2 lines
#3897: _collections now has an underscore.
........
r66532 | georg.brandl | 2008-09-21 02:36:22 -0500 (Sun, 21 Sep 2008) | 2 lines
Update readme and Makefile (web builder doesn't exist).
........
r66535 | georg.brandl | 2008-09-21 03:03:21 -0500 (Sun, 21 Sep 2008) | 2 lines
#3918: note that uniform() args can be swapped.
........
r66538 | georg.brandl | 2008-09-21 05:03:39 -0500 (Sun, 21 Sep 2008) | 2 lines
Add "dist" target.
........
r66544 | benjamin.peterson | 2008-09-21 16:27:51 -0500 (Sun, 21 Sep 2008) | 4 lines
#3879 fix a regression in urllib.getproxies_environment
reviewers: Benjamin, Georg
........
r66546 | georg.brandl | 2008-09-21 17:31:59 -0500 (Sun, 21 Sep 2008) | 2 lines
Fill out download page.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Setup.dist | 2 | ||||
| -rw-r--r-- | Modules/config.c.in | 4 | ||||
| -rw-r--r-- | Modules/selectmodule.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Modules/Setup.dist b/Modules/Setup.dist index a2b20ca..8f3b8f8 100644 --- a/Modules/Setup.dist +++ b/Modules/Setup.dist @@ -161,7 +161,7 @@ _symtable symtablemodule.c #_weakref _weakref.c # basic weak reference support #_testcapi _testcapimodule.c # Python C API test module #_random _randommodule.c # Random number generator -#collections collectionsmodule.c # Container types +#_collections _collectionsmodule.c # Container types #itertools itertoolsmodule.c # Functions creating iterators for efficient looping #atexit atexitmodule.c # Register functions to be run at interpreter-shutdown diff --git a/Modules/config.c.in b/Modules/config.c.in index 28029d5..5d8f5a9 100644 --- a/Modules/config.c.in +++ b/Modules/config.c.in @@ -51,8 +51,8 @@ struct _inittab _PyImport_Inittab[] = { /* This lives in gcmodule.c */ {"gc", PyInit_gc}, - /* This lives in _warnings.c */ - {"_warnings", _PyWarnings_Init}, + /* This lives in _warnings.c */ + {"_warnings", _PyWarnings_Init}, /* Sentinel */ {0, 0} diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index 8e26050..6ec574d 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -1612,7 +1612,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args) } PyDoc_STRVAR(kqueue_queue_control_doc, -"control(changelist, max_events=0[, timeout=None]) -> eventlist\n\ +"control(changelist, max_events[, timeout=None]) -> eventlist\n\ \n\ Calls the kernel kevent function.\n\ - changelist must be a list of kevent objects describing the changes\n\ |