mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3.2

This commit is contained in:
Éric Araujo 2012-02-26 04:07:37 +01:00
parent dfac6cc3e9 f527277b67
commit 408026c7e8
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/logging.rst
View File

@ -1112,7 +1112,7 @@ with the :mod:`warnings` module.
If *capture* is ``True``, warnings issued by the :mod:`warnings` module will If *capture* is ``True``, warnings issued by the :mod:`warnings` module will
be redirected to the logging system. Specifically, a warning will be be redirected to the logging system. Specifically, a warning will be
formatted using :func:`warnings.formatwarning` and the resulting string formatted using :func:`warnings.formatwarning` and the resulting string
logged to a logger named ``'py.warnings'`` with a severity of ``'WARNING'``. logged to a logger named ``'py.warnings'`` with a severity of :const:`WARNING`.
If *capture* is ``False``, the redirection of warnings to the logging system If *capture* is ``False``, the redirection of warnings to the logging system
will stop, and warnings will be redirected to their original destinations will stop, and warnings will be redirected to their original destinations

3
Lib/distutils/tests/test_sdist.py
View File

@ -6,6 +6,7 @@
import zipfile import zipfile
from os.path import join from os.path import join
from textwrap import dedent from textwrap import dedent
from test.support import captured_stdout, check_warnings, run_unittest
try: try:
import zlib import zlib
@ -13,7 +14,6 @@
except ImportError: except ImportError:
ZLIB_SUPPORT = False ZLIB_SUPPORT = False
from test.support import captured_stdout, check_warnings, run_unittest
from distutils.command.sdist import sdist, show_formats from distutils.command.sdist import sdist, show_formats
from distutils.core import Distribution from distutils.core import Distribution
@ -326,6 +326,7 @@ def test_get_file_list(self):
# filling data_files by pointing files in package_data # filling data_files by pointing files in package_data
dist.package_data = {'somecode': ['*.txt']} dist.package_data = {'somecode': ['*.txt']}
self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#') self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#')
cmd.formats = ['gztar']
cmd.ensure_finalized() cmd.ensure_finalized()
cmd.run() cmd.run()

2
Modules/_io/_iomodule.c
View File

@ -59,7 +59,7 @@ PyDoc_STRVAR(module_doc,
"\n" "\n"
"At the top of the I/O hierarchy is the abstract base class IOBase. It\n" "At the top of the I/O hierarchy is the abstract base class IOBase. It\n"
"defines the basic interface to a stream. Note, however, that there is no\n" "defines the basic interface to a stream. Note, however, that there is no\n"
"seperation between reading and writing to streams; implementations are\n" "separation between reading and writing to streams; implementations are\n"
"allowed to throw an IOError if they do not support a given operation.\n" "allowed to throw an IOError if they do not support a given operation.\n"
"\n" "\n"
"Extending IOBase is RawIOBase which deals simply with the reading and\n" "Extending IOBase is RawIOBase which deals simply with the reading and\n"

2
Modules/_io/textio.c
View File

@ -641,7 +641,7 @@ PyDoc_STRVAR(textiowrapper_doc,
"enabled. With this enabled, on input, the lines endings '\\n', '\\r',\n" "enabled. With this enabled, on input, the lines endings '\\n', '\\r',\n"
"or '\\r\\n' are translated to '\\n' before being returned to the\n" "or '\\r\\n' are translated to '\\n' before being returned to the\n"
"caller. Conversely, on output, '\\n' is translated to the system\n" "caller. Conversely, on output, '\\n' is translated to the system\n"
"default line seperator, os.linesep. If newline is any other of its\n" "default line separator, os.linesep. If newline is any other of its\n"
"legal values, that newline becomes the newline when the file is read\n" "legal values, that newline becomes the newline when the file is read\n"
"and it is returned untranslated. On output, '\\n' is converted to the\n" "and it is returned untranslated. On output, '\\n' is converted to the\n"
"newline.\n" "newline.\n"