[Python-checkins] cpython (merge default -> default): merge heads

Mon Jul 18 05:45:17 CEST 2011

http://hg.python.org/cpython/rev/7520f1bf0a81
changeset: 71403:7520f1bf0a81
parent: 71402:d30b54ffd5e8
parent: 71401:eaefb34fc3a1
user: Benjamin Peterson <benjamin at python.org>
date: Sun Jul 17 22:50:12 2011 -0500
summary:
 merge heads
files:
 Doc/library/urllib.request.rst | 14 +++++++++++++-
 Doc/library/warnings.rst | 3 +--
 Lib/test/test_itertools.py | 21 +++++++++++++++------
 Lib/test/test_warnings.py | 14 ++++++++------
 Misc/NEWS | 2 ++
 Python/_warnings.c | 4 ++--
 6 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -323,6 +323,11 @@
 A catch-all class to handle unknown URLs.
 
 
+.. class:: HTTPErrorProcessor()
+
+ Process HTTP error responses.
+
+
 .. _request-objects:
 
 Request Objects
@@ -926,7 +931,7 @@
 HTTPErrorProcessor Objects
 --------------------------
 
-.. method:: HTTPErrorProcessor.unknown_open()
+.. method:: HTTPErrorProcessor.http_response()
 
 Process HTTP error responses.
 
@@ -938,6 +943,13 @@
 :exc:`HTTPError` if no other handler handles the error.
 
 
+.. method:: HTTPErrorProcessor.https_response()
+
+ Process HTTPS error responses.
+
+ The behavior is same as :meth:`http_response`.
+
+
 .. _urllib-request-examples:
 
 Examples
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -339,8 +339,7 @@
 Write a warning to a file. The default implementation calls
 ``formatwarning(message, category, filename, lineno, line)`` and writes the
 resulting string to *file*, which defaults to ``sys.stderr``. You may replace
- this function with an alternative implementation by assigning to
- ``warnings.showwarning``.
+ this function with any callable by assigning to ``warnings.showwarning``.
 *line* is a line of source code to be included in the warning
 message; if *line* is not supplied, :func:`showwarning` will
 try to read the line specified by *filename* and *lineno*.
diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -168,7 +168,8 @@
 self.assertEqual(result, list(combinations2(values, r))) # matches second pure python version
 self.assertEqual(result, list(combinations3(values, r))) # matches second pure python version
 
- # Test implementation detail: tuple re-use
+ @support.impl_detail("tuple reuse is specific to CPython")
+ def test_combinations_tuple_reuse(self):
 self.assertEqual(len(set(map(id, combinations('abcde', 3)))), 1)
 self.assertNotEqual(len(set(map(id, list(combinations('abcde', 3))))), 1)
 
@@ -238,7 +239,9 @@
 self.assertEqual(result, list(cwr1(values, r))) # matches first pure python version
 self.assertEqual(result, list(cwr2(values, r))) # matches second pure python version
 
- # Test implementation detail: tuple re-use
+ @support.impl_detail("tuple reuse is specific to CPython")
+ def test_combinations_with_replacement_tuple_reuse(self):
+ cwr = combinations_with_replacement
 self.assertEqual(len(set(map(id, cwr('abcde', 3)))), 1)
 self.assertNotEqual(len(set(map(id, list(cwr('abcde', 3))))), 1)
 
@@ -302,7 +305,8 @@
 self.assertEqual(result, list(permutations(values, None))) # test r as None
 self.assertEqual(result, list(permutations(values))) # test default r
 
- # Test implementation detail: tuple re-use
+ @support.impl_detail("tuple resuse is CPython specific")
+ def test_permutations_tuple_reuse(self):
 self.assertEqual(len(set(map(id, permutations('abcde', 3)))), 1)
 self.assertNotEqual(len(set(map(id, list(permutations('abcde', 3))))), 1)
 
@@ -566,11 +570,13 @@
 self.assertEqual(list(zip()), lzip())
 self.assertRaises(TypeError, zip, 3)
 self.assertRaises(TypeError, zip, range(3), 3)
- # Check tuple re-use (implementation detail)
 self.assertEqual([tuple(list(pair)) for pair in zip('abc', 'def')],
 lzip('abc', 'def'))
 self.assertEqual([pair for pair in zip('abc', 'def')],
 lzip('abc', 'def'))
+
+ @support.impl_detail("tuple reuse is specific to CPython")
+ def test_zip_tuple_reuse(self):
 ids = list(map(id, zip('abc', 'def')))
 self.assertEqual(min(ids), max(ids))
 ids = list(map(id, list(zip('abc', 'def'))))
@@ -613,11 +619,13 @@
 else:
 self.fail('Did not raise Type in: ' + stmt)
 
- # Check tuple re-use (implementation detail)
 self.assertEqual([tuple(list(pair)) for pair in zip_longest('abc', 'def')],
 list(zip('abc', 'def')))
 self.assertEqual([pair for pair in zip_longest('abc', 'def')],
 list(zip('abc', 'def')))
+
+ @support.impl_detail("tuple reuse is specific to CPython")
+ def test_zip_longest_tuple_reuse(self):
 ids = list(map(id, zip_longest('abc', 'def')))
 self.assertEqual(min(ids), max(ids))
 ids = list(map(id, list(zip_longest('abc', 'def'))))
@@ -721,7 +729,8 @@
 args = map(iter, args)
 self.assertEqual(len(list(product(*args))), expected_len)
 
- # Test implementation detail: tuple re-use
+ @support.impl_detail("tuple reuse is specific to CPython")
+ def test_product_tuple_reuse(self):
 self.assertEqual(len(set(map(id, product('abc', 'def')))), 1)
 self.assertNotEqual(len(set(map(id, list(product('abc', 'def'))))), 1)
 
diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -512,12 +512,11 @@
 def test_showwarning_not_callable(self):
 with original_warnings.catch_warnings(module=self.module):
 self.module.filterwarnings("always", category=UserWarning)
- old_showwarning = self.module.showwarning
+ self.module.showwarning = print
+ with support.captured_output('stdout'):
+ self.module.warn('Warning!')
 self.module.showwarning = 23
- try:
- self.assertRaises(TypeError, self.module.warn, "Warning!")
- finally:
- self.module.showwarning = old_showwarning
+ self.assertRaises(TypeError, self.module.warn, "Warning!")
 
 def test_show_warning_output(self):
 # With showarning() missing, make sure that output is okay.
@@ -547,10 +546,13 @@
 globals_dict = globals()
 oldfile = globals_dict['__file__']
 try:
- with original_warnings.catch_warnings(module=self.module) as w:
+ catch = original_warnings.catch_warnings(record=True,
+ module=self.module)
+ with catch as w:
 self.module.filterwarnings("always", category=UserWarning)
 globals_dict['__file__'] = None
 original_warnings.warn('test', UserWarning)
+ self.assertTrue(len(w))
 finally:
 globals_dict['__file__'] = oldfile
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #10271: Allow warnings.showwarning() be any callable.
+
 - Issue #11627: Fix segfault when __new__ on a exception returns a non-exception
 class.
 
diff --git a/Python/_warnings.c b/Python/_warnings.c
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -409,10 +409,10 @@
 else {
 PyObject *res;
 
- if (!PyMethod_Check(show_fxn) && !PyFunction_Check(show_fxn)) {
+ if (!PyCallable_Check(show_fxn)) {
 PyErr_SetString(PyExc_TypeError,
 "warnings.showwarning() must be set to a "
- "function or method");
+ "callable");
 Py_DECREF(show_fxn);
 goto cleanup;
 }
-- 
Repository URL: http://hg.python.org/cpython
