Zachary Ware
9996a7d21b
Merge typo fix from 3.4
2014-04-18 09:23:35 -05:00
Zachary Ware
715ef02ddc
Fix a typo in the docstring of nb_index.
2014-04-18 09:23:14 -05:00
Zachary Ware
07b4c5e1f6
Merge typo fix from 3.4
2014-04-18 09:17:04 -05:00
Zachary Ware
ea42b4cc80
Fix a typo in the signature for object.__ge__
2014-04-18 09:14:31 -05:00
Benjamin Peterson
e83236f396
merge 3.4
2014-04-18 01:04:07 -04:00
Benjamin Peterson
5edbb7b7a4
correct len signature in docstring ( closes #21294 )
2014-04-18 01:03:59 -04:00
Benjamin Peterson
af7c5b0bb5
merge 3.4
2014-04-17 18:29:27 -04:00
Benjamin Peterson
d065c48991
fix ref count annotations on sphinx >= 1.2.1 ( closes #21286 )
2014-04-17 18:29:01 -04:00
doko@ubuntu.com
f8d60ca0c4
- Merge 3.4
2014-04-17 20:14:29 +02:00
doko@ubuntu.com
1a4f561d7c
- Issue #21285 : Refactor and fix curses configure check to always search
...
in a ncursesw directory.
2014-04-17 20:13:44 +02:00
doko@ubuntu.com
dc282134ee
- Merge 3.4
2014-04-17 19:49:00 +02:00
doko@ubuntu.com
4a173bc4ed
Fixes for KFreeBSD and the Hurd:
...
- Issue #21274 : Define PATH_MAX for GNU/Hurd in Python/pythonrun.c.
- Issue #21276 : posixmodule: Don't define USE_XATTRS on KFreeBSD and the Hurd.
- Issue #21275 : Fix a socket test on KFreeBSD.
2014-04-17 19:47:16 +02:00
doko@ubuntu.com
72f61de768
- fix merge conflict
2014-04-17 18:46:53 +02:00
doko@ubuntu.com
2273ab2a0d
Merge 3.4
2014-04-17 17:55:03 +02:00
doko@ubuntu.com
a3818a3043
- Issue #15234 : For BerkelyDB and Sqlite, only add the found library and
...
include directories if they aren't already being searched. This avoids
an explicit runtime library dependency.
2014-04-17 17:52:48 +02:00
Antoine Pitrou
617c4dc304
Add a --ciphers option to Lib/test/ssl_servers.py
2014-04-17 12:30:14 +02:00
Antoine Pitrou
05649f39ec
Use ssl.create_default_context in Lib/test/ssl_servers.py
2014-04-17 12:21:36 +02:00
Benjamin Peterson
8bdeb1672c
support setting fpu precision on m68k ( closes #20904 )
...
Patch from Andreas Schwab.
2014-04-17 00:00:31 -04:00
Senthil Kumaran
aedff520ea
merge 3.4
2014-04-16 23:44:03 -04:00
Senthil Kumaran
aad7cc9dba
Clarify BROWSER envar behavior in webbrowser.py. Noted by David Turner. Closes #21248
2014-04-16 23:43:34 -04:00
Senthil Kumaran
249e74aa26
merge 3.4
2014-04-16 23:33:30 -04:00
Senthil Kumaran
8b4a272c98
Correct the URL in the http.client example. Noted by Evens Fortuné. Closes #21229
2014-04-16 23:33:02 -04:00
R David Murray
16b8c619cd
Merge: #18628 : clarify index entry for source file encoding declaration.
2014-04-16 21:50:25 -04:00
R David Murray
f7f981829b
#18628 : clarify index entry for source file encoding declaration.
...
Patch by Sam Lucidi.
2014-04-16 21:48:04 -04:00
Thomas Wouters
67d8dc1f58
Fix Tools/scripts/generate_opcode_h.py from issue #17861 to work correctly
...
when building in a separate object tree. More people should build this way.
This may still fail if the source is unwritable, I haven't tested that yet.
2014-04-17 01:13:29 +02:00
Kushal Das
68290f4895
Removes unused varargs and varkwargs from assert_not_called().
2014-04-17 01:54:07 +05:30
Benjamin Peterson
3ae4f992d7
merge 3.4
2014-04-16 16:17:16 -04:00
Benjamin Peterson
fa873f66c6
remove superfluous and useless line
2014-04-16 16:16:37 -04:00
Benjamin Peterson
b581ae9030
merge 3.4
2014-04-16 16:07:49 -04:00
Benjamin Peterson
c844b00dec
use the called property of the run_pip mock rather than an assertion method that doesn't exist
2014-04-16 16:06:39 -04:00
Kushal Das
8af9db3e4f
Closes Issue 21262: New method assert_not_called for Mock.
...
It raises AssertionError if the mock has been called.
2014-04-17 01:36:14 +05:30
Kushal Das
8c14534df6
Closes Issue 21238: New keyword argument `unsafe` to Mock.
...
It raises `AttributeError` incase of an attribute startswith assert
or assret.
2014-04-16 23:32:21 +05:30
Senthil Kumaran
c3ac9af6d0
merge 3.4
2014-04-16 13:56:41 -04:00
Senthil Kumaran
cad2bf20c3
Address issue 18229 - Explain http.server.BaseHTTPRequestHandler's .headers attribute further.
...
Initial patch by Caelyn McAulay.
2014-04-16 13:56:19 -04:00
Antoine Pitrou
94a5b663bf
Issue #20896 : ssl.get_server_certificate() now uses PROTOCOL_SSLv23, not PROTOCOL_SSLv3, for maximum compatibility.
2014-04-16 18:56:28 +02:00
Antoine Pitrou
0fba0c3ebf
Try to fix buildbot failures on old OpenSSLs (< 1.0.0) - followup to issue #21015
2014-04-16 18:34:01 +02:00
Antoine Pitrou
c043061667
Try to fix buildbot failures on old OpenSSLs (< 1.0.0) - followup to issue #21015
2014-04-16 18:33:39 +02:00
Andrew Kuchling
f5a429295d
#6490 : Expand documentation for os.popen().
...
Patch by Sam Kimbrel.
2014-04-16 09:10:53 -04:00
Terry Jan Reedy
f2dfa92704
Merge with 3.4
2014-04-15 23:44:37 -04:00
Terry Jan Reedy
7f84d1eb63
#18566 : Whitespace
2014-04-15 23:44:14 -04:00
Terry Jan Reedy
62e582cdb4
Merge with 3.4
2014-04-15 23:38:44 -04:00
Terry Jan Reedy
6ac4240b6c
Issue #18566 : Clarify unittest setUp, tearDown doc. Patch by Nitika Agarwal.
2014-04-15 23:38:18 -04:00
Eric V. Smith
a12572ff3a
Close issue #8931 : Make alternate formatting for 'c' raise an exception. Patch by Torsten Landschoff.
2014-04-15 22:37:55 -04:00
Andrew Kuchling
15b04eb429
#20103 : Rewrite description of itertools.accumulate().
...
Patch by Christian Hudon.
2014-04-15 22:28:40 -04:00
Andrew Kuchling
42a17fa4fd
Merge from 3.4
2014-04-15 21:21:56 -04:00
R David Murray
1b28088fd3
Merge #20874 fix.
2014-04-15 20:30:00 -04:00
R David Murray
fc1020d396
#20874 : reflow paragraph.
2014-04-15 20:26:54 -04:00
R David Murray
0e0e391fa3
#20874 : update tutorial wording: sophisticated line editing is now standard.
...
Patch by Rafael Mejia.
2014-04-15 20:25:18 -04:00
Vinay Sajip
aef3027aaf
Closes #21245 : merged update from 3.4.
2014-04-15 23:13:54 +01:00
Vinay Sajip
65425b4bc6
Issue #21245 : updated documentation on exception() method and function.
2014-04-15 23:13:12 +01:00