diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-06-28 17:22:03 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-06-28 17:22:03 (GMT) |
| commit | 0289b15820f6b43ae55b3e4e8733f5dc05682bb2 (patch) | |
| tree | e673b6ba35ca373da6c7c506bed71743f3e3600f /Modules | |
| parent | cd3ffe6859ab21970f3d47a205900bd19f65248a (diff) | |
| download | cpython-0289b15820f6b43ae55b3e4e8733f5dc05682bb2.zip cpython-0289b15820f6b43ae55b3e4e8733f5dc05682bb2.tar.gz cpython-0289b15820f6b43ae55b3e4e8733f5dc05682bb2.tar.bz2 | |
Merged revisions 73004,73439,73496,73509,73529,73564,73576-73577,73595-73596,73605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73004 | jeffrey.yasskin | 2009-05-28 22:44:31 -0500 (Thu, 28 May 2009) | 5 lines
Fix nearly all compilation warnings under Apple gcc-4.0. Tested with OPT="-g
-Wall -Wstrict-prototypes -Werror" in both --with-pydebug mode and --without.
There's still a batch of non-prototype warnings in Xlib.h that I don't know how
to fix.
........
r73439 | benjamin.peterson | 2009-06-15 19:29:31 -0500 (Mon, 15 Jun 2009) | 1 line
don't mask encoding errors when decoding a string #6289
........
r73496 | vinay.sajip | 2009-06-21 12:37:27 -0500 (Sun, 21 Jun 2009) | 1 line
Issue #6314: logging.basicConfig() performs extra checks on the "level" argument.
........
r73509 | amaury.forgeotdarc | 2009-06-22 14:33:48 -0500 (Mon, 22 Jun 2009) | 2 lines
#4490 Fix sample code run by "python -m xml.sax.xmlreader"
........
r73529 | r.david.murray | 2009-06-23 13:02:46 -0500 (Tue, 23 Jun 2009) | 4 lines
Fix issue 5230 by having pydoc's safeimport check to see if the import
error was thrown from itself in order to decide if the module can't be
found. Thanks to Lucas Prado Melo for collaborating on the fix and tests.
........
r73564 | amaury.forgeotdarc | 2009-06-25 17:29:29 -0500 (Thu, 25 Jun 2009) | 6 lines
#2016 Fix a crash in function call when the **kwargs dictionary is mutated
during the function call setup.
This even gives a slight speedup, probably because tuple allocation
is faster than PyMem_NEW.
........
r73576 | benjamin.peterson | 2009-06-26 18:37:06 -0500 (Fri, 26 Jun 2009) | 1 line
document is_declared_global()
........
r73577 | benjamin.peterson | 2009-06-27 09:16:23 -0500 (Sat, 27 Jun 2009) | 1 line
link to extensive generator docs in the reference manual
........
r73595 | ezio.melotti | 2009-06-27 18:45:39 -0500 (Sat, 27 Jun 2009) | 1 line
stmt and setup can contain multiple statements, see #5896
........
r73596 | ezio.melotti | 2009-06-27 19:07:45 -0500 (Sat, 27 Jun 2009) | 1 line
Fixed a wrong apostrophe
........
r73605 | georg.brandl | 2009-06-28 07:10:18 -0500 (Sun, 28 Jun 2009) | 1 line
Remove stray pychecker directive.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 2 | ||||
| -rw-r--r-- | Modules/_struct.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index b400057..906138d 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -658,7 +658,7 @@ _get_peer_alt_names (X509 *certificate) { char buf[2048]; char *vptr; int len; - const unsigned char *p; + unsigned char *p; if (certificate == NULL) return peer_alt_names; diff --git a/Modules/_struct.c b/Modules/_struct.c index 83f5685..27d596c 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -132,6 +132,7 @@ get_long(PyObject *v, long *p) /* Same, but handling unsigned long */ +#ifndef PY_STRUCT_OVERFLOW_MASKING static int get_ulong(PyObject *v, unsigned long *p) { @@ -152,6 +153,7 @@ get_ulong(PyObject *v, unsigned long *p) *p = x; return 0; } +#endif /* PY_STRUCT_OVERFLOW_MASKING */ #ifdef HAVE_LONG_LONG |