Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
77,016 Commits 6 Branches 593 Tags 2.5 GiB
Commit Graph

7242 Commits

Author SHA1 Message Date
Ezio Melotti 90bbbd1164 #16919: test_crypt now works with unittest test discovery. Patch by Zachary Ware. 2013-01-11 05:18:45 +02:00
Benjamin Peterson f86b3c394c merge 3.3 (#16900) 2013-01-10 14:16:42 -06:00
Benjamin Peterson 36f7b97787 remove __del__ because it's evil and also prevents the ResourceWarning on the socket from happening (closes #16900) 2013-01-10 14:16:20 -06:00
R David Murray 96983afd0c merge #15545: fix sqlite3.iterdump regression on unsortable row_factory objects. 
The fix for issue 9750 introduced a regression by sorting the row objects
returned by fetchall.  But if a row_factory such as sqlite3.Row is used, the
rows may not be sortable (in Python3), which leads to an exception.  The
sorting is still a nice idea, so the patch moves the sort into the sql.

Fix and test by Peter Otten.
 2013-01-10 11:15:57 -05:00
R David Murray 7bd04867e5 merge #15545: fix sqlite3.iterdump regression on unsortable row_factory objects. 
The fix for issue 9750 introduced a regression by sorting the row objects
returned by fetchall.  But if a row_factory such as sqlite3.Row is used, the
rows may not be sortable (in Python3), which leads to an exception.  The
sorting is still a nice idea, so the patch moves the sort into the sql.

Fix and test by Peter Otten.
 2013-01-10 11:13:34 -05:00
R David Murray b52312923b #15545: fix sqlite3.iterdump regression on unsortable row_factory objects. 
The fix for issue 9750 introduced a regression by sorting the row objects
returned by fetchall.  But if a row_factory such as sqlite3.Row is used, the
rows may not be sortable (in Python3), which leads to an exception.  The
sorting is still a nice idea, so the patch moves the sort into the sql.

Fix and test by Peter Otten.
 2013-01-10 11:04:09 -05:00
Eli Bendersky 8eee081d40 Update Misc/NEWS for issue #16076 2013-01-10 06:35:18 -08:00
Eli Bendersky e6174ca85e Issue #16913: Fix Element.itertext()'s handling of text with XML entities. 
Patch by Serhiy Storchaka
 2013-01-10 06:27:53 -08:00
Ezio Melotti 5b1acc0dff #16910: merge with 3.3. 2013-01-10 07:46:29 +02:00
Ezio Melotti 0dceb560b6 #16910: test_bytes, test_unicode, and test_userstring now work with unittest test discovery. Patch by Zachary Ware. 2013-01-10 07:43:26 +02:00
Ezio Melotti 47b988609f #16905: merge with 3.3. 2013-01-10 06:53:34 +02:00
Ezio Melotti 2688e81064 #16905: test_bufio now works with unittest test discovery. Initial patch by Berker Peksag. 2013-01-10 06:52:23 +02:00
Ezio Melotti 09a8e163da #16898: merge with 3.3. 2013-01-10 06:12:43 +02:00
Ezio Melotti b21af554ee #16898: test_bufio now works with unittest test discovery. Patch by Zachary Ware. 2013-01-10 06:11:34 +02:00
Ezio Melotti e1b0d3e123 #16888: merge with 3.3. 2013-01-10 06:06:31 +02:00
Ezio Melotti 1d3e96dbe2 #16888: test_array now works with unittest test discovery. Patch by Zachary Ware. 2013-01-10 06:04:50 +02:00
Ezio Melotti af5b688f71 #16896: merge with 3.3. 2013-01-10 05:29:33 +02:00
Ezio Melotti 47236db1d0 #16896: test_asyncore now works with unittest test discovery. Patch by Zachary Ware. 2013-01-10 05:28:52 +02:00
Ezio Melotti 9e97071fe0 #16897: merge with 3.3. 2013-01-10 04:33:17 +02:00
Ezio Melotti f472a90d31 #16897: test_bisect now works with unittest test discovery. Initial patch by Zachary Ware. 2013-01-10 04:32:01 +02:00
Ezio Melotti 11b3a6056f #16852: merge with 3.3. 2013-01-10 03:29:45 +02:00
Ezio Melotti d0dfe9ad46 #16852: test_genericpath, test_posixpath, test_ntpath, and test_macpath now work with unittest test discovery. Patch by Zachary Ware. 2013-01-10 03:12:50 +02:00
Charles-François Natali f424f3856d Issue #16876: Optimize epoll.poll() by keeping a per-instance epoll events 
buffer instead of allocating a new one at each poll().
 2013-01-09 19:00:26 +01:00
Benjamin Peterson 0b32a480bd merge 3.3 (#16906) 2013-01-09 09:52:22 -06:00
Benjamin Peterson 0c270a8bb7 correct static string clearing loop (closes #16906) 2013-01-09 09:52:01 -06:00
Serhiy Storchaka df558cb3b1 Issue #16491: IDLE now prints chained exception tracebacks. 2013-01-09 12:26:54 +02:00
Serhiy Storchaka 7131749959 Issue #16491: IDLE now prints chained exception tracebacks. 2013-01-09 12:24:48 +02:00
Serhiy Storchaka 78470b4c3a Issue #16491: IDLE now prints chained exception tracebacks. 2013-01-09 12:21:57 +02:00
Serhiy Storchaka 24a3ef6999 Issue #11461: Fix the incremental UTF-16 decoder. Original patch by 
Amaury Forgeot d'Arc. Added tests for partial decoding of non-BMP
characters.
 2013-01-08 23:41:55 +02:00
Serhiy Storchaka ae3b32ad6b Issue #11461: Fix the incremental UTF-16 decoder. Original patch by 
Amaury Forgeot d'Arc. Added tests for partial decoding of non-BMP
characters.
 2013-01-08 23:40:52 +02:00
Serhiy Storchaka 48e188e573 Issue #11461: Fix the incremental UTF-16 decoder. Original patch by 
Amaury Forgeot d'Arc. Added tests for partial decoding of non-BMP
characters.
 2013-01-08 23:14:24 +02:00
Charles-François Natali cd18e78897 Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host. 2013-01-08 20:03:07 +01:00
Charles-François Natali 1aa004b45d Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host. 2013-01-08 19:51:56 +01:00
Charles-François Natali f6fd794fac Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host. 2013-01-08 19:49:42 +01:00
Victor Stinner 2716d531a1 fcntl: add F_DUPFD_CLOEXEC constant, available on Linux 2.6.24+. 2013-01-08 00:52:40 +01:00
Serhiy Storchaka c99b5120a7 Issue #15972: Fix error messages when os functions expecting a file name or 
file descriptor receive the incorrect type.
 2013-01-07 23:16:49 +02:00
Serhiy Storchaka a2ad5c3ad1 Issue #15972: Fix error messages when os functions expecting a file name or 
file descriptor receive the incorrect type.
 2013-01-07 23:13:46 +02:00
Serhiy Storchaka 05aba6ce39 Issue #16320: Remove redundant Makefile dependencies for strings and bytes. 2013-01-06 21:36:21 +02:00
Christian Heimes fb4b7b40e4 Issue #16881: Fix Py_ARRAY_LENGTH macro for GCC < 3.1. 2013-01-06 16:42:20 +01:00
Christian Heimes 61dbb00869 Issue #16881: Fix Py_ARRAY_LENGTH macro for GCC < 3.1. 2013-01-06 16:41:56 +01:00
Antoine Pitrou 58ddc9d743 Issue #8109: The ssl module now has support for server-side SNI, thanks to a :meth:`SSLContext.set_servername_callback` method. 
Patch by Daniel Black.
 2013-01-05 21:20:29 +01:00
Ezio Melotti d05d3cc4eb #13094: merge with 3.3. 2013-01-05 00:51:40 +02:00
Ezio Melotti 7d48669085 #13094: merge with 3.2. 2013-01-05 00:51:20 +02:00
Ezio Melotti cad8b0ff8e #13094: add Programming FAQ entry about the behavior of closures. 2013-01-05 00:50:46 +02:00
Charles-François Natali b9a76e2920 Issue #16860: In tempfile, use O_CLOEXEC when available to set the 
close-on-exec flag atomically.
 2013-01-04 18:33:02 +01:00
Serhiy Storchaka 4e02538bf3 Issue #16856: Fix a segmentation fault from calling repr() on a dict with 
a key whose repr raise an exception.
 2013-01-04 12:40:35 +02:00
Serhiy Storchaka 6c83e739d7 Issue #16856: Fix a segmentation fault from calling repr() on a dict with 
a key whose repr raise an exception.
 2013-01-04 12:39:34 +02:00
Serhiy Storchaka d8a0bac8f7 Issue #16674: random.getrandbits() is now 20-40% faster for small integers. 2013-01-04 12:18:35 +02:00
Christian Heimes 75e923fcf2 Issue #16847: Fixed improper use of _PyUnicode_CheckConsistency() in 
non-pydebug builds. Several extension modules now compile cleanly when
assert()s are enabled in standard builds (-DDEBUG flag).
 2013-01-03 09:22:41 +01:00
Christian Heimes f402e922f3 Issue #16847: Fixed improper use of _PyUnicode_CheckConsistency() in 
non-pydebug builds. Several extension modules now compile cleanly when
assert()s are enabled in standard builds (-DDEBUG flag).
 2013-01-03 09:21:55 +01:00
Ezio Melotti 37623ab5f1 #16009: JSON error messages now provide more information. Patch by Serhiy Storchaka. 2013-01-03 08:44:15 +02:00
Victor Stinner fd53a5a011 (Merge 3.3) Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB. 2013-01-03 03:38:38 +01:00
Victor Stinner 6f84659e5e (Merge 3.2) Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB. 2013-01-03 03:37:47 +01:00
Victor Stinner c44057dfbd Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB 2013-01-03 03:33:21 +01:00
Victor Stinner 7ae320d667 (Merge 3.2) Issue #16455: On FreeBSD and Solaris, if the locale is C, the 
ASCII/surrogateescape codec is now used, instead of the locale encoding, to
decode the command line arguments. This change fixes inconsistencies with
os.fsencode() and os.fsdecode() because these operating systems announces an
ASCII locale encoding, whereas the ISO-8859-1 encoding is used in practice.
 2013-01-03 01:21:07 +01:00
Victor Stinner 20b654acb5 Issue #16455: On FreeBSD and Solaris, if the locale is C, the 
ASCII/surrogateescape codec is now used, instead of the locale encoding, to
decode the command line arguments. This change fixes inconsistencies with
os.fsencode() and os.fsdecode() because these operating systems announces an
ASCII locale encoding, whereas the ISO-8859-1 encoding is used in practice.
 2013-01-03 01:08:58 +01:00
Nadeem Vawda ef408aea3d Issue #16828: Fix error incorrectly raised by bz2.compress(b'') and bz2.BZ2Compressor.compress(b''). 
Initial patch by Martin Packman.
 2013-01-02 23:13:53 +01:00
Nadeem Vawda 791e464f75 Correction: issue #16828 also affects BZ2Compressor.compress(). 2013-01-02 23:10:47 +01:00
Nadeem Vawda 57cb81d161 Issue #16828: Fix error incorrectly raised by bz2.compress(''). 
Initial patch by Martin Packman.
 2013-01-02 23:05:56 +01:00
Nadeem Vawda 638fb9bbed Issue #16828: Fix error incorrectly raised by bz2.compress(''). 
Patch by Martin Packman.
 2013-01-02 23:02:00 +01:00
Antoine Pitrou 90e4774558 Issue #16833: In http.client.HTTPConnection, do not concatenate the request headers and body when the payload exceeds 16 KB, since it can consume more memory for no benefit. 
Patch by Benno Leslie.
 2013-01-02 22:10:47 +01:00
Ezio Melotti 454758224b #16748: merge with 3.3. 2013-01-02 21:22:58 +02:00
Ezio Melotti 22ebb2d6ef #16748: test_heapq now works with unittest test discovery. 2013-01-02 21:19:37 +02:00
Serhiy Storchaka a3eb8122ae Fix incorrect grammar in Misc/NEWS. 2013-01-02 12:11:57 +02:00
Serhiy Storchaka 89faf4fe23 Fix incorrect grammar in Misc/NEWS. 2013-01-02 12:05:38 +02:00
Serhiy Storchaka ba1edf2f58 Fix incorrect grammar in Misc/NEWS. 2013-01-02 11:57:22 +02:00
Serhiy Storchaka 08f4556524 Merge heads 2013-01-02 10:40:36 +02:00
Serhiy Storchaka 32e258d877 Merge heads 2013-01-02 10:37:54 +02:00
Serhiy Storchaka e48741a619 Merge heads 2013-01-02 10:32:13 +02:00
Łukasz Langa b83a86a210 Misc/NEWS updated to tell about #16820 2013-01-02 00:44:36 +01:00
Łukasz Langa 3fb4343162 Null-merged Misc/NEWS change 2013-01-02 00:40:55 +01:00
Łukasz Langa 844460d68c Misc/NEWS updated to tell about #14590 and #16820 2013-01-02 00:39:59 +01:00
Victor Stinner e4110dc11f Issue #9644: Fix the encoding used by os.statvfs(): use the filesystem encoding 
with the surrogateescape error handler, instead of UTF-8 in strict mode.
 2013-01-01 23:05:55 +01:00
Serhiy Storchaka 4cf4f3a7c6 Issue #16541: tk_setPalette() now works with keyword arguments. 
Added a test for tk_setPalette().
 2013-01-02 00:03:58 +02:00
Serhiy Storchaka a97274cbcf Issue #16819: IDLE method completion now correctly works for bytes literals. 2013-01-01 22:33:19 +02:00
Serhiy Storchaka eb6aa5c525 Issue #16819: IDLE method completion now correctly works for bytes literals. 2013-01-01 22:32:42 +02:00
Serhiy Storchaka 8c126d7abd Issue #16819: IDLE method completion now correctly works for bytes literals. 2013-01-01 22:25:59 +02:00
Richard Oudkerk 950fab07aa Issue #9586: Merge. 2013-01-01 17:40:58 +00:00
Richard Oudkerk 9b4599322d Issue #9586: Merge 2013-01-01 17:36:53 +00:00
Richard Oudkerk 9866231eab Issue #9586: Redefine SEM_FAILED on MacOSX to keep compiler happy. 2013-01-01 17:29:44 +00:00
Charles-François Natali fe22dcaba7 Issue #16787: Increase asyncore and asynchat default output buffers size, to 
decrease CPU usage and increase throughput.
 2013-01-01 16:31:54 +01:00
Giampaolo Rodola' b4f39e85f2 Fix issue 10527: make multiprocessing use poll() instead of select() if available. 2012-12-31 17:38:46 +01:00
Giampaolo Rodola' 5051ca887c Fix issue 10527: make multiprocessing use poll() instead of select() if available. 2012-12-31 17:38:17 +01:00
Giampaolo Rodola' 5e844c8052 Fix issue 10527: make multiprocessing use poll() instead of select() if available. 2012-12-31 17:23:09 +01:00
Serhiy Storchaka ac1069387e Issue #16688: Fix backreferences did make case-insensitive regex fail on non-ASCII strings. 
Patch by Matthew Barnett.
 2012-12-29 23:41:08 +02:00
Serhiy Storchaka c1b59d4552 Issue #16688: Fix backreferences did make case-insensitive regex fail on non-ASCII strings. 
Patch by Matthew Barnett.
 2012-12-29 23:38:48 +02:00
Serhiy Storchaka 44c66c72c9 Issue #16486: Make aifc files work with 'with' as context managers. 2012-12-29 22:54:49 +02:00
Serhiy Storchaka ff2840a76f Issue #16485: Fix file descriptor not being closed if file header patching fails on closing of aifc file. 2012-12-29 22:38:37 +02:00
Serhiy Storchaka f1b63c6f0e Issue #16485: Fix file descriptor not being closed if file header patching fails on closing of aifc file. 2012-12-29 22:36:23 +02:00
Serhiy Storchaka 051722d554 Issue #16485: Fix file descriptor not being closed if file header patching fails on closing of aifc file. 2012-12-29 22:30:56 +02:00
Serhiy Storchaka d07db96ab6 Issue #16640: Run less code under a lock in sched module. 2012-12-29 21:46:37 +02:00
Serhiy Storchaka 1147f82438 Issue #16165: Fix sched.scheduler.run() method was block a scheduler for 
other threads.
 2012-12-29 21:35:37 +02:00
Serhiy Storchaka f2b9cf4e61 Issue #16165: Fix sched.scheduler.run() method was block a scheduler for 
other threads.
 2012-12-29 21:34:11 +02:00
Serhiy Storchaka 3c80ce45e4 Issue #16641: Fix default values of sched.scheduler.enter arguments were modifiable. 2012-12-29 21:15:24 +02:00
Serhiy Storchaka c04957bff3 Issue #16641: Fix default values of sched.scheduler.enter arguments were modifiable. 2012-12-29 21:13:45 +02:00
Serhiy Storchaka c819b077bb Issue #16761: Raise TypeError when int() called with base argument only. 2012-12-28 10:09:54 +02:00
Serhiy Storchaka 00e2843115 Issue #16761: Raise TypeError when int() called with base argument only. 2012-12-28 10:02:42 +02:00
Serhiy Storchaka 0b386d5247 Issue #16761: Raise TypeError when int() called with base argument only. 2012-12-28 09:42:11 +02:00
Chris Jerdonek d6c18dcd20 Issue #15302: Switch regrtest from using getopt to using argparse. 
This is the first step in refactoring regrtest to use argparse.  The
regrtest module's main() function still expects a getopt-style return
value rather than an argparse.Namespace instance.
 2012-12-27 18:53:12 -08:00
Chris Jerdonek f7cd05d7af Merge from 3.3: Issue #15324: Fix regrtest --fromfile, --match, --randomize. 2012-12-27 18:32:47 -08:00
Chris Jerdonek 28441e353c Merge from 3.2: Issue #15324: Fix regrtest --fromfile, --match, --randomize. 2012-12-27 18:25:54 -08:00
Chris Jerdonek 1e4bd53a34 Issue #15324: Fix regrtest parsing of --fromfile, --match, and --randomize. 2012-12-27 18:16:32 -08:00
Brian Curtin 9640ead585 another merge 2012-12-27 14:14:42 -06:00
Brian Curtin 9eac6b3848 Merge 2012-12-27 14:12:43 -06:00
Brian Curtin 4620c13f3f merge 2012-12-27 14:11:38 -06:00
Brian Curtin f8704fb24e Merge 3.3 2012-12-27 14:06:38 -06:00
Brian Curtin e6bfa2911a Merge 3.2 2012-12-27 14:06:06 -06:00
Brian Curtin 172e42295f Fix #16759. Convert DWORD registry values using PyLong_FromUnsignedLong. 
When converting REG_DWORD registry values into Python ints, the conversion
needs to be made from an *unsigned* long to match the DWORD type.
 2012-12-27 14:04:42 -06:00
Serhiy Storchaka ffa1795461 Issue #16504: Catch SyntaxErrors raised by tokenizer in IDLE. 
Patch by Roger Serwy.
 2012-12-27 21:54:19 +02:00
Serhiy Storchaka 64df4a1c45 Issue #16504: Catch SyntaxErrors raised by tokenizer in IDLE. 
Patch by Roger Serwy.
 2012-12-27 21:53:06 +02:00
Serhiy Storchaka 07e0e06f8a Issue #16504: Catch SyntaxErrors raised by tokenizer in IDLE. 
Patch by Roger Serwy.
 2012-12-27 21:38:04 +02:00
Brian Curtin 4482b01d23 Merge 3.3 2012-12-27 10:15:54 -06:00
Brian Curtin 62cf69ec7c Merge 3.2 2012-12-27 10:14:30 -06:00
Brian Curtin 12706f2082 Fix #14420. Use PyLong_AsUnsignedLong to support the full range of DWORD. 
This fixes an OverflowError seen in winreg.SetValueEx when passed
winreg.REG_DWORD values that should be supported by the underlying API.
 2012-12-27 10:12:45 -06:00
Hynek Schlawack 6e5c8f992a #16618: Make glob.glob match consistently across strings and bytes 
Fixes handling of leading dots.

Patch by Serhiy Storchaka.
 2012-12-27 10:20:38 +01:00
Hynek Schlawack 6f52027168 #16618: Make glob.glob match consistently across strings and bytes 
Fixes handling of leading dots.

Patch by Serhiy Storchaka.
 2012-12-27 10:15:53 +01:00
Hynek Schlawack e26568f812 #16618: Make glob.glob match consistently across strings and bytes 
Fixes handling of leading dots.

Patch by Serhiy Storchaka.
 2012-12-27 10:10:11 +01:00
Brian Curtin ae57cec791 Fix #16788. Add samestat to Lib/ntpath.py 2012-12-26 08:22:00 -06:00
Brian Curtin e701ec5d3f Add tests for Issue #10646. 
This issue is now fixed due to changes in Issue #11939, so I've refactored
the tests to cover the hard link case. There are no code changes here.
 2012-12-26 07:36:16 -06:00
Brian Curtin 501c8f915f Add NEWS entry for fixing #11939 2012-12-26 07:11:14 -06:00
Senthil Kumaran 2bf61abe02 Issue #16702: Skip proxies for localhost in urllib2_localnet tests 2012-12-26 01:47:09 -08:00
Senthil Kumaran 00679a7ee0 Issue #16702: Skip proxies for localhost in urllib2_localnet tests 2012-12-26 01:46:39 -08:00
Senthil Kumaran 303eb478f2 Issue #16702: Skip proxies for localhost in urllib2_localnet tests 2012-12-26 01:45:58 -08:00
Gregory P. Smith 4fbbf8c0a3 Fixes issue #16772: int() constructor second argument (base) must be an int. 
Consistent with the behavior in Python 2.
 2012-12-25 13:05:31 -08:00
Andrew Svetlov 3ba3a3ee56 Issue #15422: get rid of PyCFunction_New macro 2012-12-25 13:32:35 +02:00
Senthil Kumaran 750909e618 Fix issue16713 - tel url parsing with params 2012-12-24 14:01:48 -08:00
Senthil Kumaran bd6667aae3 Fix issue16713 - tel url parsing with params 2012-12-24 14:01:13 -08:00
Senthil Kumaran ed30199e78 Fix issue16713 - tel url parsing with params 2012-12-24 14:00:20 -08:00
Benjamin Peterson 6f0c94df50 improve tracing performance when f_trace is NULL (closes #16672) 
Patch by Xavier de Gaye.
 2012-12-24 11:53:30 -06:00
Andrew Svetlov 6a7a49c631 Issue #16511: Use default IDLE width and height if config param is not valid. 
Patch Serhiy Storchaka.
 2012-12-24 13:17:11 +02:00
Andrew Svetlov 7174f0883c Issue #16511: Use default IDLE width and height if config param is not valid. 
Patch Serhiy Storchaka.
 2012-12-24 13:16:47 +02:00
Andrew Svetlov 8a495a48a5 Issue #16511: Use default IDLE width and height if config param is not valid. 
Patch Serhiy Storchaka.
 2012-12-24 13:15:43 +02:00
Brian Curtin ed3115b9d9 Add NEWS item for fixing #14470. 2012-12-23 16:54:41 -06:00
Andrew Svetlov 77377574dc Issue #16443: Add docstrings to regular expression match objects. 
Patch by Anton Kasyanov.
 2012-12-23 20:00:58 +02:00
Andrew Svetlov 70dcef4789 Issue #16443: Add docstrings to regular expression match objects. 
Patch by Anton Kasyanov.
 2012-12-23 19:59:27 +02:00
Andrew Svetlov 159bb53765 merge heads 2012-12-23 19:55:21 +02:00
Andrew Svetlov 56ad5ed5ad Issue #16443: Add docstrings to regular expression match objects. 
Patch by Anton Kasyanov.
 2012-12-23 19:23:07 +02:00
Senthil Kumaran 0a6b9eca68 merge from 3.2 
Fix Issue15701 - HTTPError info method call raises AttributeError. Fix that to return headers correctly
 2012-12-23 09:12:13 -08:00
Senthil Kumaran 41e66a26b0 Fix Issue15701 - HTTPError info method call raises AttributeError. Fix that to return headers correctly 2012-12-23 09:04:24 -08:00
Eric V. Smith 1a791322b3 Fix a typo. 2012-12-23 11:15:19 -05:00
Andrew Svetlov 0794fe0356 Add NEWS and docs for #9856 2012-12-23 15:12:19 +02:00
Brett Cannon 2909d6b47c merge with 3.3 2012-12-22 19:38:32 -05:00
Brett Cannon 73b969ec70 Issue #16752: Add a missing import to modulefinder. 
Also fix Misc/ACKS to put part of it back in alphabetical order and
remove some duplicate names.

Patch by Berker Peksag.
 2012-12-22 19:34:21 -05:00
Benjamin Peterson 302c65443e merge 3.3 (#16597) 2012-12-20 12:55:15 -06:00
Benjamin Peterson 3d3daf0b7f improve message (#16597) 2012-12-20 12:54:59 -06:00
Benjamin Peterson 4c05969fc4 merge 3.3 (#16597) 2012-12-20 11:55:16 -06:00
Benjamin Peterson 68623614f0 call close on the underlying stream even if flush raises (closes #16597) 
Patch by Serhiy Storchaka.
 2012-12-20 11:53:11 -06:00
Benjamin Peterson 7643c92cdd merge 3.3 (#16722) 2012-12-19 15:28:46 -06:00
Benjamin Peterson 5ff3f73d94 try to call __bytes__ before __index__ (closes #16722) 2012-12-19 15:27:41 -06:00
Giampaolo Rodola' 527e725732 Fix issue #16646: ftplib.FTP.makeport() might lose socket error details. (patch by Serhiy Storchaka) 2012-12-17 14:23:41 +01:00