[Python-checkins] r68599 - in python/branches/release26-maint: Doc/c-api/typeobj.rst Doc/library/logging.rst Doc/library/random.rst Doc/library/sys.rst Doc/using/cmdline.rst Include/pyport.h Include/unicodeobject.h Lib/ctypes/test/__init__.py Lib/random.py Lib/test/test_decimal.py Lib/test/test_import.py Misc/python.man Modules/main.c Modules/socketmodule.c Python/import.c Tools/scripts/patchcheck.py configure.in
georg.brandl
python-checkins at python.org
Wed Jan 14 01:00:18 CET 2009
Author: georg.brandl
Date: Wed Jan 14 01:00:17 2009
New Revision: 68599
Log:
Merged revisions 68292,68344,68361,68378,68424,68426,68429-68430,68450,68457,68480-68481,68493,68495,68499,68501,68512,68514-68515 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68292 | skip.montanaro | 2009-01-04 11:36:58 +0100 (So, 04 Jan 2009) | 3 lines
If user configures --without-gcc give preference to $CC instead of blindly
assuming the compiler will be "cc".
........
r68344 | marc-andre.lemburg | 2009-01-05 20:43:35 +0100 (Mo, 05 Jan 2009) | 7 lines
Fix #4846 (Py_UNICODE_ISSPACE causes linker error) by moving the declaration
into the extern "C" section.
Add a few more comments and apply some minor edits to make the file contents
fit the original structure again.
........
r68361 | antoine.pitrou | 2009-01-06 19:34:08 +0100 (Di, 06 Jan 2009) | 3 lines
Use shutil.rmtree rather than os.rmdir.
........
r68378 | mark.dickinson | 2009-01-07 18:48:33 +0100 (Mi, 07 Jan 2009) | 2 lines
Issue #4869: clarify documentation for random.expovariate.
........
r68424 | benjamin.peterson | 2009-01-09 03:53:35 +0100 (Fr, 09 Jan 2009) | 1 line
specify what -3 warnings are about
........
r68426 | benjamin.peterson | 2009-01-09 04:03:05 +0100 (Fr, 09 Jan 2009) | 1 line
fix spelling
........
r68429 | benjamin.peterson | 2009-01-09 04:05:14 +0100 (Fr, 09 Jan 2009) | 1 line
add -3 to manpage
........
r68430 | benjamin.peterson | 2009-01-09 04:07:27 +0100 (Fr, 09 Jan 2009) | 1 line
be more specific in -3 option help
........
r68450 | jeffrey.yasskin | 2009-01-09 17:47:07 +0100 (Fr, 09 Jan 2009) | 3 lines
Fix issue 4884, preventing a crash in the socket code when python is compiled
with llvm-gcc and run with a glibc <2.10.
........
r68457 | kristjan.jonsson | 2009-01-09 21:10:59 +0100 (Fr, 09 Jan 2009) | 1 line
Issue 3677: Fix import from UNC paths on Windows.
........
r68480 | vinay.sajip | 2009-01-10 14:38:04 +0100 (Sa, 10 Jan 2009) | 1 line
Minor documentation changes cross-referencing NullHandler to the documentation on configuring logging in a library.
........
r68481 | vinay.sajip | 2009-01-10 14:42:04 +0100 (Sa, 10 Jan 2009) | 1 line
Corrected an incorrect self-reference.
........
r68493 | benjamin.peterson | 2009-01-10 18:18:55 +0100 (Sa, 10 Jan 2009) | 1 line
rewrite verbose conditionals
........
r68495 | benjamin.peterson | 2009-01-10 18:36:44 +0100 (Sa, 10 Jan 2009) | 1 line
tp_iter only exists with Py_TPFLAGS_HAVE_ITER #4901
........
r68499 | mark.dickinson | 2009-01-10 20:14:55 +0100 (Sa, 10 Jan 2009) | 2 lines
Remove an unnecessary check from test_decimal.
........
r68501 | vinay.sajip | 2009-01-10 20:22:57 +0100 (Sa, 10 Jan 2009) | 1 line
Corrected minor typo and added .currentmodule directives to fix missing cross-references.
........
r68512 | benjamin.peterson | 2009-01-10 23:42:10 +0100 (Sa, 10 Jan 2009) | 1 line
make tests fail if they can't be imported
........
r68514 | benjamin.peterson | 2009-01-11 00:41:59 +0100 (So, 11 Jan 2009) | 1 line
move seealso to a more appropiate place
........
r68515 | benjamin.peterson | 2009-01-11 00:49:08 +0100 (So, 11 Jan 2009) | 1 line
macos 9 isn't supported
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Doc/c-api/typeobj.rst
python/branches/release26-maint/Doc/library/logging.rst
python/branches/release26-maint/Doc/library/random.rst
python/branches/release26-maint/Doc/library/sys.rst
python/branches/release26-maint/Doc/using/cmdline.rst
python/branches/release26-maint/Include/pyport.h
python/branches/release26-maint/Include/unicodeobject.h
python/branches/release26-maint/Lib/ctypes/test/__init__.py
python/branches/release26-maint/Lib/random.py
python/branches/release26-maint/Lib/test/test_decimal.py
python/branches/release26-maint/Lib/test/test_import.py
python/branches/release26-maint/Misc/python.man
python/branches/release26-maint/Modules/main.c
python/branches/release26-maint/Modules/socketmodule.c
python/branches/release26-maint/Python/import.c
python/branches/release26-maint/Tools/scripts/patchcheck.py
python/branches/release26-maint/configure.in
Modified: python/branches/release26-maint/Doc/c-api/typeobj.rst
==============================================================================
--- python/branches/release26-maint/Doc/c-api/typeobj.rst (original)
+++ python/branches/release26-maint/Doc/c-api/typeobj.rst Wed Jan 14 01:00:17 2009
@@ -743,7 +743,7 @@
:attr:`__weakref__`, the type inherits its :attr:`tp_weaklistoffset` from its
base type.
-The next two fields only exist if the :const:`Py_TPFLAGS_HAVE_CLASS` flag bit is
+The next two fields only exist if the :const:`Py_TPFLAGS_HAVE_ITER` flag bit is
set.
Modified: python/branches/release26-maint/Doc/library/logging.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/logging.rst (original)
+++ python/branches/release26-maint/Doc/library/logging.rst Wed Jan 14 01:00:17 2009
@@ -121,7 +121,7 @@
messages at different log levels. This allows you to instrument your code with
debug messages, for example, but turning the log level down so that those debug
messages are not written for your production system. The default levels are
-``CRITICAL``, ``ERROR``, ``WARNING``, ``INFO``, ``DEBUG`` and ``UNSET``.
+``CRITICAL``, ``ERROR``, ``WARNING``, ``INFO``, ``DEBUG`` and ``NOTSET``.
The logger, handler, and log message call each specify a level. The log message
is only emitted if the handler and logger are configured to emit messages of
@@ -422,6 +422,8 @@
code approach, mainly separation of configuration and code and the ability of
noncoders to easily modify the logging properties.
+.. _library-config:
+
Configuring Logging for a Library
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -524,6 +526,8 @@
#. :class:`FileHandler` instances send error messages to disk files.
+.. currentmodule:: logging.handlers
+
#. :class:`BaseRotatingHandler` is the base class for handlers that rotate log
files at a certain point. It is not meant to be instantiated directly. Instead,
use :class:`RotatingFileHandler` or :class:`TimedRotatingFileHandler`.
@@ -553,7 +557,12 @@
#. :class:`HTTPHandler` instances send error messages to an HTTP server using
either ``GET`` or ``POST`` semantics.
-The :class:`NullHandler`, :class:`StreamHandler` and :class:`FileHandler`
+#. :class:`WatchedFileHandler` instances watch the file they are logging to. If
+the file changes, it is closed and reopened using the file name. This handler
+is only useful on Unix-like systems; Windows does not support the underlying
+mechanism used.
+
+The :class:`StreamHandler` and :class:`FileHandler`
classes are defined in the core logging package. The other handlers are
defined in a sub- module, :mod:`logging.handlers`. (There is also another
sub-module, :mod:`logging.config`, for configuration functionality.)
@@ -1601,6 +1610,9 @@
Outputs the record to the file.
+See :ref:`library-config` for more information on how to use
+:class:`NullHandler`.
+
WatchedFileHandler
^^^^^^^^^^^^^^^^^^
Modified: python/branches/release26-maint/Doc/library/random.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/random.rst (original)
+++ python/branches/release26-maint/Doc/library/random.rst Wed Jan 14 01:00:17 2009
@@ -210,9 +210,11 @@
.. function:: expovariate(lambd)
- Exponential distribution. *lambd* is 1.0 divided by the desired mean. (The
- parameter would be called "lambda", but that is a reserved word in Python.)
- Returned values range from 0 to positive infinity.
+ Exponential distribution. *lambd* is 1.0 divided by the desired
+ mean. It should be nonzero. (The parameter would be called
+ "lambda", but that is a reserved word in Python.) Returned values
+ range from 0 to positive infinity if *lambd* is positive, and from
+ negative infinity to 0 if *lambd* is negative.
.. function:: gammavariate(alpha, beta)
Modified: python/branches/release26-maint/Doc/library/sys.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/sys.rst (original)
+++ python/branches/release26-maint/Doc/library/sys.rst Wed Jan 14 01:00:17 2009
@@ -566,6 +566,10 @@
.. versionchanged:: 2.3
Unicode strings are no longer ignored.
+ .. seealso::
+ Module :mod:`site` This describes how to use .pth files to extend
+ :data:`sys.path`.
+
.. data:: platform
@@ -583,7 +587,6 @@
Windows ``'win32'``
Windows/Cygwin ``'cygwin'``
Mac OS X ``'darwin'``
- Mac OS 9 ``'mac'``
OS/2 ``'os2'``
OS/2 EMX ``'os2emx'``
RiscOS ``'riscos'``
@@ -869,10 +872,3 @@
first three characters of :const:`version`. It is provided in the :mod:`sys`
module for informational purposes; modifying this value has no effect on the
registry keys used by Python. Availability: Windows.
-
-
-.. seealso::
-
- Module :mod:`site`
- This describes how to use .pth files to extend ``sys.path``.
-
Modified: python/branches/release26-maint/Doc/using/cmdline.rst
==============================================================================
--- python/branches/release26-maint/Doc/using/cmdline.rst (original)
+++ python/branches/release26-maint/Doc/using/cmdline.rst Wed Jan 14 01:00:17 2009
@@ -356,7 +356,8 @@
.. cmdoption:: -3
- Warn about Python 3.x incompatibilities. Among these are:
+ Warn about Python 3.x incompatibilities which cannot be fixed trivially by
+ :ref:`2to3 <2to3-reference>`. Among these are:
* :meth:`dict.has_key`
* :func:`apply`
Modified: python/branches/release26-maint/Include/pyport.h
==============================================================================
--- python/branches/release26-maint/Include/pyport.h (original)
+++ python/branches/release26-maint/Include/pyport.h Wed Jan 14 01:00:17 2009
@@ -709,6 +709,15 @@
#define Py_FORMAT_PARSETUPLE(func,p1,p2)
#endif
+/*
+ * Specify alignment on compilers that support it.
+ */
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define Py_ALIGNED(x) __attribute__((aligned(x)))
+#else
+#define Py_ALIGNED(x)
+#endif
+
/* Eliminate end-of-loop code not reached warnings from SunPro C
* when using do{...}while(0) macros
*/
Modified: python/branches/release26-maint/Include/unicodeobject.h
==============================================================================
--- python/branches/release26-maint/Include/unicodeobject.h (original)
+++ python/branches/release26-maint/Include/unicodeobject.h Wed Jan 14 01:00:17 2009
@@ -130,6 +130,10 @@
typedef unsigned long Py_UCS4;
#endif
+/* Py_UNICODE is the native Unicode storage format (code unit) used by
+ Python and represents a single Unicode element in the Unicode
+ type. */
+
typedef PY_UNICODE_TYPE Py_UNICODE;
/* --- UCS-2/UCS-4 Name Mangling ------------------------------------------ */
@@ -350,12 +354,12 @@
#else
-/* Since splitting on whitespace is an important use case, and whitespace
- in most situations is solely ASCII whitespace, we optimize for the common
- case by using a quick look-up table with an inlined check.
- */
-PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[];
+/* Since splitting on whitespace is an important use case, and
+ whitespace in most situations is solely ASCII whitespace, we
+ optimize for the common case by using a quick look-up table
+ _Py_ascii_whitespace (see below) with an inlined check.
+ */
#define Py_UNICODE_ISSPACE(ch) \
((ch) < 128U ? _Py_ascii_whitespace[(ch)] : _PyUnicode_IsWhitespace(ch))
@@ -389,13 +393,14 @@
#define Py_UNICODE_COPY(target, source, length) \
Py_MEMCPY((target), (source), (length)*sizeof(Py_UNICODE))
-#define Py_UNICODE_FILL(target, value, length) do\
- {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\
+#define Py_UNICODE_FILL(target, value, length) \
+ do {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\
for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\
} while (0)
-/* check if substring matches at given offset. the offset must be
+/* Check if substring matches at given offset. the offset must be
valid, and the substring must not be empty */
+
#define Py_UNICODE_MATCH(string, offset, substring) \
((*((string)->str + (offset)) == *((substring)->str)) && \
((*((string)->str + (offset) + (substring)->length-1) == *((substring)->str + (substring)->length-1))) && \
@@ -405,8 +410,6 @@
extern "C" {
#endif
-PyAPI_FUNC(int) PyUnicode_ClearFreeList(void);
-
/* --- Unicode Type ------------------------------------------------------- */
typedef struct {
@@ -605,6 +608,17 @@
PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal);
+/* --- Free-list management ----------------------------------------------- */
+
+/* Clear the free list used by the Unicode implementation.
+
+ This can be used to release memory used for objects on the free
+ list back to the Python memory allocator.
+
+*/
+
+PyAPI_FUNC(int) PyUnicode_ClearFreeList(void);
+
/* === Builtin Codecs =====================================================
Many of these APIs take two arguments encoding and errors. These
@@ -1323,6 +1337,10 @@
/* === Characters Type APIs =============================================== */
+/* Helper array used by Py_UNICODE_ISSPACE(). */
+
+PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[];
+
/* These should not be used directly. Use the Py_UNICODE_IS* and
Py_UNICODE_TO* macros instead.
Modified: python/branches/release26-maint/Lib/ctypes/test/__init__.py
==============================================================================
--- python/branches/release26-maint/Lib/ctypes/test/__init__.py (original)
+++ python/branches/release26-maint/Lib/ctypes/test/__init__.py Wed Jan 14 01:00:17 2009
@@ -67,9 +67,6 @@
if verbosity > 1:
print >> sys.stderr, "Skipped %s: %s" % (modname, detail)
continue
- except Exception, detail:
- print >> sys.stderr, "Warning: could not import %s: %s" % (modname, detail)
- continue
for name in dir(mod):
if name.startswith("_"):
continue
Modified: python/branches/release26-maint/Lib/random.py
==============================================================================
--- python/branches/release26-maint/Lib/random.py (original)
+++ python/branches/release26-maint/Lib/random.py Wed Jan 14 01:00:17 2009
@@ -413,9 +413,11 @@
def expovariate(self, lambd):
"""Exponential distribution.
- lambd is 1.0 divided by the desired mean. (The parameter would be
- called "lambda", but that is a reserved word in Python.) Returned
- values range from 0 to positive infinity.
+ lambd is 1.0 divided by the desired mean. It should be
+ nonzero. (The parameter would be called "lambda", but that is
+ a reserved word in Python.) Returned values range from 0 to
+ positive infinity if lambd is positive, and from negative
+ infinity to 0 if lambd is negative.
"""
# lambd: rate lambd = 1/mean
Modified: python/branches/release26-maint/Lib/test/test_decimal.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_decimal.py (original)
+++ python/branches/release26-maint/Lib/test/test_decimal.py Wed Jan 14 01:00:17 2009
@@ -168,7 +168,6 @@
-context.Emin > DEC_MAX_MATH):
return True
if not v._is_special and v and (
- len(v._int) > DEC_MAX_MATH or
v.adjusted() > DEC_MAX_MATH or
v.adjusted() < 1-2*DEC_MAX_MATH):
return True
Modified: python/branches/release26-maint/Lib/test/test_import.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_import.py (original)
+++ python/branches/release26-maint/Lib/test/test_import.py Wed Jan 14 01:00:17 2009
@@ -269,7 +269,7 @@
if os.path.exists(file_name):
os.remove(file_name)
if os.path.exists(self.dir_name):
- os.rmdir(self.dir_name)
+ shutil.rmtree(self.dir_name)
def import_module(self):
ns = globals()
Modified: python/branches/release26-maint/Misc/python.man
==============================================================================
--- python/branches/release26-maint/Misc/python.man (original)
+++ python/branches/release26-maint/Misc/python.man Wed Jan 14 01:00:17 2009
@@ -54,6 +54,9 @@
[
.B \-x
]
+[
+.B \-3
+]
.br
[
.B \-c
@@ -236,6 +239,9 @@
Skip the first line of the source. This is intended for a DOS
specific hack only. Warning: the line numbers in error messages will
be off by one!
+.TP
+.B \-3
+Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix.
.SH INTERPRETER INTERFACE
The interpreter interface resembles that of the UNIX shell: when
called with standard input connected to a tty device, it prompts for
Modified: python/branches/release26-maint/Modules/main.c
==============================================================================
--- python/branches/release26-maint/Modules/main.c (original)
+++ python/branches/release26-maint/Modules/main.c Wed Jan 14 01:00:17 2009
@@ -86,7 +86,7 @@
-x : skip first line of source, allowing use of non-Unix forms of #!cmd\n\
";
static char *usage_4 = "\
--3 : warn about Python 3.x incompatibilities\n\
+-3 : warn about Python 3.x incompatibilities that 2to3 cannot trivially fix\n\
file : program read from script file\n\
- : program read from stdin (default; interactive mode if a tty)\n\
arg ...: arguments passed to program in sys.argv[1:]\n\n\
Modified: python/branches/release26-maint/Modules/socketmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/socketmodule.c (original)
+++ python/branches/release26-maint/Modules/socketmodule.c Wed Jan 14 01:00:17 2009
@@ -3334,7 +3334,11 @@
#ifdef HAVE_GETHOSTBYNAME_R_3_ARG
struct hostent_data data;
#else
- char buf[16384];
+ /* glibcs up to 2.10 assume that the buf argument to
+ gethostbyaddr_r is 8-byte aligned, which at least llvm-gcc
+ does not ensure. The attribute below instructs the compiler
+ to maintain this alignment. */
+ char buf[16384] Py_ALIGNED(8);
int buf_len = (sizeof buf) - 1;
int errnop;
#endif
Modified: python/branches/release26-maint/Python/import.c
==============================================================================
--- python/branches/release26-maint/Python/import.c (original)
+++ python/branches/release26-maint/Python/import.c Wed Jan 14 01:00:17 2009
@@ -3199,24 +3199,11 @@
return -1;
} else {
#ifndef RISCOS
+#ifndef MS_WINDOWS
struct stat statbuf;
int rv;
rv = stat(path, &statbuf);
-#ifdef MS_WINDOWS
- /* MS Windows stat() chokes on paths like C:\path\. Try to
- * recover *one* time by stripping off a trailing slash or
- * backslash. http://bugs.python.org/issue1293
- */
- if (rv != 0 && pathlen <= MAXPATHLEN &&
- (path[pathlen-1] == '/' || path[pathlen-1] == '\\')) {
- char mangled[MAXPATHLEN+1];
-
- strcpy(mangled, path);
- mangled[pathlen-1] = '\0';
- rv = stat(mangled, &statbuf);
- }
-#endif
if (rv == 0) {
/* it exists */
if (S_ISDIR(statbuf.st_mode)) {
@@ -3226,7 +3213,24 @@
return -1;
}
}
-#else
+#else /* MS_WINDOWS */
+ DWORD rv;
+ /* see issue1293 and issue3677:
+ * stat() on Windows doesn't recognise paths like
+ * "e:\\shared\\" and "\\\\whiterab-c2znlh\\shared" as dirs.
+ */
+ rv = GetFileAttributesA(path);
+ if (rv != INVALID_FILE_ATTRIBUTES) {
+ /* it exists */
+ if (rv & FILE_ATTRIBUTE_DIRECTORY) {
+ /* it's a directory */
+ PyErr_SetString(PyExc_ImportError,
+ "existing directory");
+ return -1;
+ }
+ }
+#endif
+#else /* RISCOS */
if (object_exists(path)) {
/* it exists */
if (isdir(path)) {
Modified: python/branches/release26-maint/Tools/scripts/patchcheck.py
==============================================================================
--- python/branches/release26-maint/Tools/scripts/patchcheck.py (original)
+++ python/branches/release26-maint/Tools/scripts/patchcheck.py Wed Jan 14 01:00:17 2009
@@ -62,12 +62,12 @@
@status("Misc/ACKS updated", modal=True)
def credit_given(file_paths):
"""Check if Misc/ACKS has been changed."""
- return True if 'Misc/ACKS' in file_paths else False
+ return 'Misc/ACKS' in file_paths
@status("Misc/NEWS updated", modal=True)
def reported_news(file_paths):
"""Check if Misc/NEWS has been changed."""
- return True if 'Misc/NEWS' in file_paths else False
+ return 'Misc/NEWS' in file_paths
def main():
Modified: python/branches/release26-maint/configure.in
==============================================================================
--- python/branches/release26-maint/configure.in (original)
+++ python/branches/release26-maint/configure.in Wed Jan 14 01:00:17 2009
@@ -407,7 +407,7 @@
AC_HELP_STRING(--without-gcc,never use gcc),
[
case $withval in
- no) CC=cc
+ no) CC=${CC:-cc}
without_gcc=yes;;
yes) CC=gcc
without_gcc=no;;
More information about the Python-checkins
mailing list