summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Doc/info/texipre.dat14
-rw-r--r--Doc/texipre.dat14
2 files changed, 14 insertions, 14 deletions
diff --git a/Doc/info/texipre.dat b/Doc/info/texipre.dat
index 20f60a4..ec6576a 100644
--- a/Doc/info/texipre.dat
+++ b/Doc/info/texipre.dat
@@ -14,15 +14,15 @@ the language, see the Python Tutorial. The Python Reference Manual
gives a more formal definition of the language. (These manuals are not
yet available in INFO or Texinfo format.)
-Copyright (C) 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright (C) 1991-1995 by 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,
+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
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Stichting Mathematisch
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior permission.
@@ -43,7 +43,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@c The following two commands start the copyright page.
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
+Copyright @copyright{} 1991-1995 by Stichting Mathematisch Centrum,
Amsterdam, The Netherlands.
@center All Rights Reserved
@@ -77,7 +77,7 @@ the language, see the @cite{Python Tutorial}. The @cite{Python
Reference Manual} gives a more formal definition of the language.
(These manuals are not yet available in INFO or Texinfo format.)
-This version corresponds to Python version 1.1.
+This version corresponds to Python version 1.2.
@end ifinfo
diff --git a/Doc/texipre.dat b/Doc/texipre.dat
index 20f60a4..ec6576a 100644
--- a/Doc/texipre.dat
+++ b/Doc/texipre.dat
@@ -14,15 +14,15 @@ the language, see the Python Tutorial. The Python Reference Manual
gives a more formal definition of the language. (These manuals are not
yet available in INFO or Texinfo format.)
-Copyright (C) 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright (C) 1991-1995 by 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,
+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
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Stichting Mathematisch
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior permission.
@@ -43,7 +43,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@c The following two commands start the copyright page.
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
+Copyright @copyright{} 1991-1995 by Stichting Mathematisch Centrum,
Amsterdam, The Netherlands.
@center All Rights Reserved
@@ -77,7 +77,7 @@ the language, see the @cite{Python Tutorial}. The @cite{Python
Reference Manual} gives a more formal definition of the language.
(These manuals are not yet available in INFO or Texinfo format.)
-This version corresponds to Python version 1.1.
+This version corresponds to Python version 1.2.
@end ifinfo
generated by cgit v0.12 at 2025-02-18 23:29:46 (GMT)
1 line and another typo... ................ r67002 | hirokazu.yamamoto | 2008-10-23 02:37:33 +0200 (Thu, 23 Oct 2008) | 1 line Issue #4183: Some tests didn't run with pickle.HIGHEST_PROTOCOL. ................ r67005 | walter.doerwald | 2008-10-23 15:11:39 +0200 (Thu, 23 Oct 2008) | 2 lines Use the correct names of the stateless codec functions (Fixes issue 4178). ................ r67007 | benjamin.peterson | 2008-10-23 23:43:48 +0200 (Thu, 23 Oct 2008) | 1 line only nonempty __slots__ don't work ................ r67028 | benjamin.peterson | 2008-10-26 01:27:07 +0200 (Sun, 26 Oct 2008) | 1 line don't use a catch-all ................ r67040 | armin.rigo | 2008-10-28 18:01:21 +0100 (Tue, 28 Oct 2008) | 5 lines Fix one of the tests: it relied on being present in an "output test" in order to actually test what it was supposed to test, i.e. that the code in the __del__ method did not crash. Use instead the new helper test_support.captured_output(). ................ r67041 | benjamin.peterson | 2008-10-29 21:33:00 +0100 (Wed, 29 Oct 2008) | 1 line mention the version gettempdir() was added ................ r67044 | amaury.forgeotdarc | 2008-10-30 00:15:57 +0100 (Thu, 30 Oct 2008) | 3 lines Correct error message in io.open(): closefd=True is the only accepted value with a file name. ................ r67070 | benjamin.peterson | 2008-10-31 21:41:44 +0100 (Fri, 31 Oct 2008) | 1 line rephrase has_key doc ................ r67089 | benjamin.peterson | 2008-11-03 21:43:20 +0100 (Mon, 03 Nov 2008) | 1 line clarify by splitting into multiple paragraphs ................ r67091 | benjamin.peterson | 2008-11-03 23:34:57 +0100 (Mon, 03 Nov 2008) | 1 line move a FileIO test to test_fileio ................ r67101 | georg.brandl | 2008-11-04 21:49:35 +0100 (Tue, 04 Nov 2008) | 2 lines #4167: fix markup glitches. ................ r67117 | georg.brandl | 2008-11-06 11:17:58 +0100 (Thu, 06 Nov 2008) | 2 lines #4268: Use correct module for two toplevel functions. ................ r67118 | georg.brandl | 2008-11-06 11:19:11 +0100 (Thu, 06 Nov 2008) | 2 lines #4267: small fixes in sqlite3 docs. ................ r67119 | georg.brandl | 2008-11-06 11:20:49 +0100 (Thu, 06 Nov 2008) | 2 lines #4245: move Thread section to the top. ................ r67123 | georg.brandl | 2008-11-06 19:49:15 +0100 (Thu, 06 Nov 2008) | 2 lines #4247: add "pass" examples to tutorial. ................ r67124 | andrew.kuchling | 2008-11-06 20:23:02 +0100 (Thu, 06 Nov 2008) | 1 line Fix grammar error; reword two paragraphs ................
Diffstat
-rw-r--r--Doc/ACKS.txt2
-rw-r--r--Doc/c-api/init.rst6
-rw-r--r--Doc/library/2to3.rst41
-rw-r--r--Doc/library/codecs.rst6
-rw-r--r--Doc/library/collections.rst4
-rw-r--r--Doc/library/dis.rst3
-rw-r--r--Doc/library/email.parser.rst1
-rw-r--r--Doc/library/ftplib.rst2
-rw-r--r--Doc/library/functions.rst12
-rw-r--r--Doc/library/heapq.rst2
-rw-r--r--Doc/library/select.rst8
-rw-r--r--Doc/library/socket.rst14
-rw-r--r--Doc/library/sqlite3.rst201
-rw-r--r--Doc/library/stdtypes.rst3
-rw-r--r--Doc/library/subprocess.rst4
-rw-r--r--Doc/library/tempfile.rst2
-rw-r--r--Doc/library/thread.rst2
-rw-r--r--Doc/library/threading.rst320
-rw-r--r--Doc/reference/datamodel.rst4
-rw-r--r--Doc/reference/simple_stmts.rst9
-rw-r--r--Doc/tutorial/controlflow.rst35
-rw-r--r--Doc/whatsnew/2.6.rst346
-rw-r--r--Lib/json/tests/test_scanstring.py7
-rw-r--r--Lib/lib2to3/fixes/fix_next.py15
-rw-r--r--Lib/lib2to3/fixes/fix_set_literal.py52
-rw-r--r--Lib/lib2to3/main.py50
-rwxr-xr-xLib/lib2to3/refactor.py18
-rw-r--r--Lib/lib2to3/tests/data/README3
-rwxr-xr-xLib/lib2to3/tests/test_fixers.py128
-rwxr-xr-xLib/lib2to3/tests/test_pytree.py28
-rw-r--r--Lib/lib2to3/tests/test_refactor.py7
-rw-r--r--Lib/optparse.py22
-rw-r--r--Lib/test/test_bisect.py11
-rw-r--r--Lib/test/test_bytes.py4
-rw-r--r--Lib/test/test_descr.py10
-rw-r--r--Lib/test/test_fileio.py10
-rw-r--r--Lib/test/test_io.py7
-rw-r--r--Lib/test/test_urllib.py4
-rw-r--r--Lib/test/test_xrange.py2
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_bisectmodule.c4
-rw-r--r--Modules/_fileio.c2
-rw-r--r--Modules/_json.c18
-rw-r--r--Objects/dictobject.c10
-rwxr-xr-xParser/asdl_c.py18
-rw-r--r--Python/Python-ast.c18
-rwxr-xr-xTools/scripts/findnocoding.py2
-rwxr-xr-xTools/scripts/reindent.py3
48 files changed, 941 insertions, 541 deletions
diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
index 84d7339..0bff6bd 100644
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -16,6 +16,7 @@ docs@python.org), and we'll be glad to correct the problem.
* A. Amoroso
* Pehr Anderson
* Oliver Andrich
+ * Heidi Annexstad
* Jesús Cea Avión
* Daniel Barclay
* Chris Barker
@@ -189,6 +190,7 @@ docs@python.org), and we'll be glad to correct the problem.
* Reuben Sumner
* Kalle Svensson
* Jim Tittsler
+ * David Turner
* Ville Vainio
* Martijn Vries
* Charles G. Waldman
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index dd2c531..17fb82e 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -755,11 +755,11 @@ created.
:cmacro:`Py_END_ALLOW_THREADS` macros is acceptable.
The return value is an opaque "handle" to the thread state when
- :cfunc:`PyGILState_Acquire` was called, and must be passed to
+ :cfunc:`PyGILState_Ensure` was called, and must be passed to
:cfunc:`PyGILState_Release` to ensure Python is left in the same state. Even
though recursive calls are allowed, these handles *cannot* be shared - each
- unique call to :cfunc:`PyGILState_Ensure` must save the handle for its call to
- :cfunc:`PyGILState_Release`.
+ unique call to :cfunc:`PyGILState_Ensure` must save the handle for its call
+ to :cfunc:`PyGILState_Release`.
When the function returns, the current thread will hold the GIL. Failure is a
fatal error.
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst