Giampaolo Rodola'
265ae86414
merge heads
2014-03-20 21:44:53 +01:00
Giampaolo Rodola'
f97e82937f
Fix issue 18931: selectors module now supports /dev/poll on Solaris.
2014-03-20 21:43:41 +01:00
Andrew Kuchling
a0934b2c1b
#20744 : don't try running an external 'zip' in shutil.make_archive()
...
Instead we'll just use the stdlib zipfile module. Patch by Derek Chiang
2014-03-20 16:11:16 -04:00
Benjamin Peterson
8efe3df664
merge 3.4
2014-03-20 12:40:03 -05:00
Benjamin Peterson
409a1be6cf
improve start default for relpath
2014-03-20 12:39:53 -05:00
Zachary Ware
9636e98b18
Merge several minor doc fixes from 3.4
2014-03-20 11:28:16 -05:00
Zachary Ware
2f31b4b577
Fix typos in Doc/faq/extending. Found by cocoatomo on docs@.
2014-03-20 10:16:09 -05:00
Zachary Ware
dbd1c43e52
Fix spelling in enum docs.
...
"equivalant" was caught by Tobias Käs on docs@, "seperated" and "chartruese"
were discovered by a spell-checker.
2014-03-20 10:01:48 -05:00
Zachary Ware
253deed862
Add missing parenthesis. Found by cocoatomo on docs@.
2014-03-20 09:46:09 -05:00
Zachary Ware
a22ae21db6
Fix parameter name in docs for os.makedirs and os.removedirs.
...
Pointed out by Colin Davis on docs@.
2014-03-20 09:42:01 -05:00
Raymond Hettinger
ad5e5ea9bb
merge
2014-03-20 06:44:33 -07:00
Raymond Hettinger
d852e997f4
Clean-up docstring
2014-03-20 06:42:31 -07:00
Vinay Sajip
ab405d5575
Closes #20444 : Merged fix from 3.4.
2014-03-20 13:15:23 +00:00
Vinay Sajip
b1698d4030
Issue #20444 : Reduced code duplication.
2014-03-20 13:14:39 +00:00
Vinay Sajip
6d5cde6a4b
Closes #20558 : Improved implementation of error handling.
2014-03-20 13:06:07 +00:00
Vinay Sajip
71dcb28d1c
Issue #20558 : Improved implementation of error handling.
2014-03-20 13:03:17 +00:00
Vinay Sajip
9f9f0e23a1
Merged from 3.4.
2014-03-20 12:43:50 +00:00
Vinay Sajip
ecfc98c67b
Issue #10141 : updated new usages of AF_CAN to be in #ifdef AF_CAN rather than #ifdef HAVE_LINUX_CAN_H to allow compilation on older Linuxes.
2014-03-20 12:42:42 +00:00
Victor Stinner
5782e25dfe
(Merge 3.4) Issue #12328 , #20978 : Add _winapi.WAIT_ABANDONED_0 symbol, needed
...
by multiprocessing.connection
2014-03-20 09:27:11 +01:00
Victor Stinner
373f0a925b
Isuse #12328 , #20978 : Add _winapi.WAIT_ABANDONED_0 symbol, needed by
...
multiprocessing.connection
2014-03-20 09:26:55 +01:00
Victor Stinner
03ce1c013d
(Merge 3.4) Issue #20976 : pyflakes: Remove unused imports
2014-03-20 09:22:39 +01:00
Victor Stinner
7fa767e517
Issue #20976 : pyflakes: Remove unused imports
2014-03-20 09:16:38 +01:00
Victor Stinner
a69f0f94d3
(Merge 3.4) Issue #20978 : pyflakes: fix undefined names; remove last part of
...
OS/2 support in distutils
2014-03-20 08:51:24 +01:00
Victor Stinner
69b1e261fc
Issue #20978 : pyflakes: fix undefined names
2014-03-20 08:50:52 +01:00
Victor Stinner
790bd6dd13
Issue #20978 : Remove last part of OS/2 support in distutils
2014-03-20 08:50:33 +01:00
Benjamin Peterson
e5280feba1
merge 3.4
2014-03-19 20:52:25 -05:00
Benjamin Peterson
deec16be07
add Nehal Hussain
2014-03-19 20:52:17 -05:00
Andrew Kuchling
c51da2b8a0
#14332 : provide a better explanation of junk in difflib docs
...
Initial patch by Alba Magallanes.
2014-03-19 16:43:06 -04:00
Andrew Kuchling
2e3743cd30
#13437 : link to the source code for a few more modules
2014-03-19 16:23:01 -04:00
Zachary Ware
26e417b182
Merge with 3.4
2014-03-19 14:47:49 -05:00
Zachary Ware
5f3e3c3429
Use the correct VS edition names in PCbuild/readme.txt
2014-03-19 14:46:25 -05:00
Victor Stinner
9fb288f9bd
(Merge 3.4) Skip test_urllib2.test_issue16464() is the ssl module is missing
2014-03-19 17:34:12 +01:00
Victor Stinner
9a90243f8b
Skip test_urllib2.test_issue16464() is the ssl module is missing
2014-03-19 17:31:20 +01:00
Ethan Furman
38d872ee5d
Issue19995: passing a non-int to %o, %c, %x, or %X now raises an exception
2014-03-19 08:38:52 -07:00
Kristján Valur Jónsson
8e5d0caf92
Issue #19009
...
Enhance HTTPResponse.readline() performance
2014-03-19 10:07:26 +00:00
Zachary Ware
4278b2d782
Merge xxlimited compile warning fix from 3.4
2014-03-18 23:09:00 -05:00
Zachary Ware
232b017607
Avoid compile warning in xxlimited on 32-bit Windows non-Debug builds.
2014-03-18 23:05:01 -05:00
Zachary Ware
0e5e4a4085
Merge PCbuild/pcbuild.sln cleanup from 3.4
2014-03-18 22:40:23 -05:00
Zachary Ware
270e7377ce
Clean up PCbuild/pcbuild.sln a bit:
...
- Remove configuration settings from removed _sha3.vcxproj
- Don't try to build configurations of _testembed that don't exist
(namely, PGInstrument and PGUpdate)
2014-03-18 22:34:52 -05:00
Zachary Ware
6dd44d2398
Ignore files generated by MSVC PGO builds (merge from 3.4).
2014-03-18 22:31:48 -05:00
Zachary Ware
c2447f2a15
Ignore files generated by MSVC PGO builds.
2014-03-18 22:28:16 -05:00
Zachary Ware
31ee154c5f
Closes #20966 : Fix Tkinter Resources link (merge from 3.4)
2014-03-18 09:20:25 -05:00
Zachary Ware
088639936d
Issue #20966 : Fix Tkinter Resources link
2014-03-18 09:19:18 -05:00
Victor Stinner
eb7d40c12c
Doc: add What's New in Python 3.5 to whatsnew index
2014-03-18 09:01:21 +01:00
Victor Stinner
845efccab1
Restore removed NEWS items 3.4.1rc1 into 3.5.0alpha1 sections
2014-03-18 08:59:30 +01:00
Georg Brandl
3f2350c647
merge with 3.4
2014-03-18 07:47:35 +01:00
Georg Brandl
f5c801fdca
Fix option description that is a warning in new Sphinx versions.
2014-03-18 07:44:07 +01:00
Victor Stinner
b2bef62e91
Issue #19977 : Fix test_capi when LC_CTYPE locale is POSIX
2014-03-18 02:38:12 +01:00
Victor Stinner
97f17a784a
Issue #19977 : Enable test_c_locale_surrogateescape() on Windows
...
Only test the error handler. The encoding is not ASCII on Windows: it may the
OEM or ANSI code page.
2014-03-18 02:28:10 +01:00
Victor Stinner
518e610977
Issue #19977 , #19036 : Always include <locale.h> in pythonrun.c
...
to get LC_CTYPE constant on Windows.
2014-03-18 02:06:38 +01:00