Commit Graph

17954 Commits

Author SHA1 Message Date
Serhiy Storchaka 91b3e77a6a Issue #19604: Use specific asserts in array tests. 2013-11-17 00:45:17 +02:00
Ezio Melotti 745d54d2fa #17806: Added keyword-argument support for "tabsize" to str/bytes.expandtabs(). 2013-11-16 19:10:57 +02:00
Serhiy Storchaka 452bab4acf Issue #16685: Added support for writing any bytes-like objects in the aifc,
sunau, and wave modules.
2013-11-16 14:01:31 +02:00
Serhiy Storchaka 7714ebbe0e Issue #5202: Added support for unseekable files in the wave module. 2013-11-16 13:04:00 +02:00
Serhiy Storchaka a7a34a83f3 Issue #19590: Use specific asserts in email tests. 2013-11-16 12:56:54 +02:00
Serhiy Storchaka 328cf3cbdf Issue #19590: Use specific asserts in email tests. 2013-11-16 12:56:23 +02:00
Guido van Rossum 2335de7a20 asyncio: Replace connection_refused() with error_received(). 2013-11-15 16:51:48 -08:00
Jason R. Coombs 6f87a08aa7 Update more usage of assertEqual 2013-11-15 19:41:57 -05:00
Tim Golden 6e51b8ff0f Issue13674 Correct crash with strftime %y format under Windows 2013-11-12 12:36:54 +00:00
Zachary Ware c12f09ed24 Issue #19440: Clean up test_capi 2013-11-11 22:47:04 -06:00
Guido van Rossum 39ecf2ed13 asyncio: Longer timeout in Windows test_popen. Fixes issue 19598. 2013-11-15 07:41:10 -08:00
Nick Coghlan 4e553e2e52 Avoid triggering the refleak detector 2013-11-16 00:35:34 +10:00
Nick Coghlan c4c2580d43 Close 19609: narrow scope of codec exc chaining 2013-11-15 21:47:37 +10:00
Guido van Rossum 91d2c5674a asyncio: Refactor waitpid mocks. Patch by Anthony Baire. 2013-11-14 16:16:29 -08:00
Serhiy Storchaka e048addedc Issue #19589: Use specific asserts in asyncio tests. 2013-11-14 23:10:51 +02:00
Guido van Rossum f38f7f3c7b asyncio: Avoid ResourceWarning. Fix issue 19580 by Vajrasky Kok. 2013-11-14 10:06:18 -08:00
Guido van Rossum 8ff3e8af72 asyncio: Relax timing requirement. Fixes issue 19579. 2013-11-13 20:17:52 -08:00
Guido van Rossum 2bcae708d8 asyncio: Fix from Anthony Baire for CPython issue 19566 (replaces earlier fix). 2013-11-13 15:50:08 -08:00
Ethan Furman be3c2fea35 removed Enum.__eq__ as it added nothing 2013-11-13 14:25:45 -08:00
Nick Coghlan 8b097b4ed7 Close #17828: better handling of codec errors
- output type errors now redirect users to the type-neutral
  convenience functions in the codecs module
- stateless errors that occur during encoding and decoding
  will now be automatically wrapped in exceptions that give
  the name of the codec involved
2013-11-13 23:49:21 +10:00
Nick Coghlan d3e83e2a3e Avoid global side effect in test_ensurepip 2013-11-13 22:24:58 +10:00
Nick Coghlan ca351e6bc5 Fix test_socket for repr update 2013-11-13 22:10:16 +10:00
Giampaolo Rodola' 1bfa7ed3b0 test.support: considering the module is a mix of utilities unrelated with each other divide __all__ in sub-sections so that it can be used as a quick-reference doc 2013-11-12 23:08:27 +01:00
Victor Stinner 45956b9a33 Close #19466: Clear the frames of daemon threads earlier during the Python
shutdown to call objects destructors. So "unclosed file" resource warnings are
now corretly emitted for daemon threads.
2013-11-12 16:37:55 +01:00
Tim Golden d9182e64cb Remove mis-merged artefact 2013-11-12 12:51:37 +00:00
Tim Golden bbe268f583 Issue13674 Correct crash with strftime %y format under Windows 2013-11-12 12:48:20 +00:00
Zachary Ware dfcd694674 Issue #19440: Clean up test_capi 2013-11-11 22:59:23 -06:00
Andrew Kuchling 785918250f Closes #6683: add a test that exercises multiple authentication.
The SMTP server advertises four different authentication methods, and
the code will try CRAM-MD5 first, which will fail, but LOGIN succeeds.
2013-11-11 14:03:23 -05:00
Nick Coghlan d0cf0635b3 Close #19406: Initial implementation of ensurepip
Patch by Donald Stufft and Nick Coghlan
2013-11-11 22:11:55 +10:00
Kristjan Valur Jonsson 020af2a2bc Issue #8799: Reduce timing sensitivity of condition test by explicitly
delaying the main thread so that it doesn't race ahead of the workers.
2013-11-11 11:29:04 +00:00
Serhiy Storchaka 711e91b283 Issue #16685: Added support for any bytes-like objects in the audioop module.
Removed support for strings.
2013-11-10 21:44:36 +02:00
Serhiy Storchaka 74af9d3cc4 Merge heads 2013-11-10 21:05:38 +02:00
Serhiy Storchaka 81895f8ee3 Issue #19261: Added support for writing 24-bit samples in the sunau module. 2013-11-10 21:02:53 +02:00
Jason R. Coombs 72cd8b9eda Merge 2013-11-10 14:02:40 -05:00
Jason R. Coombs 6bdc498734 Normalize whitespace 2013-11-10 14:02:04 -05:00
Andrew Kuchling ad8156e9b2 #1097797: Add CP273 codec, and exercise it in the test suite 2013-11-10 13:44:30 -05:00
Serhiy Storchaka 29828a6fa9 Issue #1575020: Fixed support of 24-bit wave files on big-endian platforms. 2013-11-09 23:15:52 +02:00
Serhiy Storchaka a44372fd0b Issue #1575020: Fixed support of 24-bit wave files on big-endian platforms. 2013-11-09 23:12:06 +02:00
Brett Cannon 9e5aba29e2 remove dead import 2013-11-08 14:27:42 -05:00
Brett Cannon 9ea8eda127 Issue #16803: test.test_importlib.source now tests frozen and source code 2013-11-08 14:25:37 -05:00
Charles-François Natali 3a4586a9f9 Issue #18923: Update subprocess to use the new selectors module. 2013-11-08 19:56:59 +01:00
Brett Cannon 2ce6c44ae4 Simplify test.test_importlib.__main__ 2013-11-08 13:35:34 -05:00
Brett Cannon 330f71b617 Issue #16803: test.test_importlib.import_ now tests frozen and source code 2013-11-08 13:34:59 -05:00
Brett Cannon a3c6963467 Issue #16803: test.test_importlib.frozen now runs both frozen and source code 2013-11-08 11:10:41 -05:00
Guido van Rossum d0293596b8 Remove redundant test_selectors.py from test_asyncio. 2013-11-07 09:25:36 -08:00
Ezio Melotti a5b9599538 #17080: improve error message of float/complex when the wrong type is passed. 2013-11-07 19:18:34 +02:00
Guido van Rossum d0786a1a50 Optimize BaseSelector.modify(). Patch by Arnaud Faure. 2013-11-07 08:39:28 -08:00
Ezio Melotti b7038817fe #19480: merge with 3.3. 2013-11-07 18:35:27 +02:00
Ezio Melotti 7165d8b9ba #19480: HTMLParser now accepts all valid start-tag names as defined by the HTML5 standard. 2013-11-07 18:33:24 +02:00
Guido van Rossum 0b69fbc642 asyncio: Add close() back to Unix selector event loop, to remove all signal handlers. Should fix buildbot issues. 2013-11-06 20:25:50 -08:00
Nick Coghlan 95887b7e5b Remove incorrect comment from dis tests 2013-11-06 22:17:39 +10:00
Nick Coghlan 90b8e7d2bc Close #19378: address flaws in the new dis module APIs
- confusing line_offset parameter -> first_line parameter
- systematically test and fix new file parameter
- remove redundant Bytecode.show_info() API
- rename Bytecode.display_code() to Bytecode.dis() and have it
  return the multi-line string rather than printing it directly
- eliminated some not-so-helpful helpers from the bytecode_helper
  test support module

Also fixed a longstanding defect (worked around in the test suite)
where lines emitted by the dis module could include trailing white
space. That no longer happens, allowing the formatting tests to be
simplified to use plain string comparisons.
2013-11-06 22:08:36 +10:00
Terry Jan Reedy c1bd2fef8b Merge with 3.3 2013-11-04 21:44:17 -05:00
Terry Jan Reedy 5c81164077 Issue #19397: test_pydoc now works with -S (help not added to builtins).
Patch by Serhiy Storchaka and Vajrasky Kok.
2013-11-04 21:43:26 -05:00
Guido van Rossum 0eaa5ac9b5 asyncio: Refactor SIGCHLD handling. By Anthony Baire. 2013-11-04 15:50:46 -08:00
Guido van Rossum ccea08462b asyncio: Locks improvements by Arnaud Faure: better repr(), change Conditio\
n structure.
2013-11-04 13:18:19 -08:00
Serhiy Storchaka 43767638a9 Issue #18702: All skipped tests now reported as skipped. 2013-11-03 21:31:38 +02:00
Serhiy Storchaka 7908068627 Issue #18702: All skipped tests now reported as skipped. 2013-11-03 21:31:18 +02:00
Tim Golden ab7211f278 Issue #10197 Rework subprocess.get[status]output to use subprocess functionality and thus to work on Windows. Patch by Nick Coghlan. 2013-11-03 12:55:51 +00:00
Tim Golden e004175c56 Issue #10197 Rework subprocess.get[status]output to use subprocess functionality and thus to work on Windows. Patch by Nick Coghlan. 2013-11-03 12:53:17 +00:00
Nick Coghlan 8e113b418d Close #19403: make contextlib.redirect_stdout reentrant 2013-11-03 17:00:51 +10:00
Nick Coghlan 4e641df09b Close #19439: execute embedding tests on Windows
Patch by Zachary Ware
2013-11-03 16:54:46 +10:00
Nick Coghlan f4cb48a72b Issue #4331: Added functools.partialmethod
Initial patch by Alon Horev
2013-11-03 16:41:46 +10:00
Richard Oudkerk af630c5885 Merge. 2013-11-02 16:47:08 +00:00
Richard Oudkerk b8ec1e35a9 Relax timeout test. 2013-11-02 16:46:32 +00:00
Richard Oudkerk 2902b6d17a Relax test for process return code on Windows. 2013-11-02 16:38:58 +00:00
Ezio Melotti 1943c8a112 Merge test_htmlparser changes from 3.3. 2013-11-02 17:50:02 +02:00
Ezio Melotti 5028f4d461 Use unittest.main() in test_htmlparser. 2013-11-02 17:49:08 +02:00
Ezio Melotti 88ebfb129b #15114: The html.parser module now raises a DeprecationWarning when the strict argument of HTMLParser or the HTMLParser.error method are used. 2013-11-02 17:08:24 +02:00
Guido van Rossum 05c511f1ca asyncio: Slight rearrangement of tests for server_hostname=... 2013-11-01 14:24:28 -07:00
Guido van Rossum 28dff0d823 asyncio: Better-looking errors when ssl module cannot be imported. In part by Arnaud Faure. 2013-11-01 14:22:30 -07:00
Guido van Rossum a8d630a6e6 asyncio: Various style nits. 2013-11-01 14:20:55 -07:00
Guido van Rossum e3f52ef067 asyncio: Document EventLoop.close(). 2013-11-01 14:19:04 -07:00
Guido van Rossum 2b57016458 asyncio: Refactor ssl transport ready loop (Nikolay Kim). 2013-11-01 14:18:02 -07:00
Guido van Rossum 21c85a7124 asyncio: Add server_hostname as create_connection() argument, with secure default. 2013-11-01 14:16:54 -07:00
Guido van Rossum 3317a13253 asyncio: Pause accepting whenever accept() returns certain errors. Fixes asyncio issue #78. 2013-11-01 14:12:50 -07:00
Eric Snow 4ae17f50ed Issue #19413: Disregard duplicate namespace portions during reload tests. 2013-10-31 23:44:31 -06:00
Eric Snow cdf601281f Issue #19413: Restore pre-3.3 reload() semantics of re-finding modules. 2013-10-31 22:22:15 -06:00
Guido van Rossum 5969128a86 asyncio: Add support for running subprocesses on Windows with the IOCP event loop (Richard Oudkerk). 2013-10-30 14:52:03 -07:00
Guido van Rossum 90fb914b4b asyncio: Make the IOCP proactor support "waitable" handles (Richard Oudkerk). 2013-10-30 14:44:05 -07:00
Charles-François Natali 4574b49703 Issue #19172: Add a get_map() method to selectors. 2013-10-30 20:31:04 +01:00
Benjamin Peterson c99874da83 merge 3.3 (#19435) 2013-10-30 12:51:16 -04:00
Benjamin Peterson a50f89954d merge 3.2 (#19435) 2013-10-30 12:50:18 -04:00
Benjamin Peterson 35aca89617 merge 3.1 (#19435) 2013-10-30 12:48:59 -04:00
Benjamin Peterson 04e9de40f3 use the collapsed path in the run_cgi method (closes #19435) 2013-10-30 12:43:09 -04:00
Victor Stinner c0e07a3ea0 Issue #19424: Fix test_warnings for locale encoding unable to encode
"\xe9\u20ac" characters
2013-10-29 23:58:05 +01:00
Victor Stinner a4c704b260 Issue #19424: Fix the warnings module to accept filename containing surrogate
characters.
2013-10-29 23:43:41 +01:00
Richard Oudkerk e90cedb711 Issue #19425 -- a pickling error should not cause pool to hang. 2013-10-28 23:11:58 +00:00
Richard Oudkerk 33aaa73cad Merge. 2013-10-28 23:23:04 +00:00
Nadeem Vawda e6514f533e #19395: Raise exception when pickling a (BZ2|LZMA)(Compressor|Decompressor).
The underlying C libraries provide no mechanism for serializing compressor and
decompressor objects, so actually pickling these classes is impractical.
Previously, these objects would be pickled without error, but attempting to use
a deserialized instance would segfault the interpreter.
2013-10-28 21:41:24 +01:00
Nadeem Vawda 3797065ac5 #19395: Raise exception when pickling a (BZ2|LZMA)(Compressor|Decompressor).
The underlying C libraries provide no mechanism for serializing compressor and
decompressor objects, so actually pickling these classes is impractical.
Previously, these objects would be pickled without error, but attempting to use
a deserialized instance would segfault the interpreter.
2013-10-28 21:35:23 +01:00
Victor Stinner d1b48998e5 Issue #19421: add an unit test for warnings.warn() during finalization 2013-10-28 19:16:21 +01:00
Serhiy Storchaka 8797dcd9d5 Fixed merge test for Tcl/Tk <8.5 (issue #18964). 2013-10-27 12:38:01 +02:00
Georg Brandl 78abc9dcc2 Skip overzealous test for existence of the online license.html for pre-release versions. 2013-10-27 09:41:57 +01:00
Georg Brandl bf3f8eb960 Issue #16037: HTTPMessage.readheaders() raises an HTTPException when more than
100 headers are read.  Adapted from patch by Jyrki Pulliainen.
2013-10-27 07:34:48 +01:00
Georg Brandl 28e78414f9 Issue #16040: CVE-2013-1752: nntplib: Limit maximum line lengths to 2048 to
prevent readline() calls from consuming too much memory.  Patch by Jyrki
Pulliainen.
2013-10-27 07:29:47 +01:00
Georg Brandl 7e27abbb39 Issue #16041: CVE-2013-1752: poplib: Limit maximum line lengths to 2048 to
prevent readline() calls from consuming too much memory.  Patch by Jyrki
Pulliainen.
2013-10-27 07:23:53 +01:00
Georg Brandl 72c98d3a76 Issue #17997: Change behavior of ``ssl.match_hostname()`` to follow RFC 6125,
for security reasons.  It now doesn't match multiple wildcards nor wildcards
inside IDN fragments.
2013-10-27 07:16:53 +01:00
Georg Brandl ca580f4ec1 Issue #16039: CVE-2013-1752: Change use of readline in imaplib module to limit
line length.  Patch by Emil Lind.
2013-10-27 06:52:14 +01:00
Tim Golden 6d09f09d8b Issue14255 Don't flatten case of tempdir 2013-10-25 18:38:16 +01:00
Georg Brandl 186729e812 merge with 3.3 2013-10-27 09:54:53 +01:00
Georg Brandl b89b5df9c9 merge with 3.3 2013-10-27 07:46:09 +01:00
Nick Coghlan 624a74e4b7 Mitigate #19412: restore test skips for --without-doc-strings 2013-10-27 14:19:12 +10:00
Nick Coghlan 561eb5cbe4 Issue #19330: Handle the no-docstrings case in tests 2013-10-26 22:20:43 +10:00
Nick Coghlan 059def58a5 Close #19330 by using public classes in contextlib
- added test cases to ensure docstrings are reasonable
- also updates various comments in contextlib for accuracy
- identifed #19404 as an issue making it difficult to provide
  good help output on generator based context manager instances
2013-10-26 18:08:15 +10:00
Serhiy Storchaka 9eabac68a3 Issue #18685: Restore re performance to pre-PEP 393 levels. 2013-10-26 10:45:48 +03:00
Nick Coghlan 0ddaed3456 Close #19396: make test_contextlib tolerate -S 2013-10-26 16:37:47 +10:00
Tim Golden 1cc3540669 Correct whitespace in test_os 2013-10-25 21:26:06 +01:00
Tim Golden 781bbebacb Issue13234 Allow listdir to handle extended paths on Windows (Patch by Santoso Wijaya) 2013-10-25 20:24:06 +01:00
Brett Cannon 502834cf3c merge 2013-10-25 15:45:42 -04:00
Brett Cannon a20800d1d9 test_resource should not assume all attributes are available when they
are individually controlled by #ifdef statements in the extension
code.
2013-10-25 15:45:25 -04:00
Brett Cannon e38b0544c4 Issue #16803: Move test.test_importlib.extension to use both frozen and source importlib code 2013-10-25 15:39:02 -04:00
Antoine Pitrou 79aa68dfc1 Issue #19387: explain and test the sre overlap table 2013-10-25 21:36:10 +02:00
Brett Cannon ffd33c290b Issue #16803: Have test.test_importlib.builtin test both frozen and
source importlib.
2013-10-25 12:44:36 -04:00
Brett Cannon b3d6afff2b Issue #16803: Stop having test.test_importlib.abc ABCs inherit from
unittest.TestCase in prep of running tests under frozen and source
importlib.
2013-10-25 12:33:59 -04:00
Charles-François Natali c60dd5b0d4 test_selectors: make timeout-related errors report the actual elapsed timeout. 2013-10-25 17:56:00 +02:00
Charles-François Natali 052058fa14 test_selectors: rename test_interrupted_retry() (since it doesn't actually
retry on EINTR).
2013-10-25 17:49:47 +02:00
Christian Heimes 349b04e902 Issue 19384: Fix test_py_compile for root user, patch by Claudiu Popa. 2013-10-25 09:21:51 +02:00
Christian Heimes c4a4b346a6 Issue #16595: prlimit() needs Linux kernel 2.6.36+ 2013-10-25 08:31:19 +02:00
Serhiy Storchaka 4f056d43d6 Issue #19288: Fixed the "in" operator of dbm.gnu databases for string
argument.  Original patch by Arfrever Frehtes Taifersar Arahesis.
2013-10-25 00:08:13 +03:00
Serhiy Storchaka 7d6392c517 Issue #19288: Fixed the "in" operator of dbm.gnu databases for string
argument.  Original patch by Arfrever Frehtes Taifersar Arahesis.
2013-10-25 00:06:52 +03:00
Serhiy Storchaka 124a0b314b Issue #19287: Fixed the "in" operator of dbm.ndbm databases for string
argument.  Original patch by Arfrever Frehtes Taifersar Arahesis.
2013-10-25 00:01:25 +03:00
Serhiy Storchaka 9da33ab193 Issue #19287: Fixed the "in" operator of dbm.ndbm databases for string
argument.  Original patch by Arfrever Frehtes Taifersar Arahesis.
2013-10-24 23:59:28 +03:00
Serhiy Storchaka 8b150ecfc9 Issue #19327: Fixed the working of regular expressions with too big charset. 2013-10-24 22:04:37 +03:00
Serhiy Storchaka be80fc9a84 Issue #19327: Fixed the working of regular expressions with too big charset. 2013-10-24 22:02:58 +03:00
Peter Moody e5019d5183 #17400: correct handling of 100.64.0.0/10, fixing the docs and updating NEWS 2013-10-24 09:47:10 -07:00
Senthil Kumaran a46079e853 merge from 3.3: Increase the test coverage of macurl2path module. Patch by Colin Williams. 2013-10-23 21:55:35 -07:00
Senthil Kumaran b82a3dc240 Increase the coverage of macurl2path. Patch by Colin Williams. 2013-10-23 21:50:56 -07:00
Antoine Pitrou dfea31254b Issue #19360: fix test_site when Python is installed into $HOME/.local 2013-10-23 22:03:45 +02:00
Antoine Pitrou a1782e1be8 Issue #19360: fix test_site when Python is installed into $HOME/.local 2013-10-23 22:03:22 +02:00
Antoine Pitrou 3d3e1ba8ac Issue #19340: Fix test_sysconfig when Python is built with an empty prefix.
Patch by Sunny K.
2013-10-23 19:08:07 +02:00
Antoine Pitrou dde25c4851 Issue #19340: Fix test_sysconfig when Python is built with an empty prefix.
Patch by Sunny K.
2013-10-23 19:07:40 +02:00
Eric Snow 0db06a1c42 [Issue #19357] Ensure module "loaded" during tests gets forgotten. 2013-10-22 23:46:53 -06:00
Eric Snow 776b888071 [Issue #19357] Ensure module "loaded" during tests gets forgotten. 2013-10-22 23:27:42 -06:00
Peter Moody be9c1b133b #17400: fix documentation, add cache to is_global and correctly handle 100.64.0.0/10 2013-10-22 12:36:21 -07:00
Tim Golden a4df90ceb9 Issue #15207: Fix mimetypes to read from correct area in Windows registry (Original patch by Dave Chambers) 2013-10-22 20:03:47 +01:00
Tim Golden 27a856495e Issue #15207: Fix mimetypes to read from correct area in Windows registry (Original patch by Dave Chambers) 2013-10-22 19:27:34 +01:00
Ethan Furman 3f2f19230c Issue #19030: fix new pydoc tests for --without-doc-strings 2013-10-22 07:30:24 -07:00
Christian Heimes e53510726b Issue #18742: Rework the internal hashlib construtor to pave the road for ABCs. 2013-10-22 14:59:12 +02:00
Christian Heimes d885aa4d66 Make resource tests more robust. 2013-10-22 11:45:30 +02:00
Christian Heimes b7bd5df809 Issue #16595: Add prlimit() to resource module
prlimit() is a Linux specific command that combines setrlimit, getrlimit and can set the limit
of other processes.
2013-10-22 11:21:54 +02:00
Christian Heimes 6fc79bf813 Issue #19324: Expose Linux-specific constants in resource module 2013-10-22 11:09:27 +02:00
Guido van Rossum b0fb94dda8 Fix asyncio issue #19293 (hangs on AIX). 2013-10-21 21:28:45 -07:00
Guido van Rossum f75debda94 Unsilence several asyncio AIX tests that no longer hang, and silence a new hang. 2013-10-21 20:57:25 -07:00
Ethan Furman 5875d74748 Close #19263: add tests to ensure __objclass__ correctly set. 2013-10-21 20:45:55 -07:00
Guido van Rossum 934f6ea7fb Switch subprocess stdin to a socketpair, attempting to fix issue #19293 (AIX hang). 2013-10-21 20:37:14 -07:00
Guido van Rossum 8a0fe85fbe Avoid test_asyncio hang on AIX. 2013-10-21 20:26:12 -07:00
Christian Tismer 410d931a17 add filtering of individual files to PyZipFile
changed output of debug messages to say "path" or "file"
extended test for filtering  certain files in a package
added test for filtering files in a python dir (no package)
2013-10-22 04:09:28 +02:00
Guido van Rossum 8da15cc218 asyncio: be more lenient if we don't understand status returned by waitpid().
This should have no effect, it's a "shouldn't happe" case.
Also tidied up some comments.
2013-10-21 15:00:44 -07:00
Peter Moody 22c3176426 #17400; ipaddress should make it easy to identify rfc6598 addresses 2013-10-21 13:58:06 -07:00
Charles-François Natali 1a82f7e6a5 Fix test_pydoc failure introduced by 2f09a6980e1a (issue #19030). 2013-10-21 14:46:34 +02:00
Charles-François Natali 6459025b24 Issue #19170: telnetlib: use selectors. 2013-10-21 14:02:12 +02:00
Georg Brandl a606542e95 #19274: use captured_stdout() in the test suite; add NEWS entry. 2013-10-21 08:29:29 +02:00
Ethan Furman b0c84cdaac Issue #19030: final pieces for proper location of various class attributes located in the metaclass.
Okay, hopefully the very last patch for this issue.  :/

I realized when playing with Enum that the metaclass attributes weren't always displayed properly.

New patch properly locates DynamicClassAttributes, virtual class attributes (returned by __getattr__ and friends), and metaclass class attributes (if they are also in the metaclass __dir__ method).

Also had to change one line in pydoc to get this to work.

Added tests in test_inspect and test_pydoc to cover these situations.
2013-10-20 22:37:39 -07:00
Christian Tismer 59202e5fc7 add a filterfunc to zip file.PyZipFile.writepy, issue 19274 2013-10-21 03:59:23 +02:00
Guido van Rossum 7be5d7d0e0 Issue 19306: Add extra hints to faulthandler stack dumps that they are upside down. 2013-10-20 18:21:02 -07:00
Ezio Melotti 5c16c2eb45 #8964: merge with 3.3. 2013-10-21 03:05:46 +03:00
Ezio Melotti f076f53386 #8964: fix platform._sys_version to handle IronPython 2.6+. 2013-10-21 03:03:32 +03:00
Ezio Melotti 566a2be95c #18958: Improve error message for json.load(s) while passing a string that starts with a UTF-8 BOM. 2013-10-21 02:10:55 +03:00
Ezio Melotti a0e768ccc2 #19307: Improve error message for json.load(s) while passing objects of the wrong type. 2013-10-21 01:52:33 +03:00
Benjamin Peterson 6b4f7803f8 cleanup the construction of __qualname__ (closes #19301 again) 2013-10-20 17:50:28 -04:00
Antoine Pitrou 7d61800489 Skip one asyncio test when IPv6 isn't supported (Windows buildbots) 2013-10-20 21:45:29 +02:00
Antoine Pitrou cb1fe98f76 Make various asyncio test files individually runnable 2013-10-20 21:02:53 +02:00
Charles-François Natali bcd76827f4 Issue #19309: asyncio: make waitpid() wait for all child processes, not only
those in the same process group.
2013-10-20 20:31:43 +02:00
Serhiy Storchaka f3e21ba5af Make test_audioop discoverable by unittest. 2013-10-20 17:25:34 +03:00
Serhiy Storchaka 6e9e4fe97c Make test_audioop discoverable by unittest. 2013-10-20 17:24:42 +03:00
Serhiy Storchaka 2acc456c33 Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
limiting the call to readline().  Original patch by Michał
Jastrzębski and Giampaolo Rodola.
2013-10-20 17:02:10 +03:00
Serhiy Storchaka c30b178cbc Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
limiting the call to readline().  Original patch by Michał
Jastrzębski and Giampaolo Rodola.
2013-10-20 16:58:27 +03:00
Serhiy Storchaka 36af10c1f7 Issue #17087: Improved the repr for regular expression match objects. 2013-10-20 13:13:31 +03:00
Serhiy Storchaka d5fd8df22f Add yet some 24-bit tests. 2013-10-20 12:49:04 +03:00
Serhiy Storchaka ce82eb2e13 Issue #12866: Fix bias() for 24-bit. Add more tests. 2013-10-20 09:42:26 +03:00
Guido van Rossum d49c47bfb0 Break out of loop on EOF in asyncio echo test programs. 2013-10-19 21:26:34 -07:00
Antoine Pitrou 92945c574b Un-backout e3ec6b17260c - the test fix was actually also necessary 2013-10-20 02:16:40 +02:00
Antoine Pitrou c1b78419e6 Backout e3ec6b17260c after Guido's fix 2013-10-20 02:09:08 +02:00
Antoine Pitrou d20afad7d4 Issue #19305: try to fix sporadic test_asyncio failure on FreeBSD 10.0 2013-10-20 01:51:25 +02:00
Antoine Pitrou 0d9eefda34 Try to fix test_asyncio dual stack test when creating an IPv6 socket fails 2013-10-20 01:10:52 +02:00
Benjamin Peterson 3d9e481ece give explicitly global functions and classes a global __qualname__ (closes #19301) 2013-10-19 16:01:13 -04:00
Larry Hastings f5e987bbe6 Issue #18606: Add the new "statistics" module (PEP 450). Contributed
by Steven D'Aprano.
2013-10-19 11:50:09 -07:00
Serhiy Storchaka 0e071c967c Fixed tests for issue #19279. 2013-10-19 21:14:57 +03:00
Serhiy Storchaka eaea5e9107 Issue #12866: The audioop module now supports 24-bit samples. 2013-10-19 21:10:46 +03:00
Christian Heimes 0fbd94ced9 Issue #18582: skip test of _hashlib.pbkdf2_hmac if OpenSSL is not available or too old 2013-10-19 19:40:49 +02:00
Serhiy Storchaka 55e092f545 Issue #19279: UTF-7 decoder no more produces illegal strings. 2013-10-19 20:39:28 +03:00
Serhiy Storchaka 35804e4c63 Issue #19279: UTF-7 decoder no more produces illegal strings. 2013-10-19 20:38:19 +03:00
Guido van Rossum 3743711a96 Disable some subprocess tests that hang on AIX.
See http://bugs.python.org/issue19293
2013-10-19 09:10:13 -07:00
Guido van Rossum 7058dad0bd Skip the asyncio tests when threads are not available.
See http://bugs.python.org/issue19295
2013-10-19 08:47:26 -07:00
Nick Coghlan 8608d26e81 contextlib doc updates and refactoring
- explain single use, reusable and reentrant in docs
- converted suppress to a reentrant class based impl
- converted redirect_stdout to a reusable impl
- moved both suppress and redirect_stdout behind a functional
  facade
- added reentrancy tests for the updated suppress
- added reusability tests for the updated redirect_stdio
- slightly cleaned up an exception from contextmanager
2013-10-20 00:30:51 +10:00
Christian Heimes 3626a505db Issue #19254: Provide an optimized Python implementation of PBKDF2_HMAC 2013-10-19 14:12:02 +02:00
Guido van Rossum 355491dc47 Write flow control for asyncio (includes asyncio.streams overhaul). 2013-10-18 15:17:11 -07:00
Guido van Rossum 051a331488 Relax some asyncio test timeouts (http://bugs.python.org/issue19285). 2013-10-18 15:15:56 -07:00
Nadeem Vawda ee1be99e05 Issue #19222: Add support for the 'x' mode to the gzip module.
Original patch by Tim Heaney.
2013-10-19 00:11:13 +02:00
Nadeem Vawda 8a9e99cffc Issue #19223: Add support for the 'x' mode to the bz2 module.
Patch by Tim Heaney and Vajrasky Kok.
2013-10-19 00:11:06 +02:00
Nadeem Vawda 42ca98217c Issue #19201: Add support for the 'x' mode to the lzma module.
Patch by Tim Heaney and Vajrasky Kok.
2013-10-19 00:06:19 +02:00
Brett Cannon c516815353 Fix test to not consider mixin a standalone test 2013-10-18 16:55:15 -04:00
Brett Cannon 1340049f65 Issue #16803: Move test_importlib.test_util to use both frozen and
source code.
2013-10-18 15:40:11 -04:00
Brett Cannon 6a57dd8635 Issue #16803: Have test_importlib.test_locks use frozen and source
code.
2013-10-18 15:12:21 -04:00
Brett Cannon af002e6482 merge 2013-10-18 11:39:32 -04:00
Brett Cannon 27e27f7ee1 Issue #18416: Have importlib.machinery.PathFinder treat '' as the cwd
and stop importlib.machinery.FileFinder treating '' as '.'.

Previous PathFinder transformed '' into '.' which led to __file__ for
modules imported from the cwd to always be relative paths. This meant
the values of the attribute were wrong as soon as the cwd changed.
This change now means that as long as the site module is run (which
makes all entries in sys.path absolute) then all values for __file__
will also be absolute unless it's for __main__ when specified by file
path in a relative way (modules imported by runpy will have an
absolute path).

Now that PathFinder is no longer treating '' as '.' it only makes
sense for FileFinder to stop doing so as well. Now no transformation
is performed for the directory given to the __init__ method.

Thanks to Madison May for the initial patch.
2013-10-18 11:39:04 -04:00
Guido van Rossum 57497ad181 Rename Transport.pause/resume to pause_reading/pause_writing. Also relax timeout in test_call_later(). 2013-10-18 07:58:20 -07:00
Brett Cannon 40b22d0661 Issue #16803: test.test_importlib.test_api now runs under frozen and
source.
2013-10-18 10:45:59 -04:00
Nick Coghlan 3321fb8e3a Issue #16129: this should appease the buildbots 2013-10-18 23:59:58 +10:00
Richard Oudkerk 8acc3c574a Remove test_sigterm(). 2013-10-18 14:42:56 +01:00
Ethan Furman 63c141cacd Close #19030: inspect.getmembers and inspect.classify_class_attrs
Order of search is now:
  1. Try getattr
  2. If that throws an exception, check __dict__ directly
  3. If still not found, walk the mro looking for the eldest class that has
     the attribute (e.g. things returned by __getattr__)
  4. If none of that works (e.g. due to a buggy __dir__, __getattr__, etc.
     method or missing __slot__ attribute), ignore the attribute entirely.
2013-10-18 00:27:39 -07:00
Guido van Rossum fc29e0f37e Rename the logger to plain "logger". 2013-10-17 15:39:45 -07:00
Ned Deily b795aa8547 Issue #19275: Fix test_site failure on OS X due to typo. 2013-10-17 15:21:40 -07:00
Guido van Rossum 5ea7f93dcd Make asyncio tests run on Windows. 2013-10-17 14:23:17 -07:00
Guido van Rossum 27b7c7ebf1 Initial checkin of asyncio package (== Tulip, == PEP 3156). 2013-10-17 13:40:50 -07:00
Nick Coghlan 8f9571e70e Skip #16129 test until I debug cross-platform issues 2013-10-18 01:46:19 +10:00
Nick Coghlan 6508dc5f06 Try to debug overspecified test :( 2013-10-18 01:44:22 +10:00
Richard Oudkerk cc5c728513 Fix signal handler in test. 2013-10-17 15:22:10 +01:00
Nick Coghlan 240f86d7dd Close #19266: contextlib.ignore -> contextlib.suppress
Patch by Zero Piraeus.
2013-10-17 23:40:57 +10:00
Richard Oudkerk 1e2f67c05f Try doing a raw test of os.fork()/os.kill(). 2013-10-17 14:24:06 +01:00
Nick Coghlan 7d270ee05d Issue #16129: Add `Py_SetStandardStreamEncoding`
This new pre-initialization API allows embedding
applications like Blender to force a particular
encoding and error handler for the standard IO streams.

Also refactors Modules/_testembed.c to let us start
testing multiple embedding scenarios.

(Initial patch by Bastien Montagne)
2013-10-17 22:35:35 +10:00
Richard Oudkerk 26f92680da Stop trying to use strace, but add a sleep before terminate(). 2013-10-17 13:56:18 +01:00
Christian Heimes 86823a52fc Issue #19275: Fix test_site on AMD64 Snow Leopard 2013-10-17 13:40:00 +02:00
Richard Oudkerk e4508eebb4 Try strace instead of gdb to see what wedged child is doing. 2013-10-17 12:10:45 +01:00
Serhiy Storchaka a3cf1aa864 Merge heads 2013-10-17 12:48:32 +03:00
Serhiy Storchaka b5f8a5e134 Issue 19276: Fix tests for wave files on big-endian platforms.
Skip tests for 24-bit wave file on big-endian platforms.
2013-10-17 12:46:53 +03:00
Serhiy Storchaka c955291a05 Issue 19276: Fix tests for wave files on big-endian platforms.
Skip tests for 24-bit wave file on big-endian platforms.
2013-10-17 12:46:00 +03:00
Richard Oudkerk d44500affe Try to print a backtrace of wedged child process in test. 2013-10-17 10:38:37 +01:00
R David Murray 3da240fd01 #18891: Complete new provisional email API.
This adds EmailMessage and, MIMEPart subclasses of Message
with new API methods, and a ContentManager class used by
the new methods.  Also a new policy setting, content_manager.

Patch was reviewed by Stephen J. Turnbull and Serhiy Storchaka,
and reflects their feedback.

I will ideally add some examples of using the new API to the
documentation before the final release.
2013-10-16 22:48:40 -04:00
Ethan Furman 1a16288197 Close #19252: better test coverage for Enum. Thanks, CliffM 2013-10-16 19:09:31 -07:00
Richard Oudkerk b1694cf588 Issue #18999: Make multiprocessing use context objects.
This allows different parts of a program to use different methods for
starting processes without interfering with each other.
2013-10-16 16:41:56 +01:00
Serhiy Storchaka 25324971fb Issue #18468: The re.split, re.findall, and re.sub functions and the group()
and groups() methods of match object now always return a string or a bytes
object.
2013-10-16 12:46:28 +03:00
Antoine Pitrou 355dda8d17 Issue #14407: Fix unittest test discovery in test_concurrent_futures. 2013-10-15 23:24:44 +02:00
Antoine Pitrou 9816a1e643 Issue #14407: Fix unittest test discovery in test_concurrent_futures. 2013-10-15 23:23:32 +02:00
Serhiy Storchaka acc9f3fb16 Issue #18725: The textwrap module now supports truncating multiline text. 2013-10-15 21:22:54 +03:00
Richard Oudkerk bc2bfa6b68 Merge 2013-10-15 16:49:59 +01:00
Richard Oudkerk b46fe79735 Print process instead of pid. 2013-10-15 16:48:51 +01:00
Serhiy Storchaka 481c6dd79f Issue #18919: Fixed resource leaks in audio tests. 2013-10-14 20:10:18 +03:00
Serhiy Storchaka 85812bca21 Issue #18919: Fixed resource leaks in audio tests. 2013-10-14 20:09:47 +03:00
Serhiy Storchaka 1f56a94a9e Issue #18919: Check warnings messages in the aifc module tests. 2013-10-14 20:06:04 +03:00
Serhiy Storchaka 4606d36d7f Issue #18919: Check warnings messages in the aifc module tests. 2013-10-14 20:05:33 +03:00
Antoine Pitrou 6039db8de3 Issue #18776: atexit callbacks now display their full traceback when they raise an exception. 2013-10-13 21:54:15 +02:00
Antoine Pitrou 24201d497c Issue #18776: atexit callbacks now display their full traceback when they raise an exception. 2013-10-13 21:53:13 +02:00
Georg Brandl fbc3c3c2be Closes #17730: in code.interact(), when banner="", do not print anything.
Also adds tests for banner printing.
2013-10-13 21:49:06 +02:00
Georg Brandl 6e22055ee1 pdb: modernize find_function() and add tests for it.
Closes #18714.
2013-10-13 20:51:47 +02:00
Ethan Furman 9efcb6bf38 Issue19030: commit tests for DynamicClassAttribute 2013-10-13 10:52:10 -07:00
Serhiy Storchaka eb7414fc29 Issue #18919: Unified and extended tests for audio modules: aifc, sunau and
wave.
2013-10-13 18:06:45 +03:00
Serhiy Storchaka 1b80e63d70 Issue #18919: Unified and extended tests for audio modules: aifc, sunau and
wave.
2013-10-13 17:55:07 +03:00
Mark Dickinson ed7bb488b4 Remove failing checks for explicit error messages. 2013-10-13 11:34:01 +01:00
Mark Dickinson ef8627b3f0 Issue #18659: fix test_format test that wasn't being executed. Thanks Vajrasky Kok for the patch. 2013-10-13 11:04:36 +01:00
Georg Brandl daa1fa991c Back out accidentally pushed changeset b51218966201. 2013-10-13 09:32:59 +02:00
Georg Brandl 4300019e1a Add re.fullmatch() function and regex.fullmatch() method, which anchor the
pattern at both ends of the string to match.

Patch by Matthew Barnett.
Closes #16203.
2013-10-13 09:18:45 +02:00
Christian Heimes 06239f62b0 merge 2013-10-13 02:22:10 +02:00
Christian Heimes f1dc3ee16d Issue #19218: Rename collections.abc to _collections_abc in order to speed up interpreter start 2013-10-13 02:04:20 +02:00
Richard Oudkerk 7b4a36194a Merge. 2013-10-13 00:52:21 +01:00
Richard Oudkerk 4f35079858 Make test_terminate() succeed or fail quickly.
This does not fix #19227, but should stop the Gentoo buildbot from hanging.
2013-10-13 00:49:27 +01:00
Christian Heimes e92ef13b0a Issue #18582: Add 'pbkdf2_hmac' to the hashlib module. 2013-10-13 00:52:43 +02:00
Antoine Pitrou 1164dfcb86 Issue #19219: Speed up marshal.loads(), and make pyc files slightly (5% to 10%) smaller. 2013-10-12 22:25:39 +02:00
Christian Heimes f403f50378 Issue #19205: _osx_support uses the re module all over the place. Omit the test for nw. 2013-10-12 15:08:42 +02:00
Victor Stinner e8785ff82a Close #18754: Run Python child processes in isolated more in the test suite. 2013-10-12 14:44:01 +02:00
Christian Heimes 179a3dbc9e Issue #19205: add debugging output for failing test on Snow Leopard 2013-10-12 12:32:21 +02:00
Christian Heimes cbf6e95de5 merge 2013-10-12 01:41:49 +02:00
Christian Heimes c1df2729ea Issue #19209: fix structseq test 2013-10-12 01:38:52 +02:00
Victor Stinner 370cb25307 test_os: report tests as skipped when os.statvfs() fails with ENOSYS 2013-10-12 01:33:54 +02:00
Christian Heimes 2582762b1b Issue #19209: Remove import of copyreg from the os module to speed up
interpreter startup. stat_result and statvfs_result are now hard-coded to
reside in the os module.
The patch is based on Victor Stinner's patch.
2013-10-12 01:27:08 +02:00
Christian Heimes 1a5fb4e3c1 Also test that the locale module isn't loaded during normal startup 2013-10-12 01:00:51 +02:00
Christian Heimes 8c9cd5a3d4 Issue #19205: Don't import the 're' module in site and sysconfig module to
to speed up interpreter start.
2013-10-12 00:24:55 +02:00
Antoine Pitrou fd4722cacf Issue #9548: Add a minimal "_bootlocale" module that is imported by the _io module instead of the full locale module. 2013-10-12 00:13:50 +02:00
Antoine Pitrou 73abc527eb Fix expected checksum for new unicodedata (after full rebuild) 2013-10-11 21:40:55 +02:00
R David Murray aaf17b33a5 #19192: Give up on time.xmlrpc.com as an xmlrpc network test.
time.xmlrpc.com has come and gone over the years, and has been gone again for
a while.  The test did test one thing that the current xmlrpc tests don't: the
use of multiple levels of attribute names in the call.  So in addition to
removing the network test, we add a test in xmlrpc of dotted name access.

There should also be a test for when dotted name access is disallowed, but
that requires more extensive test harness refactoring, and in any case was not
tested by the network test we are deleting, since it is a server-side setting.

This is a slightly simplified version of a patch by Vajrasky Kok.
2013-10-11 12:09:51 -04:00
Raymond Hettinger 1254b407ac Rename contextlib.ignored() to contextlib.ignore(). 2013-10-10 22:39:39 -07:00
Benjamin Peterson 94d08d908b upgrade unicode db to 6.3.0 (closes #19221) 2013-10-10 17:24:45 -04:00
R David Murray 78d692f98e 18764: remove the problematic 'print' alias for the PDB 'p' command.
So that it no longer shadows the print function.

Patch by Connor Osborn, doc and test changes by R. David Murray.
2013-10-10 17:23:26 -04:00
Raymond Hettinger 088cbf2d39 Issue #15805: Add contextlib.redirect_stdout() 2013-10-10 00:46:57 -07:00
Tim Peters 3d1b7a0c10 Whitespace normalization. 2013-10-08 21:29:27 -05:00
Tim Peters e99bdb9694 Issue 19158: a rare race in BoundedSemaphore could allow .release() too often. 2013-10-08 21:12:58 -05:00
Tim Peters 7634e1cf90 Issue 19158: a rare race in BoundedSemaphore could allow .release() too often. 2013-10-08 20:55:51 -05:00
Antoine Pitrou 77e904e6a6 Issue #18948: improve SuppressCoreFiles to include Windows crash popup suppression, and use it in more tests.
Patch by Valerie Lambert and Zachary Ware.
2013-10-08 23:04:32 +02:00
Ethan Furman 648f860c22 Close #19156: add tests and fix for Enum helper edge cases. Patch from CliffM. 2013-10-06 17:19:54 -07:00
Victor Stinner ab5a58d827 test_import.test_module_with_large_stack(): unload the test module
Ensure that the module is unloaded to be able to run the test more than once,
and to not leak memory.
2013-10-06 22:52:37 +02:00
Raymond Hettinger 3472fafe74 merge 2013-10-05 17:20:18 -07:00
Raymond Hettinger facd0a346f Strengthen one of the collections.Counter() tests 2013-10-05 17:14:51 -07:00
Antoine Pitrou 5df8a8a1fd Issue #19087: Improve bytearray allocation in order to allow cheap popping of data at the front (slice deletion). 2013-10-05 21:12:18 +02:00
Eric Snow 7e70fa5314 [issue 19152] Ensure we have actually registered ExtensionFileLoader as an ExecutionLoader. 2013-10-04 20:28:52 -06:00
Ezio Melotti a349478573 #19166: merge with 3.3. 2013-10-05 03:14:13 +03:00
Ezio Melotti 4e1f3d669b #19166: use an unused var in a test. Patch by Vajrasky Kok. 2013-10-05 03:07:03 +03:00
Raymond Hettinger 07573d7b24 merge 2013-10-04 16:52:39 -07:00
Raymond Hettinger cb1d96f782 Issue #18594: Make the C code more closely match the pure python code. 2013-10-04 16:51:02 -07:00
Brett Cannon 3ad327ec3a Issue #16803: Run test.test_importlib.test_abc under both
_frozen_importlib and source.
2013-10-04 14:47:14 -04:00
Antoine Pitrou 0e61ed8400 Issue #19014: memoryview.cast() is now allowed on zero-length views. 2013-10-03 19:56:54 +02:00
Antoine Pitrou 60b183407c Issue #19014: memoryview.cast() is now allowed on zero-length views. 2013-10-03 19:55:41 +02:00
Nick Coghlan fdf239a855 Close #17839: support bytes-like objects in base64 module
This mostly affected the encodebytes and decodebytes function
(which are used by base64_codec)

Also added a test to ensure all bytes-bytes codecs can handle
memoryview input and tests for handling of multidimensional
and non-bytes format input in the modern base64 API.
2013-10-03 00:43:22 +10:00
Brett Cannon 0de3f0197b Tweak skipIf message 2013-10-02 10:58:58 -04:00
Brett Cannon 634a8fc042 Try to fix issue #19134 again 2013-10-02 10:25:42 -04:00
Nick Coghlan 45163ccce4 Close #18690: register memoryview with Sequence ABC 2013-10-02 22:31:47 +10:00
Nick Coghlan a0f169cde8 Close #19078: memoryview now supports reversed
Patch by Claudiu Popa
2013-10-02 22:06:54 +10:00
Serhiy Storchaka 7c411a4041 Issue #19132: The pprint module now supports compact mode. 2013-10-02 11:56:18 +03:00
Serhiy Storchaka 092bd388ce Issue #19137: The pprint module now correctly formats instances of set and
frozenset subclasses.
2013-10-02 11:43:30 +03:00
Serhiy Storchaka 51844384f4 Issue #19137: The pprint module now correctly formats instances of set and
frozenset subclasses.
2013-10-02 11:40:49 +03:00
Nick Coghlan f05d981f58 Close #10042: functools.total_ordering now handles NotImplemented
(Patch by Katie Miller)
2013-10-02 00:02:03 +10:00
Nick Coghlan e6f4631f08 Merge #19092 from 3.3 2013-10-01 23:28:00 +10:00
Nick Coghlan 1a33b2f35b Close #19092: ExitStack now reraises exceptions from __exit__
Report and patch by Hrvoje Nikšić
2013-10-01 23:24:56 +10:00
Brett Cannon 63f03ed3db Issue #19134: Make a test in inspect conditional on multiprocessing
being available.

Thanks to Remi Pointel for the bug report.
2013-09-30 15:21:09 -04:00
Benjamin Peterson 95536b8405 rename some more tests to avoid duplicate names (#19123) 2013-09-29 15:18:43 -04:00
Antoine Pitrou 20b85557f2 Issue #19095: SSLSocket.getpeercert() now raises ValueError when the SSL handshake hasn't been done. 2013-09-29 19:50:53 +02:00
Richard Oudkerk 085ab4a553 Merge. 2013-09-29 17:33:04 +01:00
Richard Oudkerk 8b3f5aafd3 Issue #19112: avoid using function defined in method. 2013-09-29 17:29:56 +01:00
Benjamin Peterson 70157e8f02 merge 3.3 (#19112) 2013-09-29 11:11:10 -04:00
Benjamin Peterson cc6ef3620f move helper function into its test method (closes #19112) 2013-09-29 11:08:04 -04:00