summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merged revisions 76149 via svnmerge fromAntoine Pitrou2009-11-081-0/+2
| | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76149 | antoine.pitrou | 2009-11-08 01:30:04 +0100 (dim., 08 nov. 2009) | 11 lines Merged revisions 76148 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76148 | antoine.pitrou | 2009-11-08 01:24:12 +0100 (dim., 08 nov. 2009) | 4 lines Kill a small potential leak in test_threading. The leak may not manifest itself if the OS re-uses the same thread ids (I suppose Neal's machine doesn't :-)) ........ ................
* Merged revisions 76146 via svnmerge fromBrett Cannon2009-11-074-2/+32
| | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r76146 | brett.cannon | 2009-11-07 15:55:05 -0800 (Sat, 07 Nov 2009) | 6 lines When trying to write new bytecode, importlib was not catching the IOError thrown if the file happened to be read-only to keep the failure silent. Fixes issue #7187. Thanks, Dave Malcolm for the report and analysis of the problem. ........
* Merged revisions 74638,76133 via svnmerge fromJack Diederich2009-11-062-230/+163
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r74638 | jack.diederich | 2009-09-03 16:37:58 -0400 (Thu, 03 Sep 2009) | 4 lines - apply issue 6582 to test all the write methods of telnetlib - add patch author to ACKS - possibly fix test timeouts on non-linux platforms ........ r76133 | jack.diederich | 2009-11-06 12:20:42 -0500 (Fri, 06 Nov 2009) | 3 lines - issue #6748 intermittent test failures from sockets - telnetlib tests now use mock sockets for most tests ........
* Merged revisions 76119 via svnmerge fromAntoine Pitrou2009-11-053-3/+12
| | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76119 | antoine.pitrou | 2009-11-05 14:49:14 +0100 (jeu., 05 nov. 2009) | 10 lines Merged revisions 76117 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76117 | antoine.pitrou | 2009-11-05 14:42:29 +0100 (jeu., 05 nov. 2009) | 5 lines Issue #7264: Fix a possible deadlock when deallocating thread-local objects which are part of a reference cycle. ........ ................
* Merged revisions 76113-76114 via svnmerge fromBrett Cannon2009-11-052-13/+18
| | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r76113 | brett.cannon | 2009-11-04 17:17:22 -0800 (Wed, 04 Nov 2009) | 3 lines importlib.test.source.util referenced variables in the 'finally' part of a try/finally which may not have been set. ........ r76114 | brett.cannon | 2009-11-04 17:26:57 -0800 (Wed, 04 Nov 2009) | 6 lines Use tempfile.mkdtemp() instead of tempfile.tempdir for where importlib places source files for tests. Allows for concurrent execution of the tests by preventing various executions from trampling each other. Closes issue #7248. ........
* Merged revisions 76103 via svnmerge fromAntoine Pitrou2009-11-041-53/+57
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76103 | antoine.pitrou | 2009-11-04 01:57:15 +0100 (mer., 04 nov. 2009) | 9 lines Merged revisions 76101 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76101 | antoine.pitrou | 2009-11-04 01:50:26 +0100 (mer., 04 nov. 2009) | 3 lines Make test_shutil clean up after itself ........ ................
* Merged revisions 76090 via svnmerge fromAntoine Pitrou2009-11-031-1/+8
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76090 | antoine.pitrou | 2009-11-03 18:20:10 +0100 (mar., 03 nov. 2009) | 9 lines Merged revisions 76086 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76086 | antoine.pitrou | 2009-11-03 17:41:20 +0100 (mar., 03 nov. 2009) | 3 lines Try to make test_wsgiref less fragile against environment changes by other tests ........ ................
* Merged revisions 76088 via svnmerge fromAntoine Pitrou2009-11-031-2/+17
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r76088 | antoine.pitrou | 2009-11-03 18:13:59 +0100 (mar., 03 nov. 2009) | 3 lines Since time.xmlrpc.com is unreliable, add another test to test_xmlrpc_net ........
* Merged revisions 76084 via svnmerge fromMark Dickinson2009-11-031-1/+2
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76084 | mark.dickinson | 2009-11-03 16:29:10 +0000 (Tue, 03 Nov 2009) | 9 lines Merged revisions 76082 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76082 | mark.dickinson | 2009-11-03 16:26:14 +0000 (Tue, 03 Nov 2009) | 1 line Fix doc typo reported by Arfrever. ........ ................
* typo (space-o?)Skip Montanaro2009-11-031-1/+1
|
* Merged revisions 76063,76068 via svnmerge fromBenjamin Peterson2009-11-0210-23/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76063 | benjamin.peterson | 2009-11-02 12:16:28 -0600 (Mon, 02 Nov 2009) | 77 lines Merged revisions 76062 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r76062 | benjamin.peterson | 2009-11-02 12:12:12 -0600 (Mon, 02 Nov 2009) | 70 lines Merged revisions 74359,75081,75088,75213,75278,75303,75427-75428,75734-75736,75865,76059-76061 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r74359 | benjamin.peterson | 2009-08-12 17:23:13 -0500 (Wed, 12 Aug 2009) | 1 line don't pass the deprecated print_function option ........ r75081 | benjamin.peterson | 2009-09-26 22:02:57 -0500 (Sat, 26 Sep 2009) | 1 line let 2to3 work with extended iterable unpacking ........ r75088 | benjamin.peterson | 2009-09-27 11:25:21 -0500 (Sun, 27 Sep 2009) | 1 line look on the type only for __call__ ........ r75213 | benjamin.peterson | 2009-10-03 10:09:46 -0500 (Sat, 03 Oct 2009) | 5 lines revert 75212; it's not correct People can use isinstance(x, collections.Callable) if they expect objects with __call__ in their instance dictionaries. ........ r75278 | benjamin.peterson | 2009-10-07 16:25:56 -0500 (Wed, 07 Oct 2009) | 4 lines fix whitespace problems with fix_idioms #3563 Patch by Joe Amenta. ........ r75303 | benjamin.peterson | 2009-10-09 16:59:11 -0500 (Fri, 09 Oct 2009) | 1 line port latin-1 and utf-8 cookie improvements ........ r75427 | benjamin.peterson | 2009-10-14 20:35:57 -0500 (Wed, 14 Oct 2009) | 1 line force floor division ........ r75428 | benjamin.peterson | 2009-10-14 20:39:21 -0500 (Wed, 14 Oct 2009) | 1 line silence -3 warnings about __hash__ ........ r75734 | benjamin.peterson | 2009-10-26 16:25:53 -0500 (Mon, 26 Oct 2009) | 2 lines warn on map(None, ...) with more than 2 arguments #7203 ........ r75735 | benjamin.peterson | 2009-10-26 16:28:25 -0500 (Mon, 26 Oct 2009) | 1 line remove unused result ........ r75736 | benjamin.peterson | 2009-10-26 16:29:02 -0500 (Mon, 26 Oct 2009) | 1 line using get() here is a bit pointless ........ r75865 | benjamin.peterson | 2009-10-27 15:49:00 -0500 (Tue, 27 Oct 2009) | 1 line explain reason for warning ........ r76059 | benjamin.peterson | 2009-11-02 11:43:47 -0600 (Mon, 02 Nov 2009) | 1 line tuples are no longer used for children ........ r76060 | benjamin.peterson | 2009-11-02 11:55:40 -0600 (Mon, 02 Nov 2009) | 1 line revert r76059; apparently some fixers rely on Leaf no () for children ........ r76061 | benjamin.peterson | 2009-11-02 12:06:17 -0600 (Mon, 02 Nov 2009) | 1 line make fix_tuple_params keep the tree valid #7253 ........ ................ ................ r76068 | benjamin.peterson | 2009-11-02 12:30:48 -0600 (Mon, 02 Nov 2009) | 24 lines Merged revisions 76064,76066-76067 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r76064 | benjamin.peterson | 2009-11-02 12:16:36 -0600 (Mon, 02 Nov 2009) | 1 line add space ................ r76066 | benjamin.peterson | 2009-11-02 12:22:53 -0600 (Mon, 02 Nov 2009) | 9 lines Merged revisions 76065 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r76065 | benjamin.peterson | 2009-11-02 12:21:25 -0600 (Mon, 02 Nov 2009) | 1 line don't print stuff in tests ........ ................ r76067 | benjamin.peterson | 2009-11-02 12:24:57 -0600 (Mon, 02 Nov 2009) | 1 line enable test_parser in lib2to3 ................ ................
* Merged revisions 76055 via svnmerge fromAntoine Pitrou2009-11-023-1/+19
| | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76055 | antoine.pitrou | 2009-11-02 12:36:51 +0100 (lun., 02 nov. 2009) | 13 lines Merged revisions 76034,76054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76034 | antoine.pitrou | 2009-11-01 22:29:33 +0100 (dim., 01 nov. 2009) | 3 lines This should finally fix #6896. Let's watch the buildbots. ........ r76054 | antoine.pitrou | 2009-11-02 12:34:27 +0100 (lun., 02 nov. 2009) | 3 lines Since r76034 was successful, add a NEWS entry for it. ........ ................
* reapplied r74493 (after #6665 fix has been backported)Tarek Ziadé2009-11-013-9/+12
|
* Merged revisions 76040 via svnmerge fromAntoine Pitrou2009-11-011-3/+10
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76040 | antoine.pitrou | 2009-11-01 23:13:48 +0100 (dim., 01 nov. 2009) | 9 lines Merged revisions 76037 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76037 | antoine.pitrou | 2009-11-01 23:02:03 +0100 (dim., 01 nov. 2009) | 3 lines Use a custom timeout in test_support.open_urlresource. ........ ................
* Merged revisions 76036 via svnmerge fromAntoine Pitrou2009-11-011-2/+5
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76036 | antoine.pitrou | 2009-11-01 22:43:20 +0100 (dim., 01 nov. 2009) | 9 lines Merged revisions 76033 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76033 | antoine.pitrou | 2009-11-01 22:26:14 +0100 (dim., 01 nov. 2009) | 3 lines test_normalization should skip and not crash when the resource isn't available ........ ................
* Fix exception handling in itertools.izip_longest().Raymond Hettinger2009-11-013-35/+80
|
* Merged revisions 74476 via svnmerge fromGregory P. Smith2009-11-013-2/+13
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r74476 | gregory.p.smith | 2009-08-16 11:58:46 -0700 (Sun, 16 Aug 2009) | 9 lines Merged revisions 74475 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74475 | gregory.p.smith | 2009-08-16 11:52:58 -0700 (Sun, 16 Aug 2009) | 2 lines Issue 6665: Fix fnmatch to properly match filenames with newlines in them. ........ ................
* Merged revisions 76017 via svnmerge fromGregory P. Smith2009-11-012-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76017 | gregory.p.smith | 2009-11-01 10:42:17 -0800 (Sun, 01 Nov 2009) | 18 lines Merged revisions 76000,76016 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76000 | gregory.p.smith | 2009-10-31 14:26:08 -0700 (Sat, 31 Oct 2009) | 7 lines Fixes issue7208 - getpass would still allow the password to be echoed on Solaris due to not flushing the input buffer. This change also incorporates some additional getpass implementation suggestions for security based on an analysis of getpass.c linked to from the issue. ........ r76016 | gregory.p.smith | 2009-11-01 10:33:55 -0800 (Sun, 01 Nov 2009) | 2 lines news entry for r76000 ........ ................
* Merged revisions 76010 via svnmerge fromAntoine Pitrou2009-11-012-2/+2
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r76010 | antoine.pitrou | 2009-11-01 16:59:11 +0100 (dim., 01 nov. 2009) | 3 lines Fix test skipping in multibyte codec tests ........
* Blocked revisions 75997 via svnmergeEric Smith2009-10-310-0/+0
| | | | | | | | | | | | | | | ................ r75997 | eric.smith | 2009-10-31 13:08:48 -0400 (Sat, 31 Oct 2009) | 9 lines Merged revisions 75995 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75995 | eric.smith | 2009-10-31 13:07:17 -0400 (Sat, 31 Oct 2009) | 1 line Improved test for a deprecation warning. ........ ................
* Merged revisions 75988 via svnmerge fromMark Dickinson2009-10-311-2/+10
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75988 | mark.dickinson | 2009-10-31 10:38:43 +0000 (Sat, 31 Oct 2009) | 9 lines Merged revisions 75986 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75986 | mark.dickinson | 2009-10-31 10:36:06 +0000 (Sat, 31 Oct 2009) | 2 lines Issue #7042: Use a better mechanism for testing timers in test_signal. ........ ................
* Merged revisions 75984 via svnmerge fromMark Dickinson2009-10-312-1/+23
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75984 | mark.dickinson | 2009-10-31 10:18:44 +0000 (Sat, 31 Oct 2009) | 12 lines Merged revisions 75982 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75982 | mark.dickinson | 2009-10-31 10:11:28 +0000 (Sat, 31 Oct 2009) | 5 lines Issue #6603: Fix --with-tsc build failures on x86-64 that resulted from a gcc inline assembler peculiarity. (gcc's "A" constraint apparently means 'rax or rdx' in 64-bit mode, not edx:eax or rdx:rax as one might expect.) ........ ................
* Merged revisions 75977 via svnmerge fromMark Dickinson2009-10-311-1/+1
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75977 | mark.dickinson | 2009-10-31 09:39:52 +0000 (Sat, 31 Oct 2009) | 1 line Fix ReST markup. ........
* Merged revisions 75947 via svnmerge fromMark Dickinson2009-10-294-25/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75947 | mark.dickinson | 2009-10-29 12:23:02 +0000 (Thu, 29 Oct 2009) | 20 lines Merged revisions 75943-75945 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75943 | mark.dickinson | 2009-10-29 11:09:09 +0000 (Thu, 29 Oct 2009) | 1 line Fix duplicate test numbers in extra.decTest ........ r75944 | mark.dickinson | 2009-10-29 12:04:00 +0000 (Thu, 29 Oct 2009) | 3 lines Issue #7233: A number of two-argument Decimal methods were failing to accept ints and longs for the second argument. ........ r75945 | mark.dickinson | 2009-10-29 12:11:18 +0000 (Thu, 29 Oct 2009) | 4 lines Issue #7233: Fix Decimal.shift and Decimal.rotate methods for arguments with more digits than the current context precision. Bug reported by Stefan Krah. ........ ................
* Merged revisions 75941 via svnmerge fromMark Dickinson2009-10-292-26/+9
| | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75941 | mark.dickinson | 2009-10-29 09:58:06 +0000 (Thu, 29 Oct 2009) | 11 lines Merged revisions 75939 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75939 | mark.dickinson | 2009-10-29 09:46:04 +0000 (Thu, 29 Oct 2009) | 5 lines Roll back ill-considered attempts to fix printf specifier mismatch for off_t. The sensible solution seems to be to implement %lld for PyString_FromFormat(V) and PyErr_Format. See issue #7228. ........ ................
* Blocked revisions 75937 via svnmergeLars Gustäbel2009-10-290-0/+0
| | | | | | | | | | | | | | | | ................ r75937 | lars.gustaebel | 2009-10-29 10:39:47 +0100 (Thu, 29 Oct 2009) | 10 lines Merged revisions 75935 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75935 | lars.gustaebel | 2009-10-29 10:15:00 +0100 (Thu, 29 Oct 2009) | 3 lines Issue #4750: Store the basename of the original filename in the gzip FNAME header as required by RFC 1952. ........ ................
* Merged revisions 75928 via svnmerge fromBenjamin Peterson2009-10-293-9/+25
| | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75928 | benjamin.peterson | 2009-10-28 16:59:39 -0500 (Wed, 28 Oct 2009) | 5 lines in wide builds, avoid storing high unicode characters from source code with surrogates This is accomplished by decoding with utf-32 instead of utf-16 on all builds. The patch is by Adam Olsen. ........
* Blocked revisions 75710 via svnmergeR. David Murray2009-10-280-0/+0
| | | | | | | | | | | | ........ r75710 | r.david.murray | 2009-10-26 04:24:14 -0400 (Mon, 26 Oct 2009) | 6 lines Make the XMLRCP CGIHandlerTestCase pass like it did before the change of the test to use StringIO instead of a temp file. There may or may not be an underlying problem here, so this patch makes the test function as originally designed until a determination can be made as to whether or not there is an underlying bug here. See issue 7165 for discussion. ........
* Merged revisions 75525,75530,75922 via svnmerge fromR. David Murray2009-10-282-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75525 | r.david.murray | 2009-10-19 12:33:43 -0400 (Mon, 19 Oct 2009) | 12 lines Merged revisions 75524 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75524 | r.david.murray | 2009-10-19 12:28:24 -0400 (Mon, 19 Oct 2009) | 6 lines Eliminate warning message that looks like an error message. When it was added not finding Lib/test in the path indicated something was wrong, but when running regtest using "python -m" Lib/test isn't typically in the path, so this message is now more disturbing than it is helpful. ........ ................ r75530 | r.david.murray | 2009-10-19 14:06:17 -0400 (Mon, 19 Oct 2009) | 10 lines Merged revisions 75528 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75528 | r.david.murray | 2009-10-19 13:53:58 -0400 (Mon, 19 Oct 2009) | 4 lines Clarify error report message, and don't recommend running in verbose mode for more information if we are already running in verbose mode. ........ ................ r75922 | r.david.murray | 2009-10-28 10:07:51 -0400 (Wed, 28 Oct 2009) | 9 lines Merged revisions 75920 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75920 | r.david.murray | 2009-10-28 10:03:43 -0400 (Wed, 28 Oct 2009) | 2 lines Remove variable that is no longer used. ........ ................
* Merged revisions 75911 via svnmerge fromMark Dickinson2009-10-281-1/+1
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75911 | mark.dickinson | 2009-10-28 07:49:26 +0000 (Wed, 28 Oct 2009) | 9 lines Merged revisions 75909 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75909 | mark.dickinson | 2009-10-28 07:47:32 +0000 (Wed, 28 Oct 2009) | 1 line Fix format specifier for MSVC ........ ................
* Merged revisions 75907 via svnmerge fromMark Dickinson2009-10-281-2/+2
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75907 | mark.dickinson | 2009-10-28 07:25:03 +0000 (Wed, 28 Oct 2009) | 9 lines Merged revisions 75905 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75905 | mark.dickinson | 2009-10-28 07:23:49 +0000 (Wed, 28 Oct 2009) | 1 line Replace long long with PY_LONG_LONG ........ ................
* Blocked revisions 75903 via svnmergeTarek Ziadé2009-10-280-0/+0
| | | | | | | | | | | | | | | ................ r75903 | tarek.ziade | 2009-10-28 07:48:27 +0100 (Wed, 28 Oct 2009) | 9 lines Merged revisions 75901 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75901 | tarek.ziade | 2009-10-28 07:45:18 +0100 (Wed, 28 Oct 2009) | 1 line removed spurious spaces ........ ................
* Blocked revisions 75895 via svnmergeTarek Ziadé2009-10-270-0/+0
| | | | | | | | | | | | | | | ................ r75895 | tarek.ziade | 2009-10-28 00:12:01 +0100 (Wed, 28 Oct 2009) | 9 lines Merged revisions 75893 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75893 | tarek.ziade | 2009-10-28 00:06:10 +0100 (Wed, 28 Oct 2009) | 1 line Fixed #1180: Option to ignore ~/.pydistutils.cfg in Distutils ........ ................
* Merged revisions 75890 via svnmerge fromMark Dickinson2009-10-271-1/+0
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75890 | mark.dickinson | 2009-10-27 23:00:56 +0000 (Tue, 27 Oct 2009) | 1 line Remove extra blank line accidentally introduced in r75885 ........
* Merged revisions 75889 via svnmerge fromGeorg Brandl2009-10-271-1/+8
| | | | | | | | | | | | | | | | | svn+ssh://svn.python.org/python/branches/py3k ................ r75889 | georg.brandl | 2009-10-28 00:00:28 +0100 (Mi, 28 Okt 2009) | 9 lines Merged revisions 75887 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75887 | georg.brandl | 2009-10-27 23:56:09 +0100 (Di, 27 Okt 2009) | 1 line Make sure every run of test_intern() interns a new string, otherwise that test fails e.g. when some other test in test_builtin fails and it is rerun in verbose mode. ........ ................
* Merged revisions 75885 via svnmerge fromMark Dickinson2009-10-271-0/+4
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75885 | mark.dickinson | 2009-10-27 22:12:20 +0000 (Tue, 27 Oct 2009) | 9 lines Merged revisions 75883 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75883 | mark.dickinson | 2009-10-27 22:09:33 +0000 (Tue, 27 Oct 2009) | 1 line Test long inputs to float ........ ................
* Merged revisions 75881 via svnmerge fromMark Dickinson2009-10-272-3/+14
| | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75881 | mark.dickinson | 2009-10-27 21:49:48 +0000 (Tue, 27 Oct 2009) | 10 lines Merged revisions 75879 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75879 | mark.dickinson | 2009-10-27 21:48:20 +0000 (Tue, 27 Oct 2009) | 3 lines Silence gcc warnings when trying to print an off_t using "lld", on platforms where off_t has type long (e.g., 64-bit Linux). ........ ................
* Merged revisions 75877 via svnmerge fromGeorg Brandl2009-10-271-0/+2
| | | | | | | | | | svn+ssh://svn.python.org/python/branches/py3k ........ r75877 | georg.brandl | 2009-10-27 22:37:48 +0100 (Di, 27 Okt 2009) | 1 line Only declare variable when it's used. ........
* Blocked revisions 75873 via svnmergeTarek Ziadé2009-10-270-0/+0
| | | | | | | | | | | | | | | ................ r75873 | tarek.ziade | 2009-10-27 22:24:21 +0100 (Tue, 27 Oct 2009) | 9 lines Merged revisions 75871 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75871 | tarek.ziade | 2009-10-27 22:20:27 +0100 (Tue, 27 Oct 2009) | 1 line Issue #7218: Fix test_site for win32 ........ ................
* Blocked revisions 74611,74623,74659,75243 via svnmergeGeorg Brandl2009-10-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ................ r74611 | georg.brandl | 2009-08-31 22:06:09 +0200 (Mo, 31 Aug 2009) | 9 lines Recorded merge of revisions 74608 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74608 | senthil.kumaran | 2009-08-31 18:40:27 +0200 (Mo, 31 Aug 2009) | 3 lines Doc fix for the issue2637. ........ ................ r74623 | georg.brandl | 2009-09-01 10:12:13 +0200 (Di, 01 Sep 2009) | 1 line Remove old news entry that got merged. ................ r74659 | georg.brandl | 2009-09-04 19:13:13 +0200 (Fr, 04 Sep 2009) | 13 lines Recorded merge of revisions 74655-74656 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74655 | chris.withers | 2009-09-04 18:12:32 +0200 (Fr, 04 Sep 2009) | 2 lines Fixes issue #6838: use a list to accumulate the value instead of repeatedly concatenating strings. ........ r74656 | chris.withers | 2009-09-04 18:32:22 +0200 (Fr, 04 Sep 2009) | 1 line news entry matching r74655 ........ ................ r75243 | benjamin.peterson | 2009-10-04 22:19:21 +0200 (So, 04 Okt 2009) | 17 lines Merged revisions 74865,75175,75180 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74865 | georg.brandl | 2009-09-17 02:49:37 -0500 (Thu, 17 Sep 2009) | 1 line #6912: add "with" block support to pindent. ........ r75175 | georg.brandl | 2009-10-01 15:11:14 -0500 (Thu, 01 Oct 2009) | 1 line Fix some weird whitespace and two other overlong lines. ........ r75180 | georg.brandl | 2009-10-01 15:59:31 -0500 (Thu, 01 Oct 2009) | 1 line #7031: Add TestCase.assertIsInstance and negated method. ........ ................
* Merged revisions 75797 via svnmerge fromGeorg Brandl2009-10-2750-239/+376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://svn.python.org/python/branches/py3k ................ r75797 | georg.brandl | 2009-10-27 16:28:25 +0100 (Di, 27 Okt 2009) | 129 lines Merged revisions 75365,75394,75402-75403,75418,75459,75484,75592-75596,75600,75602-75607,75610-75613,75616-75617,75623,75627,75640,75647,75696,75795 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75365 | georg.brandl | 2009-10-11 22:16:16 +0200 (So, 11 Okt 2009) | 1 line Fix broken links found by "make linkcheck". scipy.org seems to be done right now, so I could not verify links going there. ........ r75394 | georg.brandl | 2009-10-13 20:10:59 +0200 (Di, 13 Okt 2009) | 1 line Fix markup. ........ r75402 | georg.brandl | 2009-10-14 17:51:48 +0200 (Mi, 14 Okt 2009) | 1 line #7125: fix typo. ........ r75403 | georg.brandl | 2009-10-14 17:57:46 +0200 (Mi, 14 Okt 2009) | 1 line #7126: os.environ changes *do* take effect in subprocesses started with os.system(). ........ r75418 | georg.brandl | 2009-10-14 20:48:32 +0200 (Mi, 14 Okt 2009) | 1 line #7116: str.join() takes an iterable. ........ r75459 | georg.brandl | 2009-10-17 10:57:43 +0200 (Sa, 17 Okt 2009) | 1 line Fix refleaks in _ctypes PyCSimpleType_New, which fixes the refleak seen in test___all__. ........ r75484 | georg.brandl | 2009-10-18 09:58:12 +0200 (So, 18 Okt 2009) | 1 line Fix missing word. ........ r75592 | georg.brandl | 2009-10-22 09:05:48 +0200 (Do, 22 Okt 2009) | 1 line Fix punctuation. ........ r75593 | georg.brandl | 2009-10-22 09:06:49 +0200 (Do, 22 Okt 2009) | 1 line Revert unintended change. ........ r75594 | georg.brandl | 2009-10-22 09:56:02 +0200 (Do, 22 Okt 2009) | 1 line Fix markup. ........ r75595 | georg.brandl | 2009-10-22 09:56:56 +0200 (Do, 22 Okt 2009) | 1 line Fix duplicate target. ........ r75596 | georg.brandl | 2009-10-22 10:05:04 +0200 (Do, 22 Okt 2009) | 1 line Add a new directive marking up implementation details and start using it. ........ r75600 | georg.brandl | 2009-10-22 13:01:46 +0200 (Do, 22 Okt 2009) | 1 line Make it more robust. ........ r75602 | georg.brandl | 2009-10-22 13:28:06 +0200 (Do, 22 Okt 2009) | 1 line Document new directive. ........ r75603 | georg.brandl | 2009-10-22 13:28:23 +0200 (Do, 22 Okt 2009) | 1 line Allow short form with text as argument. ........ r75604 | georg.brandl | 2009-10-22 13:36:50 +0200 (Do, 22 Okt 2009) | 1 line Fix stylesheet for multi-paragraph impl-details. ........ r75605 | georg.brandl | 2009-10-22 13:48:10 +0200 (Do, 22 Okt 2009) | 1 line Use "impl-detail" directive where applicable. ........ r75606 | georg.brandl | 2009-10-22 17:00:06 +0200 (Do, 22 Okt 2009) | 1 line #6324: membership test tries iteration via __iter__. ........ r75607 | georg.brandl | 2009-10-22 17:04:09 +0200 (Do, 22 Okt 2009) | 1 line #7088: document new functions in signal as Unix-only. ........ r75610 | georg.brandl | 2009-10-22 17:27:24 +0200 (Do, 22 Okt 2009) | 1 line Reorder __slots__ fine print and add a clarification. ........ r75611 | georg.brandl | 2009-10-22 17:42:32 +0200 (Do, 22 Okt 2009) | 1 line #7035: improve docs of the various <method>_errors() functions, and give them docstrings. ........ r75612 | georg.brandl | 2009-10-22 17:52:15 +0200 (Do, 22 Okt 2009) | 1 line #7156: document curses as Unix-only. ........ r75613 | georg.brandl | 2009-10-22 17:54:35 +0200 (Do, 22 Okt 2009) | 1 line #6977: getopt does not support optional option arguments. ........ r75616 | georg.brandl | 2009-10-22 18:17:05 +0200 (Do, 22 Okt 2009) | 1 line Add proper references. ........ r75617 | georg.brandl | 2009-10-22 18:20:55 +0200 (Do, 22 Okt 2009) | 1 line Make printout margin important. ........ r75623 | georg.brandl | 2009-10-23 10:14:44 +0200 (Fr, 23 Okt 2009) | 1 line #7188: fix optionxform() docs. ........ r75627 | fred.drake | 2009-10-23 15:04:51 +0200 (Fr, 23 Okt 2009) | 2 lines add further note about what's passed to optionxform ........ r75640 | neil.schemenauer | 2009-10-23 21:58:17 +0200 (Fr, 23 Okt 2009) | 2 lines Improve some docstrings in the 'warnings' module. ........ r75647 | georg.brandl | 2009-10-24 12:04:19 +0200 (Sa, 24 Okt 2009) | 1 line Fix markup. ........ r75696 | georg.brandl | 2009-10-25 21:25:43 +0100 (So, 25 Okt 2009) | 1 line Fix a demo. ........ r75795 | georg.brandl | 2009-10-27 16:10:22 +0100 (Di, 27 Okt 2009) | 1 line Fix a strange mis-edit. ........ ................
* Merged revisions 75393,75416,75581,75609,75615 via svnmerge fromGeorg Brandl2009-10-277-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://svn.python.org/python/branches/py3k ................ r75393 | georg.brandl | 2009-10-13 18:55:12 +0200 (Di, 13 Okt 2009) | 1 line Update module names in references in the FAQ. ................ r75416 | georg.brandl | 2009-10-14 20:46:15 +0200 (Mi, 14 Okt 2009) | 1 line #7129: add missing function. ................ r75581 | georg.brandl | 2009-10-21 09:17:48 +0200 (Mi, 21 Okt 2009) | 9 lines Merged revisions 75580 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75580 | georg.brandl | 2009-10-21 09:15:59 +0200 (Mi, 21 Okt 2009) | 1 line #7170: fix explanation about non-weakrefable builtin types. ........ ................ r75609 | georg.brandl | 2009-10-22 17:16:26 +0200 (Do, 22 Okt 2009) | 1 line #7137: fix makefile() documentation to match the new parameters. ................ r75615 | georg.brandl | 2009-10-22 18:08:10 +0200 (Do, 22 Okt 2009) | 1 line #6927: fix wrong word. ................
* Merged revisions 75374 via svnmerge fromGeorg Brandl2009-10-2712-0/+5388
| | | | | | | | | | | | | | | | | svn+ssh://svn.python.org/python/branches/py3k ................ r75374 | georg.brandl | 2009-10-11 23:25:26 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75363 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75363 | georg.brandl | 2009-10-11 20:31:23 +0200 (So, 11 Okt 2009) | 1 line Add the Python FAQ lists to the documentation. Copied from sandbox/faq. Many thanks to AMK for the preparation work. ........ ................
* Merged revisions 75373 via svnmerge fromGeorg Brandl2009-10-274-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://svn.python.org/python/branches/py3k ................ r75373 | georg.brandl | 2009-10-11 23:24:34 +0200 (So, 11 Okt 2009) | 17 lines Merged revisions 75370-75372 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75370 | georg.brandl | 2009-10-11 23:10:07 +0200 (So, 11 Okt 2009) | 1 line Move find_recursionlimit.py to Tools/scripts; it is out of place in Misc. ........ r75371 | georg.brandl | 2009-10-11 23:14:37 +0200 (So, 11 Okt 2009) | 1 line Add find_recursionlimit.py to README. ........ r75372 | georg.brandl | 2009-10-11 23:17:14 +0200 (So, 11 Okt 2009) | 1 line Update Misc/README. ........ ................
* Merged revisions ↵Georg Brandl2009-10-2727-596/+624
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74609,74627,74634,74645,74651,74738,74840,75016,75316-75317,75323-75324,75326,75328,75330,75338,75340-75341,75343,75352-75353,75355,75357,75359 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ................ r74609 | senthil.kumaran | 2009-08-31 18:43:45 +0200 (Mo, 31 Aug 2009) | 3 lines Doc fix for issue2637. ................ r74627 | georg.brandl | 2009-09-02 22:31:26 +0200 (Mi, 02 Sep 2009) | 1 line #6819: fix typo. ................ r74634 | georg.brandl | 2009-09-03 14:34:10 +0200 (Do, 03 Sep 2009) | 9 lines Merged revisions 74633 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74633 | georg.brandl | 2009-09-03 14:31:39 +0200 (Do, 03 Sep 2009) | 1 line #6757: complete the list of types that marshal can serialize. ........ ................ r74645 | georg.brandl | 2009-09-04 10:07:32 +0200 (Fr, 04 Sep 2009) | 1 line #5221: fix related topics: SEQUENCEMETHODS[12] doesnt exist any more. ................ r74651 | georg.brandl | 2009-09-04 13:20:54 +0200 (Fr, 04 Sep 2009) | 9 lines Recorded merge of revisions 74650 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74650 | georg.brandl | 2009-09-04 13:19:34 +0200 (Fr, 04 Sep 2009) | 1 line #5101: add back tests to test_funcattrs that were lost during unittest conversion, and make some PEP8 cleanups. ........ ................ r74738 | georg.brandl | 2009-09-09 18:51:05 +0200 (Mi, 09 Sep 2009) | 9 lines Merged revisions 74737 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74737 | georg.brandl | 2009-09-09 18:49:13 +0200 (Mi, 09 Sep 2009) | 1 line Properly document copy and deepcopy as functions. ........ ................ r74840 | georg.brandl | 2009-09-16 18:40:45 +0200 (Mi, 16 Sep 2009) | 13 lines Merged revisions 74838-74839 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74838 | georg.brandl | 2009-09-16 18:22:12 +0200 (Mi, 16 Sep 2009) | 1 line Remove some more boilerplate from the actual tests in test_pdb. ........ r74839 | georg.brandl | 2009-09-16 18:36:39 +0200 (Mi, 16 Sep 2009) | 1 line Make the pdb displayhook compatible with the standard displayhook: do not print Nones. Add a test for that. ........ ................ r75016 | georg.brandl | 2009-09-22 15:53:14 +0200 (Di, 22 Sep 2009) | 1 line #6969: make it explicit that configparser writes/reads text files, and fix the example. ................ r75316 | georg.brandl | 2009-10-10 23:12:35 +0200 (Sa, 10 Okt 2009) | 9 lines Merged revisions 75313 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75313 | georg.brandl | 2009-10-10 23:07:35 +0200 (Sa, 10 Okt 2009) | 1 line Bring old demo up-to-date. ........ ................ r75317 | georg.brandl | 2009-10-10 23:13:21 +0200 (Sa, 10 Okt 2009) | 9 lines Merged revisions 75315 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75315 | georg.brandl | 2009-10-10 23:10:05 +0200 (Sa, 10 Okt 2009) | 1 line Remove unneeded "L" suffixes. ........ ................ r75323 | georg.brandl | 2009-10-10 23:48:05 +0200 (Sa, 10 Okt 2009) | 9 lines Recorded merge of revisions 75321 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75321 | georg.brandl | 2009-10-10 23:43:21 +0200 (Sa, 10 Okt 2009) | 1 line Remove outdated comment and fix a few style issues. ........ ................ r75324 | georg.brandl | 2009-10-10 23:49:24 +0200 (Sa, 10 Okt 2009) | 9 lines Merged revisions 75322 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75322 | georg.brandl | 2009-10-10 23:47:31 +0200 (Sa, 10 Okt 2009) | 1 line Show use of range() step argument nicely. ........ ................ r75326 | georg.brandl | 2009-10-10 23:57:03 +0200 (Sa, 10 Okt 2009) | 9 lines Merged revisions 75325 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75325 | georg.brandl | 2009-10-10 23:55:11 +0200 (Sa, 10 Okt 2009) | 1 line Modernize factorisation demo (mostly augassign.) ........ ................ r75328 | georg.brandl | 2009-10-11 00:05:26 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75327 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75327 | georg.brandl | 2009-10-11 00:03:43 +0200 (So, 11 Okt 2009) | 1 line Style fixes. ........ ................ r75330 | georg.brandl | 2009-10-11 00:32:28 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75329 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75329 | georg.brandl | 2009-10-11 00:26:45 +0200 (So, 11 Okt 2009) | 1 line Modernize all around (dont ask me how useful that script is nowadays...) ........ ................ r75338 | georg.brandl | 2009-10-11 10:31:41 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75337 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75337 | georg.brandl | 2009-10-11 10:18:44 +0200 (So, 11 Okt 2009) | 1 line Update morse script, avoid globals, use iterators. ........ ................ r75340 | georg.brandl | 2009-10-11 10:42:09 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75339 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75339 | georg.brandl | 2009-10-11 10:39:16 +0200 (So, 11 Okt 2009) | 1 line Update markov demo. ........ ................ r75341 | georg.brandl | 2009-10-11 10:43:08 +0200 (So, 11 Okt 2009) | 1 line Fix README description. ................ r75343 | georg.brandl | 2009-10-11 10:46:56 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75342 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75342 | georg.brandl | 2009-10-11 10:45:03 +0200 (So, 11 Okt 2009) | 1 line Remove useless script "mkrcs" and update README. ........ ................ r75352 | georg.brandl | 2009-10-11 14:04:10 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75350 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75350 | georg.brandl | 2009-10-11 14:00:18 +0200 (So, 11 Okt 2009) | 1 line Use getopt in script.py demo. ........ ................ r75353 | georg.brandl | 2009-10-11 14:04:40 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75351 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75351 | georg.brandl | 2009-10-11 14:03:01 +0200 (So, 11 Okt 2009) | 1 line Fix variable. ........ ................ r75355 | georg.brandl | 2009-10-11 16:27:51 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75354 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75354 | georg.brandl | 2009-10-11 16:23:49 +0200 (So, 11 Okt 2009) | 1 line Update lpwatch script. ........ ................ r75357 | georg.brandl | 2009-10-11 16:50:57 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75356 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75356 | georg.brandl | 2009-10-11 16:49:37 +0200 (So, 11 Okt 2009) | 1 line Remove ftpstats script, the daemon whose log files it reads is long gone. ........ ................ r75359 | georg.brandl | 2009-10-11 17:56:06 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75358 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75358 | georg.brandl | 2009-10-11 17:06:44 +0200 (So, 11 Okt 2009) | 1 line Overhaul of Demo/xml. ........ ................
* Blocked revisions ↵Georg Brandl2009-10-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74461,74528,74577,74580,74703,74743,74826,74939,75086,75093,75118,75173,75198,75242,75244-75245,75306,75311,75369,75435,75439,75448,75508,75512,75622,75652,75656,75661,75665,75668,75673,75676,75719,75721,75723,75733,75740,75744,75746,75834,75845,75847 via svnmerge ................ r74461 | benjamin.peterson | 2009-08-15 16:08:53 +0200 (Sa, 15 Aug 2009) | 8 lines Blocked revisions 74445 via svnmerge ........ r74445 | vinay.sajip | 2009-08-14 06:33:54 -0500 (Fri, 14 Aug 2009) | 1 line Added versionchanged notices for optional 'delay' parameter to file handler classes. ........ ................ r74528 | tarek.ziade | 2009-08-20 23:25:41 +0200 (Do, 20 Aug 2009) | 8 lines Blocked revisions 74503 via svnmerge ........ r74503 | tarek.ziade | 2009-08-18 10:21:49 +0200 (Tue, 18 Aug 2009) | 1 line fixed typo ........ ................ r74577 | mark.dickinson | 2009-08-28 23:04:57 +0200 (Fr, 28 Aug 2009) | 8 lines Blocked revisions 74575 via svnmerge ........ r74575 | mark.dickinson | 2009-08-28 21:46:24 +0100 (Fri, 28 Aug 2009) | 1 line Silence gcc 'comparison always false' warning ........ ................ r74580 | benjamin.peterson | 2009-08-29 15:44:43 +0200 (Sa, 29 Aug 2009) | 53 lines Blocked revisions 72880,74098,74100,74463,74522,74537,74543,74569-74570 via svnmerge ........ r72880 | senthil.kumaran | 2009-05-24 04:14:50 -0500 (Sun, 24 May 2009) | 3 lines Fixed Issue1424152, urllib2 fails with HTTPS over Proxy. ........ r74098 | kristjan.jonsson | 2009-07-19 17:14:00 -0500 (Sun, 19 Jul 2009) | 2 lines http://bugs.python.org/issue6499 zlib/gzip may not be present for all builds. Make xmlrpclib gracefully not supporg gzip encoding in this case ........ r74100 | kristjan.jonsson | 2009-07-19 17:35:44 -0500 (Sun, 19 Jul 2009) | 2 lines http://bugs.python.org/issue6499 gzip.GzipFile may not exist as a parent class ........ r74463 | gregory.p.smith | 2009-08-15 17:39:03 -0500 (Sat, 15 Aug 2009) | 6 lines Force the http connection to close after any request returned when buffering=True as our buffered data is not known to the HTTPConnection and may contain data needed by a future request if the connection were left open. See http://bugs.python.org/issue2576 and http://bugs.python.org/issue4879. ........ r74522 | gregory.p.smith | 2009-08-19 00:33:48 -0500 (Wed, 19 Aug 2009) | 8 lines Revert the changes from r74463, they were causing test_xmlrpc to fail. We do not need to force a close when using socket buffering on a httplib.HTTPRequest as the library does not support streaming requests so there should never been extra data beyond the end of the current request to have left over in the requests socket buffer. see http://bugs.python.org/issue6724 ........ r74537 | tarek.ziade | 2009-08-21 09:28:38 -0500 (Fri, 21 Aug 2009) | 1 line fixed misplaced Issue line ........ r74543 | kristjan.jonsson | 2009-08-24 06:39:31 -0500 (Mon, 24 Aug 2009) | 2 lines issue 6769 fix a mistake in instantiatiating the HTTPSConnection class. ........ r74569 | benjamin.peterson | 2009-08-28 11:48:03 -0500 (Fri, 28 Aug 2009) | 1 line restricted environments are no more ........ r74570 | benjamin.peterson | 2009-08-28 11:49:56 -0500 (Fri, 28 Aug 2009) | 1 line remove more code for restricted execution ........ ................ r74703 | benjamin.peterson | 2009-09-07 15:03:49 +0200 (Mo, 07 Sep 2009) | 12 lines Blocked revisions 74699,74702 via svnmerge ........ r74699 | benjamin.peterson | 2009-09-06 17:43:39 -0500 (Sun, 06 Sep 2009) | 1 line PyObject_GetIter can set an error for its self just fine ........ r74702 | benjamin.peterson | 2009-09-07 08:02:15 -0500 (Mon, 07 Sep 2009) | 1 line revert r74699 since it loses useful error information ........ ................ r74743 | benjamin.peterson | 2009-09-11 23:24:36 +0200 (Fr, 11 Sep 2009) | 12 lines Blocked revisions 74733-74734 via svnmerge ........ r74733 | benjamin.peterson | 2009-09-09 06:40:54 -0500 (Wed, 09 Sep 2009) | 1 line tabbify ........ r74734 | benjamin.peterson | 2009-09-09 06:42:57 -0500 (Wed, 09 Sep 2009) | 1 line revert unintended changes ........ ................ r74826 | ezio.melotti | 2009-09-16 15:22:57 +0200 (Mi, 16 Sep 2009) | 8 lines Blocked revisions 74825 via svnmerge ........ r74825 | ezio.melotti | 2009-09-16 16:14:05 +0300 (Wed, 16 Sep 2009) | 1 line #6879 - fix misstatement about exceptions ........ ................ r74939 | benjamin.peterson | 2009-09-18 23:51:43 +0200 (Fr, 18 Sep 2009) | 12 lines Blocked revisions 74936-74937 via svnmerge ........ r74936 | benjamin.peterson | 2009-09-18 16:46:21 -0500 (Fri, 18 Sep 2009) | 1 line backport keyword argument support for bytearray.decode ........ r74937 | benjamin.peterson | 2009-09-18 16:47:27 -0500 (Fri, 18 Sep 2009) | 1 line typo ........ ................ r75086 | mark.dickinson | 2009-09-27 18:08:13 +0200 (So, 27 Sep 2009) | 9 lines Blocked revisions 75084 via svnmerge ........ r75084 | mark.dickinson | 2009-09-27 17:05:21 +0100 (Sun, 27 Sep 2009) | 3 lines Issue #6713: Improve decimal int -> string conversions. Thanks Gawain Bolton for the suggestion and original patches. ........ ................ r75093 | mark.dickinson | 2009-09-27 18:41:06 +0200 (So, 27 Sep 2009) | 8 lines Blocked revisions 75091 via svnmerge ........ r75091 | mark.dickinson | 2009-09-27 17:39:28 +0100 (Sun, 27 Sep 2009) | 1 line Eliminate unnecessary get_wrapped_(u)long defines in struct module. ........ ................ r75118 | r.david.murray | 2009-09-28 20:55:36 +0200 (Mo, 28 Sep 2009) | 8 lines Blocked revisions 75115 via svnmerge ........ r75115 | r.david.murray | 2009-09-28 14:29:28 -0400 (Mon, 28 Sep 2009) | 2 lines Applying patches backported from 3.1, by Gregor Lingl. ........ ................ r75173 | antoine.pitrou | 2009-10-01 19:09:15 +0200 (Do, 01 Okt 2009) | 9 lines Blocked revisions 75171 via svnmerge ........ r75171 | antoine.pitrou | 2009-10-01 19:08:03 +0200 (jeu., 01 oct. 2009) | 4 lines Sync the 2.x `io` docs with py3k, with a small note as to the distinction between bytes streams and text streams. ........ ................ r75198 | tarek.ziade | 2009-10-03 02:10:24 +0200 (Sa, 03 Okt 2009) | 8 lines Blocked revisions 75196 via svnmerge ........ r75196 | tarek.ziade | 2009-10-03 02:07:35 +0200 (Sat, 03 Oct 2009) | 1 line removing the last remaning apply() calls ........ ................ r75242 | benjamin.peterson | 2009-10-04 22:13:06 +0200 (So, 04 Okt 2009) | 10 lines Blocked revisions 74845 via svnmerge ........ r74845 | georg.brandl | 2009-09-16 15:30:09 -0500 (Wed, 16 Sep 2009) | 5 lines #6844: do not emit DeprecationWarnings on access if Exception.message has been set by the user. This works by always setting it in __dict__, except when it's implicitly set in __init__. ........ ................ r75244 | benjamin.peterson | 2009-10-04 22:23:37 +0200 (So, 04 Okt 2009) | 20 lines Blocked revisions 74849,75143,75181 via svnmerge ........ r74849 | thomas.wouters | 2009-09-16 15:36:34 -0500 (Wed, 16 Sep 2009) | 4 lines Add news entry for r74841. ........ r75143 | philip.jenvey | 2009-09-29 14:10:15 -0500 (Tue, 29 Sep 2009) | 5 lines #5329: fix os.popen* regression from 2.5: don't execute commands as a sequence through the shell. also document the correct subprocess replacement for this case patch from Jean-Paul Calderone and Jani Hakala ........ r75181 | georg.brandl | 2009-10-01 16:02:39 -0500 (Thu, 01 Oct 2009) | 1 line Add NEWS entry for r75180. ........ ................ r75245 | benjamin.peterson | 2009-10-04 22:28:48 +0200 (So, 04 Okt 2009) | 16 lines Blocked revisions 75164-75166 via svnmerge ........ r75164 | senthil.kumaran | 2009-09-30 20:07:03 -0500 (Wed, 30 Sep 2009) | 3 lines Fix for issue7026 test_urllib: unsetting missing 'env' variable. ........ r75165 | senthil.kumaran | 2009-09-30 20:19:18 -0500 (Wed, 30 Sep 2009) | 3 lines using dict.unset(k) instead of del dict[k]. consistent with release26-maint ........ r75166 | senthil.kumaran | 2009-09-30 20:50:13 -0500 (Wed, 30 Sep 2009) | 3 lines That's self.env.unset(k) and not env.unset(k) I was heading back to the problem. ........ ................ r75306 | benjamin.peterson | 2009-10-10 00:34:44 +0200 (Sa, 10 Okt 2009) | 12 lines Blocked revisions 75304-75305 via svnmerge ........ r75304 | benjamin.peterson | 2009-10-09 17:05:45 -0500 (Fri, 09 Oct 2009) | 1 line replace callable() ........ r75305 | benjamin.peterson | 2009-10-09 17:15:50 -0500 (Fri, 09 Oct 2009) | 1 line replace has_key with 'in' operator ........ ................ r75311 | benjamin.peterson | 2009-10-10 22:39:25 +0200 (Sa, 10 Okt 2009) | 8 lines Blocked revisions 75310 via svnmerge ........ r75310 | vinay.sajip | 2009-10-10 15:32:36 -0500 (Sat, 10 Oct 2009) | 1 line Issue #7086: Added TCP support to SysLogHandler and tidied up some anachronisms in the code. ........ ................ r75369 | antoine.pitrou | 2009-10-11 23:07:02 +0200 (So, 11 Okt 2009) | 9 lines Blocked revisions 75367 via svnmerge ........ r75367 | antoine.pitrou | 2009-10-11 23:03:26 +0200 (dim., 11 oct. 2009) | 4 lines Issue #7084: Fix a (very unlikely) crash when printing a list from one thread, and mutating it from another one. Patch by Scott Dial. ........ ................ r75435 | mark.dickinson | 2009-10-15 17:22:09 +0200 (Do, 15 Okt 2009) | 8 lines Blocked revisions 75434 via svnmerge ........ r75434 | mark.dickinson | 2009-10-15 16:18:55 +0100 (Thu, 15 Oct 2009) | 1 line Fix missing semicolon ........ ................ r75439 | mark.dickinson | 2009-10-15 17:54:39 +0200 (Do, 15 Okt 2009) | 8 lines Blocked revisions 75438 via svnmerge ........ r75438 | mark.dickinson | 2009-10-15 16:53:58 +0100 (Thu, 15 Oct 2009) | 1 line Issue #7142: Fix uses of unicode in memoryview objects ........ ................ r75448 | eric.smith | 2009-10-16 16:33:35 +0200 (Fr, 16 Okt 2009) | 8 lines Blocked revisions 75446 via svnmerge ........ r75446 | eric.smith | 2009-10-16 10:26:36 -0400 (Fri, 16 Oct 2009) | 1 line Removed usage of unsafe PyFloat_AsString. ........ ................ r75508 | eric.smith | 2009-10-19 02:35:35 +0200 (Mo, 19 Okt 2009) | 14 lines Blocked revisions 75506 via svnmerge ........ r75506 | eric.smith | 2009-10-18 20:34:12 -0400 (Sun, 18 Oct 2009) | 7 lines Removed calls to PyFloat_AsReprString. This is in anticipation of possibly implementing issue 7117 (short float repr). This removes the last calls to PyFloat_AsString, PyFloat_AsReprString, and PyFloat_AsStringEx, which are unsafe. Also, switch to defines for error values to bring this code more in line with the py3k branch. ........ ................ r75512 | eric.smith | 2009-10-19 16:42:58 +0200 (Mo, 19 Okt 2009) | 8 lines Blocked revisions 75510 via svnmerge ........ r75510 | eric.smith | 2009-10-19 10:38:14 -0400 (Mon, 19 Oct 2009) | 1 line Issue #7169: Document PyFloat_AsString and PyFloat_AsReprString, and note that they are unsafe and deprecated. ........ ................ r75622 | eric.smith | 2009-10-22 22:48:54 +0200 (Do, 22 Okt 2009) | 8 lines Blocked revisions 75620 via svnmerge ........ r75620 | eric.smith | 2009-10-22 16:13:14 -0400 (Thu, 22 Oct 2009) | 1 line Per the discussion in issue6882, backport the try/finally work that was done to the py3k version (mostly in r59477, I think). ........ ................ r75652 | mark.dickinson | 2009-10-24 14:15:17 +0200 (Sa, 24 Okt 2009) | 12 lines Blocked revisions 75651 via svnmerge ........ r75651 | mark.dickinson | 2009-10-24 13:13:30 +0100 (Sat, 24 Oct 2009) | 7 lines Issue #7117: Prepare for backport of py3k float repr. Add the Python/dtoa.c file containing the main algorithms; add corresponding include file and include in Python.h; include license information for Python/dtoa.c; add dtoa.c and dtoa.h to Makefile. ........ ................ r75656 | antoine.pitrou | 2009-10-24 14:31:03 +0200 (Sa, 24 Okt 2009) | 16 lines Blocked revisions 75650,75654-75655 via svnmerge ........ r75650 | antoine.pitrou | 2009-10-24 13:59:41 +0200 (sam., 24 oct. 2009) | 3 lines Manual py3k backport: [svn r74155] Issue #6242: Fix deallocator of io.StringIO and io.BytesIO ........ r75654 | antoine.pitrou | 2009-10-24 14:23:18 +0200 (sam., 24 oct. 2009) | 3 lines Manual py3k backport: [svn r74158] Issue #6218: Make io.BytesIO and io.StringIO picklable. ........ r75655 | antoine.pitrou | 2009-10-24 14:28:22 +0200 (sam., 24 oct. 2009) | 3 lines Manual py3k backport: [svn r74316] Issue #5449: Fix io.BytesIO to not accept arbitrary keywords ........ ................ r75661 | mark.dickinson | 2009-10-24 15:32:56 +0200 (Sa, 24 Okt 2009) | 22 lines Blocked revisions 75653,75658,75660 via svnmerge ........ r75653 | mark.dickinson | 2009-10-24 13:17:24 +0100 (Sat, 24 Oct 2009) | 1 line Temporary define to avoid build failure ........ r75658 | mark.dickinson | 2009-10-24 14:28:38 +0100 (Sat, 24 Oct 2009) | 8 lines Issue #7117 (backport py3k float repr) continued: - add double endianness detection to configure script - add configure-time check to see whether we can use inline assembly to get and set x87 control word in configure script - add functions to get and set x87 control word in Python/pymath.c - add pyport.h logic to determine whether it's safe to use the short float repr or not ........ r75660 | mark.dickinson | 2009-10-24 14:31:41 +0100 (Sat, 24 Oct 2009) | 1 line Remove temporary define from r75653 ........ ................ r75665 | mark.dickinson | 2009-10-24 15:46:38 +0200 (Sa, 24 Okt 2009) | 8 lines Blocked revisions 75664 via svnmerge ........ r75664 | mark.dickinson | 2009-10-24 14:44:16 +0100 (Sat, 24 Oct 2009) | 1 line Configure check for double rounding should take BASECFLAGS into account ........ ................ r75668 | mark.dickinson | 2009-10-24 16:05:34 +0200 (Sa, 24 Okt 2009) | 10 lines Blocked revisions 75666 via svnmerge ........ r75666 | mark.dickinson | 2009-10-24 15:01:08 +0100 (Sat, 24 Oct 2009) | 4 lines Issue #7117 (backport py3k float repr) continued: Add sys.float_repr_style attribute ('short' if short float repr is in used; 'legacy' otherwise). ........ ................ r75673 | mark.dickinson | 2009-10-24 17:56:07 +0200 (Sa, 24 Okt 2009) | 10 lines Blocked revisions 75672 via svnmerge ........ r75672 | mark.dickinson | 2009-10-24 16:54:35 +0100 (Sat, 24 Oct 2009) | 4 lines Issue #7117: temporarily disable the short float repr while the pieces are being assembled. To re-enable, define the preprocessor symbol PY_SHORT_FLOAT_REPR ........ ................ r75676 | eric.smith | 2009-10-24 21:52:23 +0200 (Sa, 24 Okt 2009) | 8 lines Blocked revisions 75675 via svnmerge ........ r75675 | eric.smith | 2009-10-24 15:50:44 -0400 (Sat, 24 Oct 2009) | 1 line Removed unused function PyFloat_AsStringEx. It is unused in floatobject.c, and it's not declared in any .h file. ........ ................ r75719 | eric.smith | 2009-10-26 16:10:57 +0100 (Mo, 26 Okt 2009) | 12 lines Blocked revisions 75717-75718 via svnmerge ........ r75717 | eric.smith | 2009-10-26 10:48:55 -0400 (Mon, 26 Oct 2009) | 1 line Start to remove _PyOS_double_to_string, as mentioned in issue 7117. ........ r75718 | eric.smith | 2009-10-26 11:06:39 -0400 (Mon, 26 Oct 2009) | 1 line Continue removing _PyOS_double_to_string, as mentioned in issue 7117. ........ ................ r75721 | mark.dickinson | 2009-10-26 16:40:42 +0100 (Mo, 26 Okt 2009) | 9 lines Blocked revisions 75720 via svnmerge ........ r75720 | mark.dickinson | 2009-10-26 15:39:50 +0000 (Mon, 26 Oct 2009) | 3 lines Issue #7117 (backport py3k float repr) continued: Backport pystrtod.c from py3k. ........ ................ r75723 | eric.smith | 2009-10-26 18:48:13 +0100 (Mo, 26 Okt 2009) | 8 lines Blocked revisions 75722 via svnmerge ........ r75722 | eric.smith | 2009-10-26 13:46:17 -0400 (Mon, 26 Oct 2009) | 1 line Finished removing _PyOS_double_to_string, as mentioned in issue 7117. ........ ................ r75733 | mark.dickinson | 2009-10-26 22:13:15 +0100 (Mo, 26 Okt 2009) | 14 lines Blocked revisions 75730-75731 via svnmerge ........ r75730 | mark.dickinson | 2009-10-26 21:09:09 +0000 (Mon, 26 Oct 2009) | 2 lines Issue #7117: Backport missing pystrtod.h declarations from py3k. ........ r75731 | mark.dickinson | 2009-10-26 21:11:20 +0000 (Mon, 26 Oct 2009) | 4 lines Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in floatobject.c. Also, remove limitation on length of unicode inputs to float(). ........ ................ r75740 | mark.dickinson | 2009-10-26 23:29:02 +0100 (Mo, 26 Okt 2009) | 10 lines Blocked revisions 75739 via svnmerge ........ r75739 | mark.dickinson | 2009-10-26 22:28:14 +0000 (Mon, 26 Oct 2009) | 5 lines Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in complexobject.c. Also remove length restriction on unicode inputs to the complex constructor. ........ ................ r75744 | eric.smith | 2009-10-27 12:36:44 +0100 (Di, 27 Okt 2009) | 8 lines Blocked revisions 75743 via svnmerge ........ r75743 | eric.smith | 2009-10-27 07:32:11 -0400 (Tue, 27 Oct 2009) | 1 line Issue 7117: Replace PyOS_ascii_strtod with PyOS_string_to_double in cPickle as part of short float repr. ........ ................ r75746 | eric.smith | 2009-10-27 13:13:06 +0100 (Di, 27 Okt 2009) | 8 lines Blocked revisions 75745 via svnmerge ........ r75745 | eric.smith | 2009-10-27 08:12:44 -0400 (Tue, 27 Oct 2009) | 1 line Issue 7117: Replace PyOS_ascii_strtod with PyOS_string_to_double in stropmodule as part of short float repr. ........ ................ r75834 | eric.smith | 2009-10-27 19:47:34 +0100 (Di, 27 Okt 2009) | 8 lines Blocked revisions 75824 via svnmerge ........ r75824 | eric.smith | 2009-10-27 14:33:14 -0400 (Tue, 27 Oct 2009) | 1 line Removed PyOS_ascii_atof from ast.c, as mentioned in issue 7117. ........ ................ r75845 | antoine.pitrou | 2009-10-27 20:39:10 +0100 (Di, 27 Okt 2009) | 8 lines Blocked revisions 75844 via svnmerge ........ r75844 | antoine.pitrou | 2009-10-27 20:36:44 +0100 (mar., 27 oct. 2009) | 3 lines Suppress transient refleaks in test_file2k. ........ ................ r75847 | eric.smith | 2009-10-27 20:44:06 +0100 (Di, 27 Okt 2009) | 8 lines Blocked revisions 75846 via svnmerge ........ r75846 | eric.smith | 2009-10-27 15:42:57 -0400 (Tue, 27 Oct 2009) | 1 line Removed PyOS_ascii_atof from marshal.c, as mentioned in issue 7117. Also brings it more in line with py3k. ........ ................
* Blocked revisions 75732,75737-75738,75741 via svnmergeMark Dickinson2009-10-270-0/+0
| | | | | | | | | | | | | | | | | | | | ........ r75732 | mark.dickinson | 2009-10-26 21:12:50 +0000 (Mon, 26 Oct 2009) | 1 line Fix extra-long line; also makes py3k match trunk here. ........ r75737 | mark.dickinson | 2009-10-26 21:51:18 +0000 (Mon, 26 Oct 2009) | 1 line Remove length limitation on string arguments to complex() ........ r75738 | mark.dickinson | 2009-10-26 22:05:06 +0000 (Mon, 26 Oct 2009) | 1 line Make sure memory is freed on error in complex_subtype_from_string. ........ r75741 | mark.dickinson | 2009-10-26 22:48:32 +0000 (Mon, 26 Oct 2009) | 2 lines Issue #7207: Fix race condition in telnetlib test; should stop test failures on OS X 10.6. ........
* Merged revisions 75729 via svnmerge fromMark Dickinson2009-10-272-8/+14
| | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75729 | mark.dickinson | 2009-10-26 20:02:55 +0000 (Mon, 26 Oct 2009) | 10 lines Merged revisions 75728 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75728 | mark.dickinson | 2009-10-26 19:59:23 +0000 (Mon, 26 Oct 2009) | 3 lines Use correct conversion specifier and length modifier when printing an integer of type off_t. Also, don't assume that long long is available. ........ ................
* Blocked revisions 75716 via svnmergeMark Dickinson2009-10-270-0/+0
| | | | | | | | ........ r75716 | mark.dickinson | 2009-10-26 14:36:29 +0000 (Mon, 26 Oct 2009) | 1 line Move some comments to more appropriate places ........
* Blocked revisions 75715 via svnmergeMark Dickinson2009-10-270-0/+0
| | | | | | | | | | | | | | | ................ r75715 | mark.dickinson | 2009-10-26 14:19:42 +0000 (Mon, 26 Oct 2009) | 9 lines Merged revisions 75714 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75714 | mark.dickinson | 2009-10-26 14:18:44 +0000 (Mon, 26 Oct 2009) | 1 line Warn against replacing PyNumber_Add with PyNumber_InPlaceAdd in sum ........ ................