summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 3.4Zachary Ware2014-06-081-0/+1
|\
| * Issue #21683: Add Tix build to the Windows buildbot scripts.Zachary Ware2014-06-083-2/+19
| |
* | Merge with 3.4 whitespaceTerry Jan Reedy2014-06-081-1/+1
|\ \ | |/
| * whitespaceTerry Jan Reedy2014-06-081-1/+1
| |
* | Merge with 3.4Terry Jan Reedy2014-06-080-0/+0
|\ \ | |/
| * Issue #21682: Replace EditorWindow with mock to eliminate memory leaks.Terry Jan Reedy2014-06-081-3/+10
| |\ | | | | | | | | | Patch by Saimadhav Heblikar. (2 head merge)
* | \ Merge heads.Terry Jan Reedy2014-06-081-3/+10
|\ \ \
| * \ \ Merge with 3.4Terry Jan Reedy2014-06-071-3/+10
| |\ \ \ | | | |/ | | |/|
| | * | Issue #21682: Replace EditorWindow with mock to eliminate memory leaks.Terry Jan Reedy2014-06-071-3/+10
| | | | | | | | | | | | | | | | Patch by Saimadhav Heblikar.
* | | | backout 0fb7789b5eeb for test breakage (#20578)Benjamin Peterson2014-06-085-194/+14
| | | |
* | | | merge 3.4 (#11709)Benjamin Peterson2014-06-083-0/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | make sure the builtin help function doesn't fail when sys.stdin is not a ↵Benjamin Peterson2014-06-083-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | valid file (closes #11709) Original patch by Amaury Forgeot d'Arc with a test by bdettmer.
* | | | add BufferedIOBase.readinto1 (closes #20578)Benjamin Peterson2014-06-085-14/+194
| | | | | | | | | | | | | | | | Patch by Nikolaus Rath.
* | | | merge 3.4 (#12063)Benjamin Peterson2014-06-082-0/+19
|\ \ \ \ | |/ / /
| * | | document TokenError and unclosed expression behavior (closes #12063)Benjamin Peterson2014-06-082-0/+19
| | | | | | | | | | | | | | | | Patch by Amandine Lee.
* | | | merge 3.4 (#13223)Benjamin Peterson2014-06-074-2/+64
|\ \ \ \ | |/ / /
| * | | don't remove self from example code in the HTML output (closes #13223)Benjamin Peterson2014-06-074-2/+64
| | | | | | | | | | | | | | | | Patch by Víctor Terrón.
* | | | merge 3.4 (#21463)Benjamin Peterson2014-06-074-2/+35
|\ \ \ \ | |/ / /
| * | | in ftp cache pruning, avoid changing the size of a dict while iterating over ↵Benjamin Peterson2014-06-074-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | it (closes #21463) Patch by Skyler Leigh Amador.
* | | | merge 3.4 (#10503)Benjamin Peterson2014-06-071-1/+1
|\ \ \ \ | |/ / /
| * | | specify that getuid() returns the real uid (closes #10503)Benjamin Peterson2014-06-071-1/+1
| | | | | | | | | | | | | | | | Patch by εσχατοκυριος.
* | | | merge 3.4 (#21404)Benjamin Peterson2014-06-072-0/+5
|\ \ \ \ | |/ / /
| * | | document the compress_level argument to tarfile.open (closes #21404)Benjamin Peterson2014-06-072-0/+5
| | | | | | | | | | | | | | | | Patch by Katherine Busch.
* | | | merge 3.4 (#21642)Benjamin Peterson2014-06-073-5/+24
|\ \ \ \ | |/ / /
| * | | allow the keyword else immediately after (no space) an integer (closes #21642)Benjamin Peterson2014-06-073-5/+24
| | | |
* | | | Merge issue #21569 from 3.4Nick Coghlan2014-06-071-113/+201
|\ \ \ \ | |/ / /
| * | | Issue #21569: sync Python 2.7 What's New with 2.7 versionNick Coghlan2014-06-071-113/+201
| | | |
* | | | Merge issue #21667 from 3.4Nick Coghlan2014-06-071-9/+10
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Issue #21667: Clarify string data model descriptionNick Coghlan2014-06-071-9/+10
| |/
* | Merge with 3.4Terry Jan Reedy2014-06-061-33/+34
|\ \ | |/
| * Issue #18910: test_textView - since all tests require 'gui', make root global.Terry Jan Reedy2014-06-061-33/+34
| | | | | | | | Subclass TextViewer to add mock methods instead of monkey-patching it.
* | Merge quote quashing.Zachary Ware2014-06-061-1/+1
|\ \ | |/
| * Quash extraneous quote.Zachary Ware2014-06-061-1/+1
| |
* | Issue #21671: Merge with 3.4Zachary Ware2014-06-064-8/+12
|\ \ | |/
| * Issue #21671, CVE-2014-0224: Update the Windows build to openssl-1.0.1hZachary Ware2014-06-064-6/+12
| |
* | Merge #21662: fix typo, improve sentence flowR David Murray2014-06-051-3/+3
|\ \ | |/
| * #21662: fix typo, improve sentence flowR David Murray2014-06-051-3/+3
| | | | | | | | Patch by Steve Dougherty.
* | Merge: #21653: fix doc for return type of sqlite3.Row.keys().R David Murray2014-06-051-1/+1
|\ \ | |/
| * #21653: fix doc for return type of sqlite3.Row.keys().R David Murray2014-06-051-1/+1
| |
* | Closes #21661: Merge typo fix.Zachary Ware2014-06-051-1/+1
|\ \ | |/
| * Issue #21661: Fix typo.Zachary Ware2014-06-051-1/+1
| |
* | Revert Tools/buildbot/external-common.bat to normal (with updated versions).Zachary Ware2014-06-051-16/+4
|\ \ | |/
| * Revert Tools/buildbot/external-common.bat to normal (with updated versions).Zachary Ware2014-06-051-16/+4
| |
* | Force a clean pull-and-build of Tcl/Tk on Windows buildbots.Zachary Ware2014-06-051-8/+16
|\ \ | |/
| * Force a clean pull-and-build of Tcl/Tk on Windows buildbots.Zachary Ware2014-06-051-8/+16
| |
* | Issue #21665: Don't use 'OPTS=noxp' when compiling Tk.Zachary Ware2014-06-051-2/+2
|\ \ | |/ | | | | | | That option had been for Win2k compatibility (which was dropped with Python 3.3) and makes default ttk ugly on post-Win2k systems.
| * Clean up Tcl/Tk building in the Windows buildbot scripts.Zachary Ware2014-06-052-10/+10
| | | | | | | | | | | | | | | | | | - 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.
* | Issue #21515: tempfile.TemporaryFile now uses os.O_TMPFILE flag is availableVictor Stinner2014-06-053-0/+35
| |
* | (Merge 3.4) Tulip issue 83, Python issue #21252: Fill some XXX docstrings in ↵Victor Stinner2014-06-053-18/+29
|\ \ | |/ | | | | asyncio
| * Tulip issue 83, Python issue #21252: Fill some XXX docstrings in asyncioVictor Stinner2014-06-053-18/+29
| |