Commit Graph

2173 Commits

Author SHA1 Message Date
Nick Coghlan ec5cf095a9 Better control when dumping import state 2012-04-29 17:58:24 +10:00
Victor Stinner fe98e2fc83 Issue #14428: Use the new time.perf_counter() and time.process_time() functions
* Replace "time.clock on windows, or time.time" with time.perf_counter()
 * profile module: only use time.process_time() instead of trying different
   functions providing the process time
 * timeit module: use time.perf_counter() by default, time.time() and
   time.clock() can still be used using --time and --clock options
 * pybench program: use time.perf_counter() by default, add support for
   the new time.process_time() and time.perf_counter() functions, but stay
   backward compatible. Use also time.get_clock_info() to display information
   of the timer.
2012-04-29 03:01:20 +02:00
Benjamin Peterson 0e1a5b49cf use wfile api 2012-04-27 11:56:30 -04:00
Martin v. Loewis cfc1cc2996 Issue #14642: Add "hg touch" extension, and "make touch" target. 2012-04-27 16:10:21 +02:00
Brian Curtin 790a9b4c19 Add a missing close paren 2012-04-25 23:38:05 -05:00
Brian Curtin ae7758457f Fix #3561. Add an option to place the Python installation into the Windows Path environment variable. 2012-04-25 08:12:37 -05:00
Nick Coghlan d0bb6aa275 Start a shared utility script for poking around at the import internals 2012-04-25 22:17:54 +10:00
Benjamin Peterson 7d95e40721 Implement PEP 412: Key-sharing dictionaries (closes #13903)
Patch from Mark Shannon.
2012-04-23 11:24:50 -04:00
R David Murray ea169801e1 #14508: make gprof2html script runnable under python3
Not that I haven't tested it to make sure it works, just that it
can run against an empty source file.

Initial patch by Popa.Claudiu.

Here we also add a test (which uses mock, which is why I didn't
check it in on 3.2).
2012-04-11 15:17:37 -04:00
R David Murray 776c0df42b #14508: make gprof2html script runnable under python3
Not that I haven't tested it to make sure it works, just that it
can run against an empty source file.

Initial patch by Popa.Claudiu.
2012-04-11 15:16:38 -04:00
Georg Brandl a51497ab86 Merge 3.2.3 release clone. 2012-04-11 12:46:24 +02:00
Antoine Pitrou b547d395ab Update description of benchmarks and mention the benchmarks repo 2012-04-09 17:06:44 +02:00
Antoine Pitrou d6aa5b30dd Fix whitespace 2012-04-09 17:04:14 +02:00
Antoine Pitrou 1584ae3987 Issue #13165: stringbench is now available in the Tools/stringbench folder.
It used to live in its own SVN project.
2012-04-09 17:03:32 +02:00
R David Murray 3861a322b9 Merge #14492: fix some bugs in Tools/scripts/pdeps.py.
Initial patch by Popa Claudiu.
2012-04-05 23:01:13 -04:00
R David Murray d3af6344ef #14492: fix some bugs in Tools/scripts/pdeps.py.
Initial patch by Popa Claudiu.
2012-04-05 22:59:13 -04:00
R David Murray ce9806215b Merge #14490, #14491: add 'sundry'-style import tests for Tools/scripts.
This patch changes a few of the scripts to have __name__=='__main__'
clauses so that they are importable without running.  Also fixes the
syntax errors revealed by the tests.
2012-04-04 21:29:03 -04:00
R David Murray 54ac832a24 #14490, #14491: add 'sundry'-style import tests for Tools/scripts.
This patch changes a few of the scripts to have __name__=='__main__'
clauses so that they are importable without running.  Also fixes the
syntax errors revealed by the tests.
2012-04-04 21:28:14 -04:00
Martin v. Löwis 8dbbae990c Add _decimal and _testbuffer modules. 2012-04-01 19:55:48 +02:00
Georg Brandl c0fdf6cf7a Closes #14421: use with statement to properly close socket in bandwidth test. 2012-03-27 07:43:53 +02:00
Martin v. Löwis a7f6b14fa6 Add 3.2.3rc2 uuid. 2012-03-18 20:39:19 +01:00
Matthias Klose 5ce31cc4fc merge 3.2 2012-03-14 23:17:31 +01:00
Ross Lagerwall 6c52c5755f Modify patchcheck.py to check for changes to configure.in.
It now reports if configure and pyconfig.h.in weren't regenerated but
configure.in was changed.
2012-03-11 19:21:07 +02:00
Martin v. Löwis 0119e4753e Remove uuids, as they are now computed. 2012-03-06 17:54:06 +01:00
Martin v. Löwis 41add01317 Use hg manifest to compute list of library files to include. 2012-03-06 17:53:12 +01:00
Martin v. Löwis f2f592d1b9 Generate product code UUID from download URL. 2012-03-04 19:48:25 +01:00
Martin v. Löwis 3d4809f464 Package mime.types 2012-02-25 10:40:13 +01:00
Nadeem Vawda 6721149501 Merge: #14053: Fix "make patchcheck" to work with MQ.
Patch by Francisco Martín Brugué
2012-02-22 11:53:09 +02:00
Nadeem Vawda 9f64f73193 Issue #14053: Fix "make patchcheck" to work with MQ.
Patch by Francisco Martín Brugué
2012-02-22 11:46:41 +02:00
Benjamin Peterson c9f54cf512 enable hash randomization by default 2012-02-21 16:08:05 -05:00
Martin v. Löwis 6ca5a4d49f Issue #12406: Update list of files. 2012-02-21 19:54:26 +01:00
Martin v. Löwis 61f996b26a Issue #12406: prevent case where shortened name could conflict with short name. 2012-02-21 18:49:10 +01:00
Martin v. Löwis dc4170c5bc merge 2.6 2012-02-21 18:07:58 +01:00
Martin v. Löwis dbd3f6173a Issue #6807: Run msisupport.mak earlier. 2012-02-21 18:06:22 +01:00
Martin v. Löwis f9caee9ab4 merge 3.2 2012-02-21 17:26:10 +01:00
Martin v. Löwis 26bb3cf7cd Issue #10580: Minor grammar change in Windows installer. 2012-02-21 17:23:55 +01:00
Benjamin Peterson 71f660e00f update to Unicode 6.1 2012-02-20 22:24:29 -05:00
Georg Brandl 2fb477c0f0 Merge 3.2: Issue #13703 plus some related test suite fixes. 2012-02-21 00:33:36 +01:00
Benjamin Peterson ad9c569825 delta encoding of upper/lower/title makes a glorious return (#12736) 2012-01-15 21:19:20 -05:00
Benjamin Peterson d5890c8db5 add str.casefold() (closes #13752) 2012-01-14 13:23:30 -05:00
Victor Stinner d208416a40 Issue #13628: python-gdb.py is now able to retrieve more frames in the Python
traceback if Python is optimized.

 * delay the lookup of the size_t type, it is not available at startup
 * The second argument of the PyFrameObjectPtr constructor is optional, as
   done in other constructors
 * iter_builtins() and iter_globals() methods of PyFrameObjectPtr returns
   an empty tuple instead of None if Python is optimized
 * Fix py-bt and py-bt-full to handle correctly "optimized" frames
 * Frame.get_pyop() tries to get the frame pointer from PyEval_EvalCodeEx()
   if the pointer is optimized out in PyEval_EvalFrameEx()
2011-12-19 13:42:24 +01:00
Benjamin Peterson b2bf01d824 use full unicode mappings for upper/lower/title case (#12736)
Also broaden the category of characters that count as lowercase/uppercase.
2012-01-11 18:17:06 -05:00
Victor Stinner d974393419 (Merge 3.2) Issue #13628: python-gdb.py is now able to retrieve more frames in
the Python traceback if Python is optimized.

 * delay the lookup of the size_t type, it is not available at startup
 * The second argument of the PyFrameObjectPtr constructor is optional, as
   done in other constructors
 * iter_builtins() and iter_globals() methods of PyFrameObjectPtr returns
   an empty tuple instead of None if Python is optimized
 * Fix py-bt and py-bt-full to handle correctly "optimized" frames
 * Frame.get_pyop() tries to get the frame pointer from PyEval_EvalCodeEx()
   if the pointer is optimized out in PyEval_EvalFrameEx()
2011-12-19 13:47:10 +01:00
Victor Stinner 8f23be7189 iobench.py: add more info in the header
Write the Python version, Unicode implementation and the platform.
2011-12-18 21:38:51 +01:00
Antoine Pitrou ca2a1a335a Fix test_gdb failure 2011-12-12 19:18:24 +01:00
Florent Xicluna aa6c1d240f Issue #13575: there is only one class type. 2011-12-12 18:54:29 +01:00
Victor Stinner 0c4fbff6a7 libpython.py: defer call to gdb.lookup_type('PyUnicodeObject')
The lookup fails at startup if Python is linked to a shared library.
2011-12-08 00:08:22 +01:00
Nadeem Vawda 3ff069ebc6 Issue #6715: Add module for compression using the LZMA algorithm. 2011-11-30 00:25:06 +02:00
Victor Stinner f16a350baf Oops, really fix gdb/libpython.py for not ready Unicode strings 2011-11-04 22:34:01 +01:00
Victor Stinner e30c0a1014 Fix gdb/libpython.py for not ready Unicode strings
_PyUnicode_CheckConsistency() checks also hash and length value for not ready
Unicode strings.
2011-11-04 20:54:05 +01:00
Ezio Melotti 931b8aac80 #12753: Add support for Unicode name aliases and named sequences. 2011-10-21 21:57:36 +03:00
Antoine Pitrou 760531a494 Fix a missing encoding argument when opening a text file in some of iobench's subtests.
(found by Georg)
2011-10-08 19:40:22 +02:00
Antoine Pitrou 74472a94aa Fix a missing encoding argument when opening a text file in some of iobench's subtests.
(found by Georg)
2011-10-08 19:40:04 +02:00
Antoine Pitrou 3c0c5f29dd Fix test_gdb following the small unicode struct change in c25262e97304 (issue #13130) 2011-10-08 19:33:24 +02:00
Ezio Melotti a9860aeb08 #13054: fix usage of sys.maxunicode after PEP-393. 2011-10-04 19:06:00 +03:00
Victor Stinner a3b334da6d PyUnicode_Ready() now sets ascii=1 if maxchar < 128
ascii=1 is no more reserved to PyASCIIObject. Use
PyUnicode_IS_COMPACT_ASCII(obj) to check if obj is a PyASCIIObject (as before).
2011-10-03 13:53:37 +02:00
Antoine Pitrou 87ae0a2804 Backout of changeset 228fd2bd83a5 by Nadeem Vawda in branch 'default':
Issue #12804: Prevent "make test" from using network resources.
2011-10-01 16:41:48 +02:00
Ezio Melotti 2a1e926d63 Fix ResourceWarnings in makeunicodedata.py. 2011-09-30 08:46:25 +03:00
Martin v. Löwis 24fa9832be Update for PEP 393. 2011-09-28 08:35:25 +02:00
Martin v. Löwis d63a3b8beb Implement PEP 393. 2011-09-28 07:41:54 +02:00
Martin v. Löwis 2c2d2aedd5 Merge with 3.2 2011-09-05 00:17:49 +02:00
Martin v. Löwis 73abc24345 Add 3.2.2 and 3.2.3 UUIDs. 2011-09-05 00:14:09 +02:00
Nadeem Vawda 08aa3c0235 Issue #12804: Prevent "make test" from using network resources. 2011-08-21 16:41:03 +02:00
Antoine Pitrou 7f0a6ddb90 Use -n for tests under Windows 2011-08-16 20:02:26 +02:00
Éric Araujo 147cd508bc Merge 3.2 2011-08-12 19:53:13 +02:00
Éric Araujo 1bf5b6a454 Update crlf and lfcr scripts for 3.x bytes semantics (#12032).
Changes to crlf originally by Victor Stinner for 3.3, copied to lfcr by
me.  Manually tested.
2011-08-12 19:40:05 +02:00
Éric Araujo f04488e2ba Merge 3.2 2011-08-12 18:03:30 +02:00
Éric Araujo fbc5ff6235 patchcheck: don’t talk about the test suite when no code file were changed.
The line about the test suite will still get printed for changes in
Tools for example, which aren’t covered by the test suite, but it’s not
a big deal IMO.
2011-08-12 17:50:08 +02:00
Jason R. Coombs 88bf51baff Corrected attribute docstring per pep-257 (reference #10639) 2011-08-02 08:19:31 -04:00
Nadeem Vawda 328b5015a2 Clean up description of Tools/scripts/run_tests.py.
Also, add an entry for the script in Tools/scripts/README.
2011-08-02 10:16:45 +02:00
Nadeem Vawda 3c01d16ed9 Issue #11651: Move options for running tests into a Python script.
This will be particularly useful to Windows users.

run_tests.py originally written by Brett Cannon.
2011-08-01 23:48:26 +02:00
Éric Araujo 56ec5fe950 Small cleanup 2011-07-31 18:41:25 +02:00
Éric Araujo ad548b8534 Merge fixes for #9860, #11104/#8688 and #12331 from 3.2 2011-07-31 18:33:00 +02:00
Éric Araujo a3e072bb89 Let “make patchcheck” work for out-of-dir builds (#9860) 2011-07-30 21:34:04 +02:00
Jason R. Coombs 947fed42b8 Merge fix for reindent.py 2011-07-29 09:32:25 -04:00
Jason R. Coombs 47891044c9 Issue #10639: spec_newline wasn't defined globally unless main() was called; now spec_newline is set at module import/execution 2011-07-29 09:31:56 -04:00
Éric Araujo 2527796a22 Merge from 3.2 (#10318, #12255, #12043, #12417 and other fixes) 2011-07-29 03:11:09 +02:00
Éric Araujo 9e1af03fbb Branch merge.
I moved the NEWS entry for the reindent fix to the right release section.
2011-07-26 18:25:14 +02:00
Éric Araujo a0e92a8028 Fix missing or wrong shebangs and missing executable bits for scripts (#10318) 2011-07-26 18:01:08 +02:00
Jason R. Coombs 76eec3db21 Issue #10639: reindent.py tool now accepts a --newline option to specify the newline to be used in the output of converted files. 2011-07-26 11:38:04 -04:00
Jason R. Coombs 1322bd4971 Merge with 3.2 Issue #10639: reindent.py should not convert newlines.
reindent.py now will use the newline detected in the original file and will report an error if mixed newlines are encountered.
2011-07-26 11:57:08 -04:00
Éric Araujo 1ce7b17165 Fix string exception and a few style issues in mailerdaemon script 2011-07-26 17:36:19 +02:00
Jason R. Coombs 76748b7033 Fixes #10639: reindent.py should not convert newlines
reindent.py now will use the newline detected in the original file and will report an error if mixed newlines are encountered.
2011-07-26 11:18:40 -04:00
Vinay Sajip 4334d740ed Issue #12406: Added upates for packaging's .exe files, command_template, and sysconfig.cfg. 2011-07-03 10:35:41 +01:00
Victor Stinner c9e07a3ec8 (merge 3.2) libpython.py (gdb) now catchs IOError in py-list and py-bt commands
py-list displays the error. py-bt ignores the error (the filename and line
number is already displayed).
2011-07-01 12:59:30 +02:00
Victor Stinner d57c5c8a3a libpython.py (gdb) now catchs IOError in py-list and py-bt commands
py-list displays the error. py-bt ignores the error (the filename and line
number is already displayed).
2011-07-01 12:57:44 +02:00
Benjamin Peterson 4177eff088 general cleaning up 2011-06-27 18:25:06 -05:00
Benjamin Peterson fbf528f06c remove svn support 2011-06-27 17:59:45 -05:00
R David Murray 6a73845082 #11781: update windows build script to account for move of email tests 2011-06-18 11:45:59 -04:00
Éric Araujo 9f0df8bdb8 Remove wsgiref.egg-info from msi.py (follow-up to d615eb7bce33, #12218) 2011-06-06 17:08:41 +02:00
Martin v. Löwis e8583e94e6 Drop old UUIDs. 2011-06-05 20:43:30 +02:00
Martin v. Löwis 40b408d455 merge:Do not add txt files twice 2011-06-05 19:43:56 +02:00
Martin v. Löwis 63660ce214 merge:Do not add txt files twice 2011-06-05 19:42:21 +02:00
Martin v. Löwis 4c226dac02 Do not add txt files twice. 2011-06-05 10:55:57 +02:00
Benjamin Peterson 8c6f88efa2 remove __version__s dependent on subversion keyword expansion (closes #12221) 2011-05-31 20:52:17 -05:00
Éric Araujo f46676d48f Branch merge 2011-05-26 16:35:14 +02:00
Éric Araujo 0f67a99fc9 Branch merge 2011-05-25 18:22:11 +02:00
Victor Stinner c520a1856f (Merge 3.2) Issue #12057: Add cjkencodings directory to the Makefile and
Tools/msi/msi.py
2011-05-25 01:16:49 +02:00
Victor Stinner 5b3265906f (Merge 3.1) Issue #12057: Add cjkencodings directory to the Makefile and
Tools/msi/msi.py
2011-05-25 01:15:59 +02:00
Victor Stinner 46f8264b8e Issue #12057: Add cjkencodings directory to the Makefile and Tools/msi/msi.py 2011-05-25 01:13:59 +02:00
Martin v. Löwis abe38da6a4 merged 2011-05-23 07:04:05 +02:00
Martin v. Löwis ad234203dd Add 3.2.1rc2 uuid. 2011-05-23 07:02:07 +02:00
Martin v. Loewis b042a3ac0c Add 3.2.1rc2 uuid. 2011-05-22 12:59:35 +02:00
Georg Brandl fb2473fc8b Merge 3.2.1rc1 release changes to default. 2011-05-21 19:43:36 +02:00
Georg Brandl 9c1928f0a9 Merge release branch after 3.2.1rc1. 2011-05-21 17:35:33 +02:00
Tarek Ziade 1231a4e097 initial import of the packaging package in the standard library 2011-05-19 13:07:25 +02:00
Victor Stinner 118ed71afe (Merge 3.2) Issue #11614: import __hello__ prints "Hello World!". Patch written
by Andreas Stührk.
2011-05-16 16:35:35 +02:00
Victor Stinner 9cd6626f3d (Merge 3.1) Issue #11614: import __hello__ prints "Hello World!". Patch written
by Andreas Stührk.
2011-05-16 16:32:33 +02:00
Victor Stinner c77b931196 Issue #11614: import __hello__ prints "Hello World!". Patch written by Andreas
Stührk.
2011-05-16 16:29:35 +02:00
Martin v. Löwis 41972316f5 Add 3.2.1 UUIDs 2011-05-16 07:56:32 +02:00
Victor Stinner c729c25615 (Merge 3.2) Issue #11996: libpython (gdb), replace "py-bt" command by
"py-bt-full" and add a smarter "py-bt" command printing a classic Python
traceback.
2011-05-13 17:53:22 +02:00
Victor Stinner e670c889cc Issue #11996: libpython (gdb), replace "py-bt" command by "py-bt-full" and add
a smarter "py-bt" command printing a classic Python traceback.
2011-05-13 17:40:15 +02:00
Victor Stinner 6348f0ecdd Close #12032: Fix scripts/crlf.py for Python 3 2011-05-09 01:29:30 +02:00
Éric Araujo 1e794f66f4 Remove obsolete 'rU' mode in Tools/scripts too (see be5b8d1ded34) 2011-05-05 20:18:16 +02:00
Jesus Cea b32321aed9 pybench prep_times calculation error (closes #11895) 2011-04-25 03:25:37 +02:00
Jesus Cea 8f14bbdaf6 pybench prep_times calculation error (closes #11895) 2011-04-25 03:24:08 +02:00
Brian Curtin 8e4f4feb62 Merge 3.1 2011-04-13 16:11:37 -05:00
Brian Curtin b4fb909c86 Remove inexistent tools 2011-04-13 16:04:27 -05:00
Antoine Pitrou 9eea9d39c1 In the Windows clean script for buildbots, also clear the build dir
(so that stale test files, which can be very large, get wiped out)
2011-03-26 21:15:47 +01:00
Ezio Melotti 3b3499ba69 #11565: Merge with 3.1. 2011-03-16 11:35:38 +02:00
Ezio Melotti 13925008dc #11565: Fix several typos. Patch by Piotr Kasprzyk. 2011-03-16 11:05:33 +02:00
Ezio Melotti 4969f709cc #11515: Merge with 3.1. 2011-03-15 05:59:46 +02:00
Ezio Melotti 42da663e6f #11515: fix several typos. Patch by Piotr Kasprzyk. 2011-03-15 05:18:48 +02:00
Antoine Pitrou 375ff587c2 Issue #11179: Make ccbench work under Python 3.1 and 2.7 again. 2011-03-11 20:57:11 +01:00
Georg Brandl 49857f8a93 Add updated .hgeol file and fix newlines in the 3.2 branch. 2011-03-05 15:11:35 +01:00
Georg Brandl 5537d298ea Add updated .hgeol file and fix newlines in the 3.1 branch. 2011-03-05 15:10:38 +01:00
Martin v. Löwis 6916806443 Issue #11135: Remove redundant doc field from PyType_Spec.
Reviewed by Georg Brandl.
2011-02-11 20:47:49 +00:00
Martin v. Löwis dafdd7f8ca Add uuid for 3.2rc3. 2011-02-11 20:44:40 +00:00
Antoine Pitrou 0f2a61a11e Merged revisions 88147 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88147 | antoine.pitrou | 2011-01-23 18:12:25 +0100 (dim., 23 janv. 2011) | 3 lines

  Issue #10987: Fix the recursion limit handling in the _pickle module.
........
2011-01-23 17:21:28 +00:00
Antoine Pitrou e6d4c5bab8 Issue #10987: Fix the recursion limit handling in the _pickle module. 2011-01-23 17:12:25 +00:00
Martin v. Löwis 678fa9f5a9 Package zip_cp437_header.zip.
Don't try to package subprocessdata/*.py twice.
2011-01-15 19:43:18 +00:00
Antoine Pitrou 126c8b4a82 Avoid ResourceWarnings in ccbench 2011-01-15 11:39:23 +00:00
Michael Foord 751ba4cfac Update description of Tools/unicode 2011-01-03 19:13:02 +00:00
Michael Foord 32e1d8340c Enable unittest.TestCase to be instantiated without providing a method name.
Changed unittestgui to show number of discovered tests in the status bar.
2011-01-03 17:00:11 +00:00
Michael Foord 90efac7f37 Issue 10502: addition of unittestgui to Tools/ 2011-01-03 15:39:49 +00:00
Georg Brandl 81f3d7bcd0 Update README, remove empty directory. 2010-12-30 22:32:49 +00:00
Georg Brandl 856898b395 Harmonize docstrings. Move redemo from Tools/scripts to Tools/demo. Add a README file to Tools/demo. 2010-12-30 22:11:50 +00:00
Georg Brandl 7fafbc95c0 More cleanup: Move some demos into a dedicated Tools/demo dir, move 2to3 demo to Tools, and remove all the other Demo content. 2010-12-30 21:33:07 +00:00
Georg Brandl 30baf2b0ed Fix NameErrors. 2010-12-30 17:36:17 +00:00
Georg Brandl 5684a9ac30 Clean up tools: remove "world" and "framer", move single SSL script to scripts/. 2010-12-30 17:32:22 +00:00
Georg Brandl 4cf83f4d12 Remove some of the old demos. (Put a few somewhere else.) 2010-12-30 17:22:33 +00:00
Martin v. Löwis 0e74cacdff Upgrade to sqlite3 3.7.4. 2010-12-17 21:04:09 +00:00
Martin v. Löwis 910a4edbcd Upgrade Tcl/Tk to 8.5.9. 2010-12-17 20:43:27 +00:00
R. David Murray 39f34aa1f3 Turn on regrtest -W (rerun immediately) option for Windows, too. 2010-12-14 02:25:43 +00:00
Gregory P. Smith 51ee270876 issue7213: Open the pipes used by subprocesses with the FD_CLOEXEC flag from
the C code, using pipe2() when available.  Adds unittests for close_fds and
cloexec behaviors.
2010-12-13 07:59:39 +00:00
Martin v. Löwis d53ee5dd12 Automate build for python3.dll.
Package missing files.
2010-12-05 23:07:58 +00:00
Martin v. Löwis 4d0d471a80 Merge branches/pep-0384. 2010-12-03 20:14:31 +00:00
Alexander Belopolsky 73f382de1c Issue #9598: untabify.py will now respect encoding cookie in the files it processes 2010-11-30 17:30:43 +00:00
Alexander Belopolsky 827fdaae30 Issue #10552: Partially fixed a sort error in Tools/unicode/gencodec.py 2010-11-30 16:56:15 +00:00
Georg Brandl f55aa80b37 Merged revisions 85820,85823,85825,85840,85843-85845,85849-85851,85855,85867,85875,85907-85908,85911,85914 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r85820 | georg.brandl | 2010-10-24 16:20:22 +0200 (So, 24 Okt 2010) | 1 line

  Remove usage of exception indexing.
........
  r85823 | georg.brandl | 2010-10-24 16:32:45 +0200 (So, 24 Okt 2010) | 1 line

  Fix style.
........
  r85825 | georg.brandl | 2010-10-24 17:16:02 +0200 (So, 24 Okt 2010) | 1 line

  Add documentation about the default warnings filters.
........
  r85840 | georg.brandl | 2010-10-25 19:50:20 +0200 (Mo, 25 Okt 2010) | 1 line

  #3018: tkinter demo fixes for py3k.
........
  r85843 | georg.brandl | 2010-10-26 08:59:23 +0200 (Di, 26 Okt 2010) | 1 line

  Markup fix.
........
  r85844 | georg.brandl | 2010-10-26 12:39:14 +0200 (Di, 26 Okt 2010) | 1 line

  Work a bit more on tkinter demos.
........
  r85845 | georg.brandl | 2010-10-26 12:42:16 +0200 (Di, 26 Okt 2010) | 1 line

  faqwiz is removed.
........
  r85849 | georg.brandl | 2010-10-26 21:31:06 +0200 (Di, 26 Okt 2010) | 1 line

  #10200: typo.
........
  r85850 | georg.brandl | 2010-10-26 21:58:11 +0200 (Di, 26 Okt 2010) | 1 line

  #10200: typo.
........
  r85851 | georg.brandl | 2010-10-26 22:12:37 +0200 (Di, 26 Okt 2010) | 1 line

  Fix import.
........
  r85855 | georg.brandl | 2010-10-27 09:21:54 +0200 (Mi, 27 Okt 2010) | 1 line

  Encoding fix.
........
  r85867 | georg.brandl | 2010-10-27 22:01:51 +0200 (Mi, 27 Okt 2010) | 1 line

  Add David.
........
  r85875 | georg.brandl | 2010-10-28 10:38:30 +0200 (Do, 28 Okt 2010) | 1 line

  Fix bytes/str issues in get-remote-certificate.py.
........
  r85907 | georg.brandl | 2010-10-29 06:54:13 +0200 (Fr, 29 Okt 2010) | 1 line

  #10222: fix for overzealous AIX compiler.
........
  r85908 | georg.brandl | 2010-10-29 07:22:17 +0200 (Fr, 29 Okt 2010) | 1 line

  send_bytes obviously needs bytes...
........
  r85911 | georg.brandl | 2010-10-29 07:36:28 +0200 (Fr, 29 Okt 2010) | 1 line

  Fix markup error and update false positive entries from "make suspicious".
........
  r85914 | georg.brandl | 2010-10-29 08:17:38 +0200 (Fr, 29 Okt 2010) | 1 line

  (?:...) is a non-capturing, but still grouping construct.
........
2010-11-26 08:59:40 +00:00