c6a66ccb06
whitespace
2014-06-08 14:57:24 -04:00
eaeb0d060c
Merge with 3.4
2014-06-08 14:49:30 -04:00
6d4f8f0fea
Merge heads.
2014-06-08 14:49:07 -04:00
ba229d9597
Issue #21682 : Replace EditorWindow with mock to eliminate memory leaks.
...
Patch by Saimadhav Heblikar. (2 head merge)
2014-06-08 14:47:26 -04:00
4fb01ffe66
backout 0fb7789b5eeb for test breakage ( #20578 )
2014-06-07 23:18:12 -07:00
eac219436c
merge 3.4 ( #11709 )
2014-06-07 20:17:29 -07:00
159824ea2a
make sure the builtin help function doesn't fail when sys.stdin is not a valid file ( closes #11709 )
...
Original patch by Amaury Forgeot d'Arc with a test by bdettmer.
2014-06-07 20:14:26 -07:00
10e847bbc7
add BufferedIOBase.readinto1 ( closes #20578 )
...
Patch by Nikolaus Rath.
2014-06-07 20:06:48 -07:00
66f80e92c3
merge 3.4 ( #12063 )
2014-06-07 17:55:53 -07:00
96e0430dfb
document TokenError and unclosed expression behavior ( closes #12063 )
...
Patch by Amandine Lee.
2014-06-07 17:47:41 -07:00
9d19da701d
merge 3.4 ( #13223 )
2014-06-07 16:47:15 -07:00
ed1160b39c
don't remove self from example code in the HTML output ( closes #13223 )
...
Patch by Víctor Terrón.
2014-06-07 16:44:00 -07:00
edb07d28fb
merge 3.4 ( #21463 )
2014-06-07 15:09:36 -07:00
3c2dca67ac
in ftp cache pruning, avoid changing the size of a dict while iterating over it ( closes #21463 )
...
Patch by Skyler Leigh Amador.
2014-06-07 15:08:04 -07:00
8dfd73a2b4
merge 3.4 ( #10503 )
2014-06-07 13:51:51 -07:00
4bb09c8432
specify that getuid() returns the real uid ( closes #10503 )
...
Patch by εσχατοκυριος.
2014-06-07 13:50:34 -07:00
33919e8423
merge 3.4 ( #21404 )
2014-06-07 12:48:09 -07:00
9b2731bfdd
document the compress_level argument to tarfile.open ( closes #21404 )
...
Patch by Katherine Busch.
2014-06-07 12:45:37 -07:00
3e439797ba
merge 3.4 ( #21642 )
2014-06-07 12:39:51 -07:00
c416162302
allow the keyword else immediately after (no space) an integer ( closes #21642 )
2014-06-07 12:36:39 -07:00
ce6c525762
Merge issue #21569 from 3.4
2014-06-08 00:00:13 +10:00
024b2f52bf
Issue #21569 : sync Python 2.7 What's New with 2.7 version
2014-06-07 23:43:00 +10:00
e2197a4805
Merge issue #21667 from 3.4
2014-06-07 23:22:06 +10:00
1462786f00
Issue #21667 : Clarify string data model description
2014-06-07 23:21:14 +10:00
7244d775db
Merge with 3.4
2014-06-07 04:28:16 -04:00
38ebdf528e
Issue #21682 : Replace EditorWindow with mock to eliminate memory leaks.
...
Patch by Saimadhav Heblikar.
2014-06-07 04:27:50 -04:00
f2d9526391
Merge with 3.4
2014-06-06 17:43:37 -04:00
4a3f135c8d
Issue #18910 : test_textView - since all tests require 'gui', make root global.
...
Subclass TextViewer to add mock methods instead of monkey-patching it.
2014-06-06 17:43:19 -04:00
83500dc7a5
Merge quote quashing.
2014-06-06 09:14:33 -05:00
780b585fbc
Quash extraneous quote.
2014-06-06 09:13:18 -05:00
3266a8fa59
Issue #21671 : Merge with 3.4
2014-06-06 01:27:34 -05:00
7d55da42a4
Issue #21671 , CVE-2014-0224: Update the Windows build to openssl-1.0.1h
2014-06-06 01:23:53 -05:00
cc568b1222
Merge #21662 : fix typo, improve sentence flow
2014-06-05 15:32:34 -04:00
2c0781853a
#21662 : fix typo, improve sentence flow
...
Patch by Steve Dougherty.
2014-06-05 15:31:56 -04:00
d1130e3d05
Merge: #21653 : fix doc for return type of sqlite3.Row.keys().
2014-06-05 15:17:01 -04:00
092135ebc8
#21653 : fix doc for return type of sqlite3.Row.keys().
2014-06-05 15:16:38 -04:00
55757419bd
Closes #21661 : Merge typo fix.
2014-06-05 13:41:36 -05:00
66f305b1a0
Issue #21661 : Fix typo.
2014-06-05 13:41:06 -05:00
7490554a4c
Revert Tools/buildbot/external-common.bat to normal (with updated versions).
2014-06-05 12:00:51 -05:00
60cc211cde
Revert Tools/buildbot/external-common.bat to normal (with updated versions).
2014-06-05 12:00:28 -05:00
c6d6784ed4
Force a clean pull-and-build of Tcl/Tk on Windows buildbots.
2014-06-05 11:56:58 -05:00
6d602c0ee9
Force a clean pull-and-build of Tcl/Tk on Windows buildbots.
2014-06-05 11:56:36 -05:00
ba9d233d83
Issue #21665 : Don't use 'OPTS=noxp' when compiling Tk.
...
That option had been for Win2k compatibility (which was dropped with
Python 3.3) and makes default ttk ugly on post-Win2k systems.
2014-06-05 11:53:44 -05:00
4a01fd2d65
Clean up Tcl/Tk building in the Windows buildbot scripts.
...
- Nix the 'noxp' option, it was for Win2k compatibility (which was dropped
with Python 3.3) and made default ttk ugly on post-Win2k systems (#21665 )
- Use 'OPTS=symbols' instead of 'DEBUG=1'; symbols is the official method
- Use core, shell, dlls, install-binaries, and install-libraries targets
instead of all and install to avoid trying to 1) build packages that don't
work with MSVC 10+ and 2) install unnecessary bits and pieces.
2014-06-05 11:44:22 -05:00
d967fc9da2
Issue #21515 : tempfile.TemporaryFile now uses os.O_TMPFILE flag is available
2014-06-05 14:27:45 +02:00
7088b99eb8
(Merge 3.4) Tulip issue 83, Python issue #21252 : Fill some XXX docstrings in asyncio
2014-06-05 12:07:14 +02:00
f9e49dd346
Tulip issue 83, Python issue #21252 : Fill some XXX docstrings in asyncio
2014-06-05 12:06:44 +02:00
ae0767bb5b
Closes #21663 : Merged fix from 3.4.
2014-06-05 09:32:24 +01:00
1a170a74f7
Issue #21663 : Fixed error caused by trying to create an existing directory.
2014-06-05 09:31:20 +01:00
cbd619bd6a
Merge with 3.4
2014-06-05 03:54:21 -04:00
Terry Jan Reedy
Benjamin Peterson
Nick Coghlan
Zachary Ware
R David Murray
Victor Stinner
Vinay Sajip