Staging
v0.8.1
v0.8.1
https://github.com/python/cpython
Revision eb26ba258b69eab296e38a8713747e965b926e2c authored by Georg Brandl on 13 August 2009, 08:12:33 UTC, committed by Georg Brandl on 13 August 2009, 08:12:33 UTC
................
r73621 | benjamin.peterson | 2009-06-28 18:39:56 +0200 (So, 28 Jun 2009) | 53 lines
Blocked revisions 73382,73394-73397,73401-73402,73422,73480,73536,73540 via svnmerge
........
r73382 | raymond.hettinger | 2009-06-11 18:14:53 -0500 (Thu, 11 Jun 2009) | 1 line
Issue 6261: Clarify behavior of random.uniform().
........
r73394 | antoine.pitrou | 2009-06-12 15:14:08 -0500 (Fri, 12 Jun 2009) | 3 lines
Issue #6215: backport the 3.1 io lib
........
r73395 | antoine.pitrou | 2009-06-12 15:36:25 -0500 (Fri, 12 Jun 2009) | 4 lines
Restore the old test_file.py (for the builtin file object) as a new file named test_file2k.py
........
r73396 | antoine.pitrou | 2009-06-12 15:41:52 -0500 (Fri, 12 Jun 2009) | 4 lines
Try to restore the old test_file and test_univnewlines as new, different files
(with the right revisions this time, hopefully)
........
r73397 | antoine.pitrou | 2009-06-12 15:54:21 -0500 (Fri, 12 Jun 2009) | 3 lines
Re-enable testing of builtin open() in test_bufio in test_largefile
........
r73401 | alexandre.vassalotti | 2009-06-12 16:52:14 -0500 (Fri, 12 Jun 2009) | 2 lines
Make pickling of OrderedDict instances more efficient.
........
r73402 | alexandre.vassalotti | 2009-06-12 18:03:35 -0500 (Fri, 12 Jun 2009) | 6 lines
Revert r73401 per Raymond Hettinger's request.
The rational is the change might cause imcompatiblity problems with
PyYAML. In addition, Raymond wants to kept the different versions of
collections synchronized across Python versions.
........
r73422 | benjamin.peterson | 2009-06-13 15:30:48 -0500 (Sat, 13 Jun 2009) | 1 line
update ast version
........
r73480 | facundo.batista | 2009-06-19 13:02:28 -0500 (Fri, 19 Jun 2009) | 3 lines
Issue #6274. Fixed a potential FD leak in subprocess.py.
........
r73536 | raymond.hettinger | 2009-06-23 16:32:28 -0500 (Tue, 23 Jun 2009) | 1 line
Issue 6305: Clarify error message for large arguments to itertools.islice().
........
r73540 | raymond.hettinger | 2009-06-23 17:20:04 -0500 (Tue, 23 Jun 2009) | 1 line
Add procedural note.
........
................
r73622 | benjamin.peterson | 2009-06-28 18:51:58 +0200 (So, 28 Jun 2009) | 12 lines
Blocked revisions 73459,73563 via svnmerge
........
r73459 | raymond.hettinger | 2009-06-16 20:43:47 -0500 (Tue, 16 Jun 2009) | 1 line
Add usage note.
........
r73563 | amaury.forgeotdarc | 2009-06-25 16:29:32 -0500 (Thu, 25 Jun 2009) | 2 lines
Fix a compilation warning on Windows
........
................
r73628 | benjamin.peterson | 2009-06-28 21:29:09 +0200 (So, 28 Jun 2009) | 8 lines
Blocked revisions 73627 via svnmerge
........
r73627 | benjamin.peterson | 2009-06-28 14:27:55 -0500 (Sun, 28 Jun 2009) | 1 line
return locals and cells in get_locals() not bound globals, though
........
................
r73655 | mark.dickinson | 2009-06-28 23:59:52 +0200 (So, 28 Jun 2009) | 8 lines
Blocked revisions 73653 via svnmerge
........
r73653 | mark.dickinson | 2009-06-28 22:48:15 +0100 (Sun, 28 Jun 2009) | 1 line
More Decimal quote fixing; backport of r73642
........
................
r73657 | benjamin.peterson | 2009-06-29 00:24:31 +0200 (Mo, 29 Jun 2009) | 14 lines
Blocked revisions 73272,73546 via svnmerge
........
r73272 | kristjan.jonsson | 2009-06-07 11:43:23 -0500 (Sun, 07 Jun 2009) | 2 lines
http://bugs.python.org/issue6192
Add a feature to disable the Nagle algorithm on sockets in TCPServer
........
r73546 | kristjan.jonsson | 2009-06-24 04:17:04 -0500 (Wed, 24 Jun 2009) | 2 lines
http://bugs.python.org/issue6192
Move the newly introduced disable_nagle_algorithm flag into the StreamRequestHandler, where it is more appropriate.
........
................
r73680 | antoine.pitrou | 2009-06-29 16:17:23 +0200 (Mo, 29 Jun 2009) | 8 lines
Blocked revisions 73679 via svnmerge
........
r73679 | antoine.pitrou | 2009-06-29 16:14:56 +0200 (lun., 29 juin 2009) | 3 lines
Backport fix for buglet from py3k
........
................
r73687 | hirokazu.yamamoto | 2009-06-29 18:03:21 +0200 (Mo, 29 Jun 2009) | 8 lines
Blocked revisions 73686 via svnmerge
........
r73686 | hirokazu.yamamoto | 2009-06-30 00:52:21 +0900 | 1 line
Issue #6368: Fixed unused variable warning on Unix.
........
................
r73716 | benjamin.peterson | 2009-07-01 01:09:03 +0200 (Mi, 01 Jul 2009) | 8 lines
Blocked revisions 73714 via svnmerge
........
r73714 | benjamin.peterson | 2009-06-30 17:57:08 -0500 (Tue, 30 Jun 2009) | 1 line
convert usage of fail* to assert*
........
................
r73746 | benjamin.peterson | 2009-07-01 15:47:12 +0200 (Mi, 01 Jul 2009) | 13 lines
Blocked revisions 73638,73697 via svnmerge
........
r73638 | kristjan.jonsson | 2009-06-28 16:04:17 -0500 (Sun, 28 Jun 2009) | 2 lines
http://bugs.python.org/issue6267
Cumulative patch to http and xmlrpc
........
r73697 | raymond.hettinger | 2009-06-29 14:10:29 -0500 (Mon, 29 Jun 2009) | 1 line
Issue 6370: Performance issue with collections.Counter().
........
................
r73777 | benjamin.peterson | 2009-07-02 20:18:56 +0200 (Do, 02 Jul 2009) | 8 lines
Blocked revisions 73776 via svnmerge
........
r73776 | benjamin.peterson | 2009-07-02 13:16:45 -0500 (Thu, 02 Jul 2009) | 1 line
when print() gets unicode arguments, sep and end should be unicode by default #4618
........
................
r73807 | benjamin.peterson | 2009-07-03 15:22:00 +0200 (Fr, 03 Jul 2009) | 1 line
rip out bsddb support code
................
r73843 | kristjan.jonsson | 2009-07-04 17:09:25 +0200 (Sa, 04 Jul 2009) | 2 lines
http://bugs.python.org/issue6381
merging revision 73819 from trunk
................
r73844 | kristjan.jonsson | 2009-07-04 17:16:38 +0200 (Sa, 04 Jul 2009) | 1 line
Revert last change, which was incorrect.
................
r73853 | alexandre.vassalotti | 2009-07-05 08:31:55 +0200 (So, 05 Jul 2009) | 15 lines
Blocked revisions 73846-73847 via svnmerge
........
r73846 | alexandre.vassalotti | 2009-07-05 00:22:40 -0400 (Sun, 05 Jul 2009) | 6 lines
Issue 2370: Add Python 3 warnings for the removal of operator.isCallable and
operator.sequenceIncludes.
Patch contributed by Jeff Balogh (and updated slightly by me).
........
r73847 | alexandre.vassalotti | 2009-07-05 00:25:46 -0400 (Sun, 05 Jul 2009) | 2 lines
Fix bad variable name in r73846.
........
................
r73855 | alexandre.vassalotti | 2009-07-05 08:34:48 +0200 (So, 05 Jul 2009) | 8 lines
Blocked revisions 73854 via svnmerge
........
r73854 | alexandre.vassalotti | 2009-07-05 02:33:41 -0400 (Sun, 05 Jul 2009) | 2 lines
Backport test cases added in r73852.
........
................
r73860 | mark.dickinson | 2009-07-05 12:03:49 +0200 (So, 05 Jul 2009) | 9 lines
Blocked revisions 73858 via svnmerge
........
r73858 | mark.dickinson | 2009-07-05 11:01:24 +0100 (Sun, 05 Jul 2009) | 3 lines
Issues #1530559, #1741130: Fix various inconsistencies in struct.pack
integer packing, and reenable some previously broken tests.
........
................
r73886 | mark.dickinson | 2009-07-07 13:09:38 +0200 (Di, 07 Jul 2009) | 8 lines
Blocked revisions 73884 via svnmerge
........
r73884 | mark.dickinson | 2009-07-07 12:08:23 +0100 (Tue, 07 Jul 2009) | 1 line
Add skipping to struct test that only applies when overflow masking is in effect
........
................
r73890 | mark.dickinson | 2009-07-07 16:18:33 +0200 (Di, 07 Jul 2009) | 9 lines
Blocked revisions 73888 via svnmerge
........
r73888 | mark.dickinson | 2009-07-07 15:15:45 +0100 (Tue, 07 Jul 2009) | 3 lines
Expand test coverage for struct.pack with native integer packing;
reorganize the test_struct module to remove duplicated code and tests.
........
................
r73893 | mark.dickinson | 2009-07-07 17:09:33 +0200 (Di, 07 Jul 2009) | 9 lines
Blocked revisions 73891 via svnmerge
........
r73891 | mark.dickinson | 2009-07-07 16:08:28 +0100 (Tue, 07 Jul 2009) | 3 lines
Issue #1523: Remove deprecated overflow masking in struct module, and
make sure that out-of-range values consistently raise struct.error.
........
................
r73909 | r.david.murray | 2009-07-09 21:47:26 +0200 (Do, 09 Jul 2009) | 9 lines
Blocked revisions 73907 via svnmerge
........
r73907 | r.david.murray | 2009-07-09 12:17:30 -0400 (Thu, 09 Jul 2009) | 4 lines
Temporarily ignore rmtree errors in test_getcwd_long_pathnames to see
if the test gives useful failure info on Solaris buildbot.
........
................
r73936 | georg.brandl | 2009-07-11 12:08:49 +0200 (Sa, 11 Jul 2009) | 1 line
Revert r73807, which removed code to be able to build _dbm with bsddb.
................
r73950 | tarek.ziade | 2009-07-11 13:02:29 +0200 (Sa, 11 Jul 2009) | 8 lines
Blocked revisions 73944 via svnmerge
........
r73944 | tarek.ziade | 2009-07-11 12:48:31 +0200 (Sat, 11 Jul 2009) | 1 line
cleaned up distutils.build_ext module
........
................
r73980 | benjamin.peterson | 2009-07-12 19:02:22 +0200 (So, 12 Jul 2009) | 8 lines
Blocked revisions 73979 via svnmerge
........
r73979 | benjamin.peterson | 2009-07-12 11:56:54 -0500 (Sun, 12 Jul 2009) | 1 line
add versionadded
........
................
r73992 | benjamin.peterson | 2009-07-13 01:58:08 +0200 (Mo, 13 Jul 2009) | 8 lines
Blocked revisions 73991 via svnmerge
........
r73991 | benjamin.peterson | 2009-07-12 18:56:18 -0500 (Sun, 12 Jul 2009) | 1 line
change encoding to utf-8
........
................
r74016 | alexandre.vassalotti | 2009-07-15 20:32:08 +0200 (Mi, 15 Jul 2009) | 9 lines
Blocked revisions 74014 via svnmerge
........
r74014 | alexandre.vassalotti | 2009-07-15 14:19:47 -0400 (Wed, 15 Jul 2009) | 3 lines
Issue #2389: Pickle array objects using a list representation for portability
across different machine architectures and compatibility with Python 3.x.
........
................
r74035 | alexandre.vassalotti | 2009-07-17 07:41:49 +0200 (Fr, 17 Jul 2009) | 23 lines
Blocked revisions 74031-74033 via svnmerge
........
r74031 | alexandre.vassalotti | 2009-07-17 00:24:45 -0400 (Fri, 17 Jul 2009) | 2 lines
Use AC_CHECK_SIZEOF to find the size of off_t, pthread_t and time_t.
........
r74032 | alexandre.vassalotti | 2009-07-17 00:59:05 -0400 (Fri, 17 Jul 2009) | 4 lines
Rename the useless AC_INCLUDES_DEFAULT and protect the includes.
This is mostly an aesthetic change.
........
r74033 | alexandre.vassalotti | 2009-07-17 01:26:39 -0400 (Fri, 17 Jul 2009) | 8 lines
Cache the results of all runtime checks.
This will be helpful to people who want to compile Python with a
cross-compiler. Now you can upload the configure script on your host
machine, run it with caching enabled, and download the cached results
on your build machine.
........
................
r74049 | alexandre.vassalotti | 2009-07-17 09:49:53 +0200 (Fr, 17 Jul 2009) | 2 lines
Regenerate configure script.
................
r74050 | alexandre.vassalotti | 2009-07-17 09:51:38 +0200 (Fr, 17 Jul 2009) | 8 lines
Blocked revisions 74048 via svnmerge
........
r74048 | alexandre.vassalotti | 2009-07-17 03:46:46 -0400 (Fri, 17 Jul 2009) | 2 lines
Regenerate configure script.
........
................
r74053 | alexandre.vassalotti | 2009-07-17 10:29:18 +0200 (Fr, 17 Jul 2009) | 17 lines
Blocked revisions 74028-74029,74038 via svnmerge
........
r74028 | georg.brandl | 2009-07-16 15:24:48 -0400 (Thu, 16 Jul 2009) | 1 line
#6482: simplify "except: raise" to "finally:".
........
r74029 | georg.brandl | 2009-07-16 17:47:51 -0400 (Thu, 16 Jul 2009) | 1 line
Revert r74028.
........
r74038 | alexandre.vassalotti | 2009-07-17 02:10:06 -0400 (Fri, 17 Jul 2009) | 3 lines
Double-quote the test cases for chflags() and lchflags()
to ensure they don't get mangled.
........
................
r74060 | alexandre.vassalotti | 2009-07-17 13:12:50 +0200 (Fr, 17 Jul 2009) | 17 lines
Blocked revisions 73774,73812,73839 via svnmerge
........
r73774 | benjamin.peterson | 2009-07-02 13:06:17 -0400 (Thu, 02 Jul 2009) | 1 line
only order comparisons are removed in py3k #6119
........
r73812 | benjamin.peterson | 2009-07-03 10:08:20 -0400 (Fri, 03 Jul 2009) | 1 line
another cStringIO restriction
........
r73839 | gregory.p.smith | 2009-07-04 04:42:10 -0400 (Sat, 04 Jul 2009) | 3 lines
Merge r73838 from py3k branch. Use the nondeprecated unittest method
names.
........
................
r74061 | alexandre.vassalotti | 2009-07-17 13:20:13 +0200 (Fr, 17 Jul 2009) | 8 lines
Blocked revisions 73773 via svnmerge
........
r73773 | benjamin.peterson | 2009-07-02 12:51:56 -0400 (Thu, 02 Jul 2009) | 1 line
remove this test; a module level warning is enough
........
................
r74064 | alexandre.vassalotti | 2009-07-17 14:49:05 +0200 (Fr, 17 Jul 2009) | 29 lines
Blocked revisions 73819,73821-73822,73863,73877 via svnmerge
........
r73819 | kristjan.jonsson | 2009-07-03 19:07:07 -0400 (Fri, 03 Jul 2009) | 2 lines
http://bugs.python.org/issue6381
some platforms may raise ENOTCONN if the stack has disconnected the socket on behalf of the peer.
........
r73821 | kristjan.jonsson | 2009-07-03 19:26:02 -0400 (Fri, 03 Jul 2009) | 2 lines
http://bugs.python.org/issue6267
Incorrect exception handling for xmlrp client retry
........
r73822 | kristjan.jonsson | 2009-07-03 19:29:50 -0400 (Fri, 03 Jul 2009) | 2 lines
http://bugs.python.org/issue6267
Incorrect exception handling for xmlrpc client retry
........
r73863 | kristjan.jonsson | 2009-07-05 16:56:57 -0400 (Sun, 05 Jul 2009) | 2 lines
http://bugs.python.org/issue6382
close_request() (which can send a socket.shutdown()) must be called by the child process in a forking server. The parent must merely close the socket handle.
........
r73877 | kristjan.jonsson | 2009-07-07 05:01:34 -0400 (Tue, 07 Jul 2009) | 2 lines
http://bugs.python.org/issue6382
added the shutdown_request() which can perform shutdown before calling close. This is needed for the ForkingMixIn because different close semantics are required for child and parent process. shutdown_request(), for TCP servers, calls socket.shutdown() and then calls close_request(). Therefore, this is not an backwards incompatible change, since subclasses that continue to override close_request() continue to work.
........
................
r74068 | alexandre.vassalotti | 2009-07-18 01:11:52 +0200 (Sa, 18 Jul 2009) | 2 lines
Revert r74049.
................
r74071 | alexandre.vassalotti | 2009-07-18 01:27:40 +0200 (Sa, 18 Jul 2009) | 12 lines
Blocked revisions 74067,74069 via svnmerge
........
r74067 | alexandre.vassalotti | 2009-07-17 19:09:02 -0400 (Fri, 17 Jul 2009) | 2 lines
Revert r74048.
........
r74069 | alexandre.vassalotti | 2009-07-17 19:17:48 -0400 (Fri, 17 Jul 2009) | 2 lines
Regenerate configure script using autoconf 2.61.
........
................
r74082 | mark.dickinson | 2009-07-18 17:19:43 +0200 (Sa, 18 Jul 2009) | 9 lines
Blocked revisions 74080 via svnmerge
........
r74080 | mark.dickinson | 2009-07-18 16:18:18 +0100 (Sat, 18 Jul 2009) | 3 lines
Issue #6431: Fix Fraction comparisons with unknown types, and with
float infinities and nans. Backport of r74078 from py3k.
........
................
r74120 | benjamin.peterson | 2009-07-20 22:36:45 +0200 (Mo, 20 Jul 2009) | 8 lines
Blocked revisions 74119 via svnmerge
........
r74119 | benjamin.peterson | 2009-07-20 15:28:08 -0500 (Mon, 20 Jul 2009) | 2 lines
the Slice in x[::] has to have step as None to help the interpreter
........
................
r74125 | alexandre.vassalotti | 2009-07-21 01:59:41 +0200 (Di, 21 Jul 2009) | 2 lines
Ignore the correct jinga directory.
................
r74129 | alexandre.vassalotti | 2009-07-21 02:55:16 +0200 (Di, 21 Jul 2009) | 2 lines
Revert r74125.
................
r74174 | benjamin.peterson | 2009-07-22 18:36:58 +0200 (Mi, 22 Jul 2009) | 12 lines
Blocked revisions 74152,74173 via svnmerge
........
r74152 | benjamin.peterson | 2009-07-21 19:03:43 -0500 (Tue, 21 Jul 2009) | 1 line
simplify
........
r74173 | benjamin.peterson | 2009-07-22 11:34:37 -0500 (Wed, 22 Jul 2009) | 1 line
revert r74152
........
................
r74191 | amaury.forgeotdarc | 2009-07-24 00:34:27 +0200 (Fr, 24 Jul 2009) | 10 lines
Blocked revisions 74189 via svnmerge
........
r74189 | amaury.forgeotdarc | 2009-07-23 21:26:02 +0200 (jeu., 23 juil. 2009) | 4 lines
#6553: crash in cPickle.load(), when given a StringIO with incomplete data.
Will backport to 2.6, 3.x already fixed a similar issue with issue4298.
........
................
r74195 | georg.brandl | 2009-07-24 22:13:37 +0200 (Fr, 24 Jul 2009) | 8 lines
Blocked revisions 74194 via svnmerge
........
r74194 | georg.brandl | 2009-07-24 22:09:46 +0200 (Fr, 24 Jul 2009) | 1 line
#6564: fix section about the two raise syntaxes.
........
................
r74221 | eric.smith | 2009-07-27 04:00:11 +0200 (Mo, 27 Jul 2009) | 8 lines
Blocked revisions 74219 via svnmerge
........
r74219 | eric.smith | 2009-07-26 21:58:25 -0400 (Sun, 26 Jul 2009) | 1 line
Sync trunk and py3k versions of string formatting. Will manually merge into py3k.
........
................
r74236 | mark.dickinson | 2009-07-28 18:46:53 +0200 (Di, 28 Jul 2009) | 8 lines
Blocked revisions 74234 via svnmerge
........
r74234 | mark.dickinson | 2009-07-28 17:45:13 +0100 (Tue, 28 Jul 2009) | 1 line
Remove leading blank line from cmath.rst
........
................
r74242 | mark.dickinson | 2009-07-28 22:36:23 +0200 (Di, 28 Jul 2009) | 10 lines
Blocked revisions 74240 via svnmerge
........
r74240 | mark.dickinson | 2009-07-28 21:35:03 +0100 (Tue, 28 Jul 2009) | 4 lines
Issue #6561: '\d' regular expression should not match characters of
category [No]; only those of category [Nd]. (Backport of r74237
from py3k.)
........
................
r74244 | amaury.forgeotdarc | 2009-07-28 23:32:43 +0200 (Di, 28 Jul 2009) | 8 lines
Blocked revisions 74243 via svnmerge
........
r74243 | amaury.forgeotdarc | 2009-07-28 22:47:55 +0200 (mar., 28 juil. 2009) | 2 lines
"Fix" for the refleak report: the ABC classes are now in the _pyio module
........
................
r74257 | georg.brandl | 2009-07-29 18:33:19 +0200 (Mi, 29 Jul 2009) | 8 lines
Blocked revisions 74256 via svnmerge
........
r74256 | georg.brandl | 2009-07-29 16:32:30 +0000 (Mi, 29 Jul 2009) | 1 line
#6336: Add nb_divide.
........
................
r74263 | alexandre.vassalotti | 2009-07-29 22:00:39 +0200 (Mi, 29 Jul 2009) | 13 lines
Blocked revisions 74134,74147 via svnmerge
........
r74134 | thomas.heller | 2009-07-21 02:27:14 -0400 (Tue, 21 Jul 2009) | 3 lines
Issue #6493: Fix a ctypes problem setting bitfields more than 31 bits
wide.
........
r74147 | thomas.heller | 2009-07-21 15:04:02 -0400 (Tue, 21 Jul 2009) | 1 line
Revert rev 74134, as it does not completely fixx issue #6493.
........
................
r74283 | mark.dickinson | 2009-08-02 13:02:05 +0200 (So, 02 Aug 2009) | 10 lines
Blocked revisions 74281 via svnmerge
........
r74281 | mark.dickinson | 2009-08-02 11:59:36 +0100 (Sun, 02 Aug 2009) | 4 lines
Issue #6595: Allow Decimal constructor to accept non-European decimal
digits, as recommended by the specification. (Backport of r74279 from
py3k.)
........
................
1 parent 8a038b2
Tip revision: eb26ba258b69eab296e38a8713747e965b926e2c authored by Georg Brandl on 13 August 2009, 08:12:33 UTC
Blocked revisions 73621-73622,73628,73655,73657,73680,73687,73716,73746,73777,73807,73843-73844,73853,73855,73860,73886,73890,73893,73909,73936,73950,73980,73992,74016,74035,74049-74050,74053,74060-74061,74064,74068,74071,74082,74120,74125,74129,74174,74191,74195,74221,74236,74242,74244,74257,74263,74283 via svnmerge
Blocked revisions 73621-73622,73628,73655,73657,73680,73687,73716,73746,73777,73807,73843-73844,73853,73855,73860,73886,73890,73893,73909,73936,73950,73980,73992,74016,74035,74049-74050,74053,74060-74061,74064,74068,74071,74082,74120,74125,74129,74174,74191,74195,74221,74236,74242,74244,74257,74263,74283 via svnmerge
Tip revision: eb26ba2
LICENSE
A. HISTORY OF THE SOFTWARE
==========================
Python was created in the early 1990s by Guido van Rossum at Stichting
Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
as a successor of a language called ABC. Guido remains Python's
principal author, although it includes many contributions from others.
In 1995, Guido continued his work on Python at the Corporation for
National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
in Reston, Virginia where he released several versions of the
software.
In May 2000, Guido and the Python core development team moved to
BeOpen.com to form the BeOpen PythonLabs team. In October of the same
year, the PythonLabs team moved to Digital Creations (now Zope
Corporation, see http://www.zope.com). In 2001, the Python Software
Foundation (PSF, see http://www.python.org/psf/) was formed, a
non-profit organization created specifically to own Python-related
Intellectual Property. Zope Corporation is a sponsoring member of
the PSF.
All Python releases are Open Source (see http://www.opensource.org for
the Open Source Definition). Historically, most, but not all, Python
releases have also been GPL-compatible; the table below summarizes
the various releases.
Release Derived Year Owner GPL-
from compatible? (1)
0.9.0 thru 1.2 1991-1995 CWI yes
1.3 thru 1.5.2 1.2 1995-1999 CNRI yes
1.6 1.5.2 2000 CNRI no
2.0 1.6 2000 BeOpen.com no
1.6.1 1.6 2001 CNRI yes (2)
2.1 2.0+1.6.1 2001 PSF no
2.0.1 2.0+1.6.1 2001 PSF yes
2.1.1 2.1+2.0.1 2001 PSF yes
2.2 2.1.1 2001 PSF yes
2.1.2 2.1.1 2002 PSF yes
2.1.3 2.1.2 2002 PSF yes
2.2.1 2.2 2002 PSF yes
2.2.2 2.2.1 2002 PSF yes
2.2.3 2.2.2 2003 PSF yes
2.3 2.2.2 2002-2003 PSF yes
2.3.1 2.3 2002-2003 PSF yes
2.3.2 2.3.1 2002-2003 PSF yes
2.3.3 2.3.2 2002-2003 PSF yes
2.3.4 2.3.3 2004 PSF yes
2.3.5 2.3.4 2005 PSF yes
2.4 2.3 2004 PSF yes
2.4.1 2.4 2005 PSF yes
2.4.2 2.4.1 2005 PSF yes
2.4.3 2.4.2 2006 PSF yes
2.4.4 2.4.3 2006 PSF yes
2.5 2.4 2006 PSF yes
2.5.1 2.5 2007 PSF yes
2.5.2 2.5.1 2008 PSF yes
2.5.3 2.5.2 2008 PSF yes
2.6 2.5 2008 PSF yes
2.6.1 2.6 2008 PSF yes
3.0 2.6 2008 PSF yes
Footnotes:
(1) GPL-compatible doesn't mean that we're distributing Python under
the GPL. All Python licenses, unlike the GPL, let you distribute
a modified version without making your changes open source. The
GPL-compatible licenses make it possible to combine Python with
other software that is released under the GPL; the others don't.
(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
because its license has a choice of law clause. According to
CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
is "not incompatible" with the GPL.
Thanks to the many outside volunteers who have worked under Guido's
direction to make these releases possible.
B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
===============================================================
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
--------------------------------------------
1. This LICENSE AGREEMENT is between the Python Software Foundation
("PSF"), and the Individual or Organization ("Licensee") accessing and
otherwise using this software ("Python") in source or binary form and
its associated documentation.
2. Subject to the terms and conditions of this License Agreement, PSF hereby
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python alone or in any derivative version,
provided, however, that PSF's License Agreement and PSF's notice of copyright,
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Python
Software Foundation; All Rights Reserved" are retained in Python alone or in any
derivative version prepared by Licensee.
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
the changes made to Python.
4. PSF is making Python available to Licensee on an "AS IS"
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
7. Nothing in this License Agreement shall be deemed to create any
relationship of agency, partnership, or joint venture between PSF and
Licensee. This License Agreement does not grant permission to use PSF
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
8. By copying, installing or otherwise using Python, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
-------------------------------------------
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
Individual or Organization ("Licensee") accessing and otherwise using
this software in source or binary form and its associated
documentation ("the Software").
2. Subject to the terms and conditions of this BeOpen Python License
Agreement, BeOpen hereby grants Licensee a non-exclusive,
royalty-free, world-wide license to reproduce, analyze, test, perform
and/or display publicly, prepare derivative works, distribute, and
otherwise use the Software alone or in any derivative version,
provided, however, that the BeOpen Python License is retained in the
Software, alone or in any derivative version prepared by Licensee.
3. BeOpen is making the Software available to Licensee on an "AS IS"
basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
5. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
6. This License Agreement shall be governed by and interpreted in all
respects by the law of the State of California, excluding conflict of
law provisions. Nothing in this License Agreement shall be deemed to
create any relationship of agency, partnership, or joint venture
between BeOpen and Licensee. This License Agreement does not grant
permission to use BeOpen trademarks or trade names in a trademark
sense to endorse or promote products or services of Licensee, or any
third party. As an exception, the "BeOpen Python" logos available at
http://www.pythonlabs.com/logos.html may be used according to the
permissions granted on that web page.
7. By copying, installing or otherwise using the software, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
---------------------------------------
1. This LICENSE AGREEMENT is between the Corporation for National
Research Initiatives, having an office at 1895 Preston White Drive,
Reston, VA 20191 ("CNRI"), and the Individual or Organization
("Licensee") accessing and otherwise using Python 1.6.1 software in
source or binary form and its associated documentation.
2. Subject to the terms and conditions of this License Agreement, CNRI
hereby grants Licensee a nonexclusive, royalty-free, world-wide
license to reproduce, analyze, test, perform and/or display publicly,
prepare derivative works, distribute, and otherwise use Python 1.6.1
alone or in any derivative version, provided, however, that CNRI's
License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
1995-2001 Corporation for National Research Initiatives; All Rights
Reserved" are retained in Python 1.6.1 alone or in any derivative
version prepared by Licensee. Alternately, in lieu of CNRI's License
Agreement, Licensee may substitute the following text (omitting the
quotes): "Python 1.6.1 is made available subject to the terms and
conditions in CNRI's License Agreement. This Agreement together with
Python 1.6.1 may be located on the Internet using the following
unique, persistent identifier (known as a handle): 1895.22/1013. This
Agreement may also be obtained from a proxy server on the Internet
using the following URL: http://hdl.handle.net/1895.22/1013".
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python 1.6.1 or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
the changes made to Python 1.6.1.
4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
7. This License Agreement shall be governed by the federal
intellectual property law of the United States, including without
limitation the federal copyright law, and, to the extent such
U.S. federal law does not apply, by the law of the Commonwealth of
Virginia, excluding Virginia's conflict of law provisions.
Notwithstanding the foregoing, with regard to derivative works based
on Python 1.6.1 that incorporate non-separable material that was
previously distributed under the GNU General Public License (GPL), the
law of the Commonwealth of Virginia shall govern this License
Agreement only as to issues arising under or with respect to
Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
License Agreement shall be deemed to create any relationship of
agency, partnership, or joint venture between CNRI and Licensee. This
License Agreement does not grant permission to use CNRI trademarks or
trade name in a trademark sense to endorse or promote products or
services of Licensee, or any third party.
8. By clicking on the "ACCEPT" button where indicated, or by copying,
installing or otherwise using Python 1.6.1, Licensee agrees to be
bound by the terms and conditions of this License Agreement.
ACCEPT
CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
--------------------------------------------------
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
The Netherlands. All rights reserved.
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Stichting Mathematisch
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior
permission.
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Computing file changes ...
