From: Ezio Melotti Date: Thu, 8 Aug 2013 12:18:26 +0000 (+0300) Subject: #18273: merge with 3.3. X-Git-Tag: v3.4.0a2~278 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cc06fde432e4a66aacac33d62947ad20f505c99;p=thirdparty%2FPython%2Fcpython.git #18273: merge with 3.3. --- 5cc06fde432e4a66aacac33d62947ad20f505c99 diff --cc Lib/test/test_json/test_fail.py index 5b652e864a73,3dd877afdbc0..7caafdbdddc7 --- a/Lib/test/test_json/test_fail.py +++ b/Lib/test/test_json/test_fail.py @@@ -1,5 -1,4 +1,5 @@@ - from test.json_tests import PyTest, CTest + from test.test_json import PyTest, CTest +import re # 2007-10-05 JSONDOCS = [ diff --cc Misc/NEWS index f9129b6e5245,2550dc48450a..0772cd2e182d --- a/Misc/NEWS +++ b/Misc/NEWS @@@ -601,74 -458,58 +601,77 @@@ Librar - Issue #17666: Fix reading gzip files with an extra field. +- Issue #16475: Support object instancing, recursion and interned strings + in marshal + - Issue #17502: Process DEFAULT values in mock side_effect that returns iterator. - Patch by Michael Foord. -- Issue #17572: Avoid chained exceptions while passing bad directives to - time.strptime(). Initial patch by Claudiu Popa. +- Issue #16795: On the ast.arguments object, unify vararg with varargannotation + and kwarg and kwargannotation. Change the column offset of ast.Attribute to be + at the attribute name. -- Issue #17435: threading.Timer's __init__ method no longer uses mutable - default values for the args and kwargs parameters. +- Issue #17434: Properly raise a SyntaxError when a string occurs between future + imports. -- Issue #17526: fix an IndexError raised while passing code without filename to - inspect.findsource(). Initial patch by Tyler Doyle. +- Issue #17117: Import and @importlib.util.set_loader now set __loader__ when + it has a value of None or the attribute doesn't exist. -- Issue #16550: Update the opcode descriptions of pickletools to use unsigned - integers where appropriate. Initial patch by Serhiy Storchaka. +- Issue #17032: The "global" in the "NameError: global name 'x' is not defined" + error message has been removed. Patch by Ram Rachum. -IDLE ----- +- Issue #18080: When building a C extension module on OS X, if the compiler + is overriden with the CC environment variable, use the new compiler as + the default for linking if LDSHARED is not also overriden. This restores + Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0. -- Issue #17838: Allow sys.stdin to be reassigned. +- Issue #18113: Fixed a refcount leak in the curses.panel module's + set_userptr() method. Reported by Atsuo Ishimoto. -- Issue #13495: Avoid loading the color delegator twice in IDLE. +- Implement PEP 443 "Single-dispatch generic functions". -- Issue #17798: Allow IDLE to edit new files when specified on command line. +- Implement PEP 435 "Adding an Enum type to the Python standard library". -- Issue #14735: Update IDLE docs to omit "Control-z on Windows". +Tests +----- -- Issue #17585: Fixed IDLE regression. Now closes when using exit() or quit(). ++- Issue #18273: move the tests in Lib/test/json_tests to Lib/test/test_json ++ and make them discoverable by unittest. Patch by Zachary Ware. + -- Issue #17657: Show full Tk version in IDLE's about dialog. - Patch by Todd Rovito. +- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger). -- Issue #17613: Prevent traceback when removing syntax colorizer in IDLE. +- Issue #18396: Fix spurious test failure in test_signal on Windows when + faulthandler is enabled (Patch by Jeremy Kloth) -- Issue #1207589: Backwards-compatibility patch for right-click menu in IDLE. +- Issue #17046: Fix broken test_executable_without_cwd in test_subprocess. -- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box. +- Issue #15415: Add new temp_dir() and change_cwd() context managers to + test.support, and refactor temp_cwd() to use them. Patch by Chris Jerdonek. -- Issue #17625: In IDLE, close the replace dialog after it is used. +- Issue #15494: test.support is now a package rather than a module (Initial + patch by Indra Talip) -- Issue #14254: IDLE now handles readline correctly across shell restarts. +- Issue #17944: test_zipfile now discoverable and uses subclassing to + generate tests for different compression types. Fixed a bug with skipping + some tests due to use of exhausted iterators. -- Issue #17614: IDLE no longer raises exception when quickly closing a file. +- Issue #18266: test_largefile now works with unittest test discovery and + supports running only selected tests. Patch by Zachary Ware. -- Issue #6698: IDLE now opens just an editor window when configured to do so. +- Issue #17767: test_locale now works with unittest test discovery. + Original patch by Zachary Ware. -- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer - raises an exception. +- Issue #18375: Assume --randomize when --randseed is used for running the + testsuite. -- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo. +- Issue #11185: Fix test_wait4 under AIX. Patch by Sébastien Sablé. -Tests ------ +- Issue #18207: Fix test_ssl for some versions of OpenSSL that ignore seconds + in ASN1_TIME fields. + +- Issue #18094: test_uuid no more reports skipped tests as passed. + +- Issue #17992: Add timeouts to asyncore and asynchat tests so that they won't + accidentally hang. - Issue #17833: Fix test_gdb failures seen on machines where debug symbols for glibc are available (seen on PPC64 Linux).