Skip to content

Commit 255f53b

Browse files
tirantiran
committed
Merged revisions 59376-59406 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r59377 | georg.brandl | 2007-12-06 01:24:23 +0100 (Thu, 06 Dec 2007) | 2 lines Add another GHOP student to ACKS. ........ r59378 | raymond.hettinger | 2007-12-06 01:56:53 +0100 (Thu, 06 Dec 2007) | 5 lines Fix Issue 1045. Factor-out common calling code by simplifying the length_hint API. Speed-up the function by caching the PyObject_String for the attribute lookup. ........ r59380 | georg.brandl | 2007-12-06 02:52:24 +0100 (Thu, 06 Dec 2007) | 2 lines Diverse markup fixes. ........ r59383 | georg.brandl | 2007-12-06 10:45:39 +0100 (Thu, 06 Dec 2007) | 2 lines Better re.split examples. ........ r59386 | christian.heimes | 2007-12-06 14:15:13 +0100 (Thu, 06 Dec 2007) | 2 lines Fixed get_config_h_filename for Windows. Without the patch it can't find the pyconfig.h file inside a build tree. Added several small unit tests for sysconfig. ........ r59387 | christian.heimes | 2007-12-06 14:30:11 +0100 (Thu, 06 Dec 2007) | 1 line Silence more warnings, _CRT_NONSTDC_NO_DEPRECATE is already defined in pyconfig.h but several projects don't include it. ........ r59389 | christian.heimes | 2007-12-06 14:55:01 +0100 (Thu, 06 Dec 2007) | 1 line Disabled one test that is failing on Unix ........ r59399 | christian.heimes | 2007-12-06 22:13:06 +0100 (Thu, 06 Dec 2007) | 8 lines Several Windows related cleanups: * Removed a #define from pyconfig.h. The macro was already defined a few lines higher. * Fixed path to tix in the build_tkinter.py script * Changed make_buildinfo.c to use versions of unlink and strcat which are considered safe by Windows (as suggested by MvL). * Removed two defines from pyproject.vsprops that are no longer required. Both are defined in pyconfig.h and make_buildinfo.c doesn't use the unsafe versions any more (as suggested by MvL). * Added some more information about PGO and the property files to PCbuild9/readme.txt. Are you fine with the changes, Martin? ........ r59400 | raymond.hettinger | 2007-12-07 02:53:01 +0100 (Fri, 07 Dec 2007) | 4 lines Don't have the docs berate themselves. Keep a professional tone. If a todo is needed, put it in the tracker. ........ r59402 | georg.brandl | 2007-12-07 10:07:10 +0100 (Fri, 07 Dec 2007) | 3 lines Increase unit test coverage of SimpleXMLRPCServer. Written for GHOP by Turkay Eren. ........ r59406 | georg.brandl | 2007-12-07 16:16:57 +0100 (Fri, 07 Dec 2007) | 2 lines Update to windows doc from Robert. ........
1 parent 226679a commit 255f53b

File tree

23 files changed

+260
-133
lines changed

23 files changed

+260
-133
lines changed

‎Doc/ACKS.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ docs@python.org), and we'll be glad to correct the problem.
122122
* Vincent Marchetti
123123
* Laura Matson
124124
* Daniel May
125+
* Rebecca McCreary
125126
* Doug Mennella
126127
* Paolo Milani
127128
* Skip Montanaro

‎Doc/c-api/newtypes.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,13 +1541,13 @@ Sequence Object Structures
15411541
.. cmember:: binaryfunc PySequenceMethods.sq_concat
15421542

15431543
This function is used by :cfunc:`PySequence_Concat` and has the same
1544-
signature. It is also used by the `+` operator, after trying the numeric
1544+
signature. It is also used by the ``+`` operator, after trying the numeric
15451545
addition via the :attr:`tp_as_number.nb_add` slot.
15461546

15471547
.. cmember:: ssizeargfunc PySequenceMethods.sq_repeat
15481548

15491549
This function is used by :cfunc:`PySequence_Repeat` and has the same
1550-
signature. It is also used by the `*` operator, after trying numeric
1550+
signature. It is also used by the ``*`` operator, after trying numeric
15511551
multiplication via the :attr:`tp_as_number.nb_mul` slot.
15521552

15531553
.. cmember:: ssizeargfunc PySequenceMethods.sq_item

‎Doc/library/bdb.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ something went wrong, or ``None`` if all is well.
239239
.. method:: Bdb.clear_bpbynumber(arg)
240240

241241
Delete the breakpoint which has the index *arg* in the
242-
:attr:`Breakpoint.bpbynumber`. If `arg` is not numeric or out of range,
242+
:attr:`Breakpoint.bpbynumber`. If *arg* is not numeric or out of range,
243243
return an error message.
244244

245245
.. method:: Bdb.clear_all_file_breaks(filename)

‎Doc/library/logging.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ functions.
741741
The proposal which described this feature for inclusion in the Python standard
742742
library.
743743

744-
`Original Python :mod:`logging` package <http://www.red-dove.com/python_logging.html>`_
744+
`Original Python logging package <http://www.red-dove.com/python_logging.html>`_
745745
This is the original source for the :mod:`logging` package. The version of the
746746
package available from this site is suitable for use with Python 1.5.2, 2.1.x
747747
and 2.2.x, which do not include the :mod:`logging` package in the standard

‎Doc/library/objects.rst‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,3 @@ from left to right. (Unary operators group from right to left, but there you
2525
have no real choice.) See :ref:`operator-summary` for the complete picture on
2626
operator priorities.
2727

28-
.. rubric:: Footnotes
29-
30-
.. [#] Most descriptions sorely lack explanations of the exceptions that may be raised
31-
--- this will be fixed in a future version of this manual.
32-

‎Doc/library/othergui.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ also available for Python:
4848
online `tutorial <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is
4949
available.
5050

51-
`PyQt <//http://www.riverbankcomputing.co.uk/pyqt/index.php>`_
51+
`PyQt <http://www.riverbankcomputing.co.uk/pyqt/index.php>`_
5252
PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit. Qt is an
5353
extensive C++ GUI application development framework that is
5454
available for Unix, Windows and Mac OS X. :program:`sip` is a tool

‎Doc/library/re.rst‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,16 +1078,21 @@ method is invaluable for converting textual data into data structures that can b
10781078
easily read and modified by Python as demonstrated in the following example that
10791079
creates a phonebook.
10801080

1081-
First, get the input using triple-quoted string syntax::
1081+
First, here is the input. Normally it may come from a file, here we are using
1082+
triple-quoted string syntax::
10821083

1083-
>>> input = """Ross McFluff 834.345.1254 155 Elm Street
1084-
Ronald Heathmore 892.345.3428 436 Finley Avenue
1085-
Frank Burger 925.541.7625 662 South Dogwood Way
1086-
Heather Albrecht 548.326.4584 919 Park Place"""
1084+
>>> input = """Ross McFluff: 834.345.1254 155 Elm Street
10871085

1088-
Then, convert the string into a list with each line having its own entry::
1086+
Ronald Heathmore: 892.345.3428 436 Finley Avenue
1087+
Frank Burger: 925.541.7625 662 South Dogwood Way
10891088

1090-
>>> entries = re.split("\n", input)
1089+
1090+
Heather Albrecht: 548.326.4584 919 Park Place"""
1091+
1092+
The entries are separated by one or more newlines. Now we convert the string
1093+
into a list with each nonempty line having its own entry::
1094+
1095+
>>> entries = re.split("\n+", input)
10911096
>>> entries
10921097
['Ross McFluff 834.345.1254 155 Elm Street',
10931098
'Ronald Heathmore 892.345.3428 436 Finley Avenue',
@@ -1098,16 +1103,17 @@ Finally, split each entry into a list with first name, last name, telephone
10981103
number, and address. We use the ``maxsplit`` paramater of :func:`split`
10991104
because the address has spaces, our splitting pattern, in it::
11001105

1101-
>>> [re.split(" ", entry, 3) for entry in entries]
1106+
>>> [re.split(":? ", entry, 3) for entry in entries]
11021107
[['Ross', 'McFluff', '834.345.1254', '155 Elm Street'],
11031108
['Ronald', 'Heathmore', '892.345.3428', '436 Finley Avenue'],
11041109
['Frank', 'Burger', '925.541.7625', '662 South Dogwood Way'],
11051110
['Heather', 'Albrecht', '548.326.4584', '919 Park Place']]
11061111

1107-
With a ``maxsplit`` of ``4``, we could seperate the house number from the street
1108-
name::
1112+
The ``:?`` pattern matches the colon after the last name, so that it does not
1113+
occur in the result list. With a ``maxsplit`` of ``4``, we could seperate the
1114+
house number from the street name::
11091115

1110-
>>> [re.split(" ", entry, 4) for entry in entries]
1116+
>>> [re.split(":? ", entry, 4) for entry in entries]
11111117
[['Ross', 'McFluff', '834.345.1254', '155', 'Elm Street'],
11121118
['Ronald', 'Heathmore', '892.345.3428', '436', 'Finley Avenue'],
11131119
['Frank', 'Burger', '925.541.7625', '662', 'South Dogwood Way'],

‎Doc/library/ssl.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,14 @@ Functions, Constants, and Exceptions
109109

110110
======================== ========= ========= ========== =========
111111
*client* / **server** **SSLv2** **SSLv3** **SSLv23** **TLSv1**
112+
------------------------ --------- --------- ---------- ---------
112113
*SSLv2* yes no yes* no
113114
*SSLv3* yes yes yes no
114115
*SSLv23* yes no yes no
115116
*TLSv1* no no yes yes
116117
======================== ========= ========= ========== =========
117118

118-
`*` In some older versions of OpenSSL (for instance, 0.9.7l on OS X 10.4),
119+
In some older versions of OpenSSL (for instance, 0.9.7l on OS X 10.4),
119120
an SSLv2 client could not connect to an SSLv23 server.
120121

121122
The parameter ``do_handshake_on_connect`` specifies whether to do the SSL

‎Doc/library/tarfile.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
The :mod:`tarfile` module makes it possible to read and write tar
1515
archives, including those using gzip or bz2 compression.
16-
(`.zip` files can be read and written using the :mod:`zipfile` module.)
16+
(:file:`.zip` files can be read and written using the :mod:`zipfile` module.)
1717

1818
Some facts and figures:
1919

‎Doc/using/windows.rst‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ key features:
7373
Popular modules (such as PyWin32) with their respective documentation, tool
7474
suite for building extensible python applications
7575

76+
Notice that these packages are likely to install *older* versions of Python.
77+
7678

7779

7880
Configuring Python
@@ -85,10 +87,11 @@ settings in Windows.
8587
Excursus: Setting environment variables
8688
---------------------------------------
8789

88-
Windows has a built-in dialog for changing environment variables: Right-click
89-
the icon for your machine (usually located on your Desktop and called "My
90-
Computer") and choose :menuselection:`Properties` there. Then, open the
91-
:guilabel:`Advanced` tab and click the :guilabel:`Environment Variables` button.
90+
Windows has a built-in dialog for changing environment variables (following
91+
guide applies to XP classical view): Right-click the icon for your machine
92+
(usually located on your Desktop and called "My Computer") and choose
93+
:menuselection:`Properties` there. Then, open the :guilabel:`Advanced` tab
94+
and click the :guilabel:`Environment Variables` button.
9295

9396
In short, your path is:
9497

@@ -107,7 +110,8 @@ command::
107110
set PYTHONPATH=%PYTHONPATH%;C:\My_python_lib
108111

109112
To make this setting permanent, you could add the corresponding command line to
110-
your :file:`autoexec.bat`.
113+
your :file:`autoexec.bat`. :program:`msconfig` is a graphical interface to this
114+
file.
111115

112116
Viewing environment variables can also be done more straight-forward: The
113117
command prompt will expand strings wrapped into percent signs automatically::
@@ -124,6 +128,9 @@ Consult :command:`set /?` for details on this behaviour.
124128
http://support.microsoft.com/kb/310519
125129
How To Manage Environment Variables in Windows XP
126130

131+
http://www.chem.gla.ac.uk/~louis/software/faq/q1.html
132+
Setting Environment variables, Louis J. Farrugia
133+
127134

128135
Finding the Python executable
129136
-----------------------------

0 commit comments

Comments
 (0)