Martin v. Löwis
24e43308b7
* Issue #16113 : Remove sha3 module again.
...
Patch by Christian Heimes, with modifications.
2014-01-03 14:05:06 +01:00
Benjamin Peterson
a015bb1e2b
merge 3.3
2013-12-31 22:02:41 -06:00
Benjamin Peterson
fa10ae0978
update copyright year
2013-12-31 22:02:22 -06:00
Stefan Krah
29e64548c5
Fix typo.
2013-12-09 19:18:59 +01:00
Stefan Krah
345ec35da3
Fix whitespace.
2013-12-09 19:11:05 +01:00
Stefan Krah
2d181de44c
Merge 3.3.
2013-12-09 19:03:24 +01:00
Stefan Krah
1761fa9dd1
Add libmpdec license.
2013-12-08 20:54:02 +01:00
Victor Stinner
ed3b0bca3e
Issue #18874 : Implement the PEP 454 (tracemalloc)
2013-11-23 12:27:24 +01:00
Christian Heimes
985ecdcfc2
ssue #19183 : Implement PEP 456 'secure and interchangeable hash algorithm'.
...
Python now uses SipHash24 on all major platforms.
2013-11-20 11:46:18 +01:00
Georg Brandl
a2838878fa
merge with 3.3
2013-09-22 11:46:51 +02:00
Georg Brandl
587b30571d
Closes #19043 : remove detailed listing of versions from license files
...
Since all versions since 2.2 are under the same licensing terms,
this saves the release manager from touching the two files for
very new minor release.
2013-09-22 11:45:52 +02:00
Georg Brandl
a4f988c2bd
merge with 3.3
2013-04-06 16:49:23 +02:00
Georg Brandl
03b273f4d1
Add 3.3.1 to LICENSE files.
2013-04-06 16:48:55 +02:00
Georg Brandl
98297f4807
merge with 3.3
2013-04-06 16:47:34 +02:00
Georg Brandl
2fd4abe6a1
merge with 3.2 branch
2013-04-06 16:39:49 +02:00
Georg Brandl
a7d2f0061f
Copyright update to 2013.
2013-03-23 16:06:13 +01:00
Benjamin Peterson
ae2039e62c
merge 3.3
2012-12-31 21:37:30 -06:00
Benjamin Peterson
198399d92c
bring Python into 2013
2012-12-31 21:37:21 -06:00
Christian Heimes
4a0270d82b
Issue #16113 : integrade SHA-3 (Keccak) patch from http://hg.python.org/sandbox/cheimes
2012-10-06 02:23:36 +02:00
Georg Brandl
08a9012352
Bump version to 3.4.0 alpha 0.
2012-09-29 09:34:13 +02:00
Ezio Melotti
0ce22259df
#16014 : merge with 3.2.
2012-09-24 16:58:14 +03:00
Ezio Melotti
4f24af065d
#16014 : fix broken link.
2012-09-24 16:56:59 +03:00
Georg Brandl
4168764c1a
Add 3.2.3 version to the license table.
2012-06-24 17:31:06 +02:00
Georg Brandl
f125bf5f94
Update copyright years and version name.
2012-03-04 16:26:19 +01:00
Georg Brandl
e578021696
Add 3.2.3 to license.
2012-02-23 21:19:18 +01:00
Benjamin Peterson
f606e682a4
add another year to glorious PSF IP
2011-12-31 22:42:26 -06:00
Benjamin Peterson
a174577f55
merge 3.2
2011-12-31 22:43:01 -06:00
Georg Brandl
fbd1e041af
Merge with 3.2.
2011-09-04 08:42:26 +02:00
Sandro Tosi
b51a3c9d22
merge with 3.2
2011-08-16 20:03:50 +02:00
Sandro Tosi
b2761186af
#12761 : fix wording of zlib license section
2011-08-16 20:03:11 +02:00
Sandro Tosi
f6b25b9e35
#12761 : fix wording of zlib license section
2011-08-16 20:03:11 +02:00
Georg Brandl
96d237c40a
Update versions in LICENSE files.
2011-08-13 11:59:12 +02: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
fc662ddda2
Merge profile docs followup ( #12417 ) from 3.1
2011-07-28 23:00:14 +02:00
Éric Araujo
ee19c772cb
Remove mentions of previous license in profile module docs ( #12417 followup).
...
Also remove an extra docstring.
2011-07-28 22:56:24 +02:00
Éric Araujo
577a6af8e6
Merge doc fixes from 3.2
2011-06-09 16:28:19 +02:00
Éric Araujo
d2f8cec885
Fix a few misuses of :option: I missed in r86521.
...
Extract of the commit message:
Fix usage of :option: in the docs (#9312 ).
:option: is used to create a link to an option of python, not to mark
up any instance of any arbitrary command-line option. These were
changed to ````.
2011-06-08 05:29:39 +02:00
Georg Brandl
3ebb6b3615
Bump trunk to 3.3 alpha 0.
2011-02-20 10:37:07 +00:00
Georg Brandl
ed13853e5d
Happy New Year! (CET edition)
2010-12-31 23:00:03 +00:00
Marc-André Lemburg
bd5283f7ad
Merged revisions 84941 via svnmerge from
...
svn+pythonssh://pythondev@svn.python.org/python/branches/py3k
........
r84941 | marc-andre.lemburg | 2010-09-21 13:55:27 +0200 (Tue, 21 Sep 2010) | 3 lines
Add missing word.
........
2010-09-21 11:56:42 +00:00
Marc-André Lemburg
45fb9a1c23
Add missing word.
2010-09-21 11:55:27 +00:00
Marc-André Lemburg
e94fa057f9
Merged revisions 84938 via svnmerge from
...
svn+pythonssh://pythondev@svn.python.org/python/branches/py3k
........
r84938 | marc-andre.lemburg | 2010-09-21 13:37:43 +0200 (Tue, 21 Sep 2010) | 5 lines
Add OpenSSL license to the Python license documenation page.
See #9119 .
........
2010-09-21 11:42:00 +00:00
Marc-André Lemburg
6b91fc4d62
Add OpenSSL license to the Python license documenation page.
...
See #9119 .
2010-09-21 11:37:43 +00:00
Matthias Klose
167c3bc3c1
Merged revisions 84743 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84743 | matthias.klose | 2010-09-12 18:31:58 +0200 (So, 12 Sep 2010) | 3 lines
- Issue #9817 : Add expat COPYING file; add expat, libffi and expat licenses
to Doc/license.rst.
........
2010-09-12 16:50:20 +00:00
Matthias Klose
62d52fd966
- Issue #9817 : Add expat COPYING file; add expat, libffi and expat licenses
...
to Doc/license.rst.
2010-09-12 16:31:58 +00:00
Georg Brandl
fff9021f75
Update copyright years and add releases to release list. Also update Sphinx version number.
2010-07-31 09:01:16 +00:00
Ezio Melotti
370fe530c8
Merged revisions 77206-77207 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77206 | benjamin.peterson | 2010-01-01 06:47:54 +0200 (Fri, 01 Jan 2010) | 9 lines
Merged revisions 77203 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77203 | benjamin.peterson | 2009-12-31 22:00:55 -0600 (Thu, 31 Dec 2009) | 1 line
update copyright year
........
................
r77207 | benjamin.peterson | 2010-01-01 06:49:25 +0200 (Fri, 01 Jan 2010) | 9 lines
Merged revisions 77204 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77204 | ezio.melotti | 2009-12-31 22:16:42 -0600 (Thu, 31 Dec 2009) | 1 line
more copyright year updates
........
................
2010-01-01 04:55:33 +00:00
Benjamin Peterson
b7b0019a2e
Merged revisions 77204 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77204 | ezio.melotti | 2009-12-31 22:16:42 -0600 (Thu, 31 Dec 2009) | 1 line
more copyright year updates
........
2010-01-01 04:49:25 +00:00
Ezio Melotti
890c193887
Merged revisions 76906 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76906 | ezio.melotti | 2009-12-20 01:26:38 +0200 (Sun, 20 Dec 2009) | 9 lines
Merged revisions 76904 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76904 | ezio.melotti | 2009-12-20 00:41:49 +0200 (Sun, 20 Dec 2009) | 1 line
#7388 : "python".capitalize() in the Doc
........
................
2009-12-19 23:33:46 +00:00
Ezio Melotti
0639d5aeb6
Merged revisions 76904 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76904 | ezio.melotti | 2009-12-20 00:41:49 +0200 (Sun, 20 Dec 2009) | 1 line
#7388 : "python".capitalize() in the Doc
........
2009-12-19 23:26:38 +00:00