diff options
| author | Georg Brandl <georg@python.org> | 2010-03-21 19:16:28 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-03-21 19:16:28 (GMT) |
| commit | b6453a902edc6e23093f96978ed175fa65b77fa1 (patch) | |
| tree | dce558e2b155d38015ca7ce54ddeffaaed30172e /Modules | |
| parent | 9fed6d8d4968ebaf8327d2286ed4c5bf788181bc (diff) | |
| download | cpython-b6453a902edc6e23093f96978ed175fa65b77fa1.zip cpython-b6453a902edc6e23093f96978ed175fa65b77fa1.tar.gz cpython-b6453a902edc6e23093f96978ed175fa65b77fa1.tar.bz2 | |
Merged revisions 77120,77151,77155,77209,77229,77256,77317,77331,77333,77359-77360,77382,77561,77570 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77120 | georg.brandl | 2009-12-29 22:09:17 +0100 (Di, 29 Dez 2009) | 1 line
#7595: fix typo in argument default constant.
........
r77151 | georg.brandl | 2009-12-30 19:32:50 +0100 (Mi, 30 Dez 2009) | 1 line
#7487: update Pygments version.
........
r77155 | georg.brandl | 2009-12-30 20:03:00 +0100 (Mi, 30 Dez 2009) | 1 line
We only support Windows NT derivatives now.
........
r77209 | georg.brandl | 2010-01-01 14:07:05 +0100 (Fr, 01 Jan 2010) | 1 line
More yearly updates.
........
r77229 | georg.brandl | 2010-01-02 13:35:01 +0100 (Sa, 02 Jan 2010) | 1 line
Fix casing.
........
r77256 | georg.brandl | 2010-01-02 23:55:55 +0100 (Sa, 02 Jan 2010) | 1 line
Fix typo.
........
r77317 | georg.brandl | 2010-01-05 19:14:52 +0100 (Di, 05 Jan 2010) | 1 line
Add Stefan.
........
r77331 | georg.brandl | 2010-01-06 18:43:06 +0100 (Mi, 06 Jan 2010) | 1 line
Small fixes to test_cmd: fix signature of do_shell, remove duplicate import, add option to run the custom Cmd class.
........
r77333 | georg.brandl | 2010-01-06 19:26:08 +0100 (Mi, 06 Jan 2010) | 1 line
#5950: document that zip files with comments are unsupported in zipimport.
........
r77359 | georg.brandl | 2010-01-07 21:54:45 +0100 (Do, 07 Jan 2010) | 1 line
Fix description for Py_GetPath(); it sounded like it always returned sys.path.
........
r77360 | georg.brandl | 2010-01-07 22:48:47 +0100 (Do, 07 Jan 2010) | 1 line
#7653: clarify how the PythonPath registry key should look like.
........
r77382 | georg.brandl | 2010-01-09 10:47:11 +0100 (Sa, 09 Jan 2010) | 1 line
#7422: make it clear that getargspec() only works on Python functions.
........
r77561 | georg.brandl | 2010-01-17 09:42:30 +0100 (So, 17 Jan 2010) | 1 line
#7699: improve datetime docs: straightforward linking to strftime/strptime section, mark classmethods as such.
........
r77570 | georg.brandl | 2010-01-17 13:14:42 +0100 (So, 17 Jan 2010) | 1 line
Add note about usage of STRINGLIB_EMPTY.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_hashopenssl.c | 2 | ||||
| -rw-r--r-- | Modules/selectmodule.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 497088d..691d1e8 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -1,7 +1,7 @@ /* Module that wraps all OpenSSL hash algorithms */ /* - * Copyright (C) 2005 Gregory P. Smith (greg@krypto.org) + * Copyright (C) 2005-2010 Gregory P. Smith (greg@krypto.org) * Licensed to PSF under a Contributor Agreement. * * Derived from a skeleton of shamodule.c containing work performed by: diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index a254233..2a3eefd 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -1161,7 +1161,7 @@ static PyTypeObject pyEpoll_Type = { #endif PyDoc_STRVAR(kqueue_event_doc, -"kevent(ident, filter=KQ_FILTER_READ, flags=KQ_ADD, fflags=0, data=0, udata=0)\n\ +"kevent(ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=0)\n\ \n\ This object is the equivalent of the struct kevent for the C API.\n\ \n\ |