Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2202f87

Browse files
tirantiran
committed
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r60568 | christian.heimes | 2008-02-04 19:48:38 +0100 (Mon, 04 Feb 2008) | 1 line Increase debugging to investige failing tests on some build bots ........ r60570 | christian.heimes | 2008-02-04 20:30:05 +0100 (Mon, 04 Feb 2008) | 1 line Small adjustments for test compact freelist test. It's no passing on Windows as well. ........ r60573 | amaury.forgeotdarc | 2008-02-04 21:53:14 +0100 (Mon, 04 Feb 2008) | 2 lines Correct quotes in NEWS file ........ r60575 | amaury.forgeotdarc | 2008-02-04 22:45:05 +0100 (Mon, 04 Feb 2008) | 13 lines #1750076: Debugger did not step on every iteration of a while statement. The mapping between bytecode offsets and source lines (lnotab) did not contain an entry for the beginning of the loop. Now it does, and the lnotab can be a bit larger: in particular, several statements on the same line generate several entries. However, this does not bother the settrace function, which will trigger only one 'line' event. The lnotab seems to be exactly the same as with python2.4. ........ r60584 | amaury.forgeotdarc | 2008-02-05 01:26:21 +0100 (Tue, 05 Feb 2008) | 3 lines Change r60575 broke test_compile: there is no need to emit co_lnotab item when both offsets are zeros. ........ r60587 | skip.montanaro | 2008-02-05 03:32:16 +0100 (Tue, 05 Feb 2008) | 1 line sync with most recent version from python-mode sf project ........ r60588 | lars.gustaebel | 2008-02-05 12:51:40 +0100 (Tue, 05 Feb 2008) | 5 lines Issue #2004: Use mode 0700 for temporary directories and default permissions for missing directories. (will backport to 2.5) ........ r60590 | georg.brandl | 2008-02-05 13:01:24 +0100 (Tue, 05 Feb 2008) | 2 lines Convert external links to internal links. Fixes #2010. ........ r60592 | marc-andre.lemburg | 2008-02-05 15:50:40 +0100 (Tue, 05 Feb 2008) | 3 lines Keep distutils Python 2.1 compatible (or even Python 2.4 in this case). ........ r60593 | andrew.kuchling | 2008-02-05 17:06:57 +0100 (Tue, 05 Feb 2008) | 5 lines Update PEP URL. (This code is duplicated between pydoc and DocXMLRPCServer; maybe it should be refactored as a GHOP project.) 2.5.2 backport candidate. ........ r60596 | guido.van.rossum | 2008-02-05 18:32:15 +0100 (Tue, 05 Feb 2008) | 2 lines In the experimental 'Scanner' feature, the group count was set wrong. ........ r60602 | facundo.batista | 2008-02-05 20:03:32 +0100 (Tue, 05 Feb 2008) | 3 lines Issue 1951. Converts wave test cases to unittest. ........ r60603 | georg.brandl | 2008-02-05 20:07:10 +0100 (Tue, 05 Feb 2008) | 2 lines Actually run the test. ........ r60604 | skip.montanaro | 2008-02-05 20:24:30 +0100 (Tue, 05 Feb 2008) | 2 lines correct object name ........ r60605 | georg.brandl | 2008-02-05 20:58:17 +0100 (Tue, 05 Feb 2008) | 7 lines * Use the same code to profile for test_profile and test_cprofile. * Convert both to unittest. * Use the same unit testing code. * Include the expected output in both test files. * Make it possible to regenerate the expected output by running the file as a script with an '-r' argument. ........ r60613 | raymond.hettinger | 2008-02-06 02:49:00 +0100 (Wed, 06 Feb 2008) | 1 line Sync-up with Py3k work. ........ r60614 | christian.heimes | 2008-02-06 13:44:34 +0100 (Wed, 06 Feb 2008) | 1 line Limit free list of method and builtin function objects to 256 entries each. ........ r60616 | christian.heimes | 2008-02-06 14:33:44 +0100 (Wed, 06 Feb 2008) | 7 lines Unified naming convention for free lists and their limits. All free lists in Object/ are named ``free_list``, the counter ``numfree`` and the upper limit is a macro ``PyName_MAXFREELIST`` inside an #ifndef block. The chances should make it easier to adjust Python for platforms with less memory, e.g. mobile phones. ........
1 parent 8f2d006 commit 2202f87

29 files changed

Lines changed: 905 additions & 559 deletions

‎Doc/howto/advocacy.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ the organizations that use Python.
265265
**What are the restrictions on Python's use?**
266266

267267
They're practically nonexistent. Consult the :file:`Misc/COPYRIGHT` file in the
268-
source distribution, or http://www.python.org/doc/Copyright.html for the full
268+
source distribution, or the section :ref:`history-and-license` for the full
269269
language, but it boils down to three conditions.
270270

271271
* You have to leave the copyright notice on the software; if you don't include

‎Doc/howto/curses.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _curses-howto:
2+
13
**********************************
24
Curses Programming with Python
35
**********************************

‎Doc/howto/regex.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _regex-howto:
2+
13
****************************
24
Regular Expression HOWTO
35
****************************

‎Doc/howto/unicode.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ Unicode result). The following examples show the differences::
276276

277277
Encodings are specified as strings containing the encoding's name. Python
278278
comes with roughly 100 different encodings; see the Python Library Reference at
279-
<http://docs.python.org/lib/standard-encodings.html> for a list. Some encodings
279+
:ref:`standard-encodings` for a list. Some encodings
280280
have multiple names; for example, 'latin-1', 'iso_8859_1' and '8859' are all
281281
synonyms for the same encoding.
282282

‎Doc/library/curses.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ Linux and the BSD variants of Unix.
4545
Convenience function to ensure proper terminal setup and resetting on
4646
application entry and exit.
4747

48-
`Curses Programming with Python <http://www.python.org/doc/howto/curses/curses.html>`_
48+
:ref:`curses-howto`
4949
Tutorial material on using curses with Python, by Andrew Kuchling and Eric
50-
Raymond, is available on the Python Web site.
50+
Raymond.
5151

5252
The :file:`Demo/curses/` directory in the Python source distribution contains
5353
some example programs using the curses bindings provided by this module.

‎Doc/library/re.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ and implementation of regular expressions, consult the Friedl book referenced
6565
above, or almost any textbook about compiler construction.
6666

6767
A brief explanation of the format of regular expressions follows. For further
68-
information and a gentler presentation, consult the Regular Expression HOWTO,
69-
accessible from http://www.python.org/doc/howto/.
68+
information and a gentler presentation, consult the :ref:`regex-howto`.
7069

7170
Regular expressions can contain both special and ordinary characters. Most
7271
ordinary characters, like ``'A'``, ``'a'``, or ``'0'``, are the simplest regular

‎Lib/DocXMLRPCServer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def markup(self, text, escape=None, funcs={}, classes={}, methods={}):
3030
results = []
3131
here = 0
3232

33-
# XXX Note that this regular expressions does not allow for the
33+
# XXX Note that this regular expression does not allow for the
3434
# hyperlinking of arbitrary strings being used as method
3535
# names. Only methods with names consisting of word characters
3636
# and '.'s are hyperlinked.
@@ -52,7 +52,7 @@ def markup(self, text, escape=None, funcs={}, classes={}, methods={}):
5252
url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc)
5353
results.append('<a href="%s">%s</a>' % (url, escape(all)))
5454
elif pep:
55-
url = 'http://www.python.org/peps/pep-%04d.html' % int(pep)
55+
url = 'http://www.python.org/dev/peps/pep-%04d/' % int(pep)
5656
results.append('<a href="%s">%s</a>' % (url, escape(all)))
5757
elif text[end:end+1] == '(':
5858
results.append(self.namelink(name, methods, funcs, classes))

‎Lib/_abcoll.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ def __eq__(self, other):
385385
def __ne__(self, other):
386386
return not (self == other)
387387

388+
388389
class MappingView(metaclass=ABCMeta):
389390

390391
def __init__(self, mapping):

‎Lib/distutils/sysconfig.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@
3737
# different (hard-wired) directories.
3838
# Setup.local is available for Makefile builds including VPATH builds,
3939
# Setup.dist is available on Windows
40-
python_build = any(os.path.isfile(os.path.join(project_base, "Modules", fn))
41-
for fn in ("Setup.dist", "Setup.local"))
40+
def _python_build():
41+
for fn in ("Setup.dist", "Setup.local"):
42+
if os.path.isfile(os.path.join(project_base, "Modules", fn)):
43+
return True
44+
return False
45+
python_build = _python_build()
4246

4347
def get_python_version():
4448
"""Return a string containing the major and minor Python version,

‎Lib/pydoc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ def markup(self, text, escape=None, funcs={}, classes={}, methods={}):
536536
url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc)
537537
results.append('<a href="%s">%s</a>' % (url, escape(all)))
538538
elif pep:
539-
url = 'http://www.python.org/peps/pep-%04d' % int(pep)
539+
url = 'http://www.python.org/dev/peps/pep-%04d/' % int(pep)
540540
results.append('<a href="%s">%s</a>' % (url, escape(all)))
541541
elif text[end:end+1] == '(':
542542
results.append(self.namelink(name, methods, funcs, classes))

0 commit comments

Comments
 (0)