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

Skip to content

Commit b044b2a

Browse files
birkenfeldbirkenfeld
committed
Merged revisions 74821,74828-74831,74833,74835 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r74821 | georg.brandl | 2009-09-16 11:42:19 +0200 (Mi, 16 Sep 2009) | 1 line #6885: run python 3 as python3. ................ r74828 | georg.brandl | 2009-09-16 16:23:20 +0200 (Mi, 16 Sep 2009) | 1 line Use true booleans. ................ r74829 | georg.brandl | 2009-09-16 16:24:29 +0200 (Mi, 16 Sep 2009) | 1 line Small PEP8 correction. ................ r74830 | georg.brandl | 2009-09-16 16:36:22 +0200 (Mi, 16 Sep 2009) | 1 line Use true booleans. ................ r74831 | georg.brandl | 2009-09-16 17:54:04 +0200 (Mi, 16 Sep 2009) | 1 line Use true booleans and PEP8 for argdefaults. ................ r74833 | georg.brandl | 2009-09-16 17:58:14 +0200 (Mi, 16 Sep 2009) | 1 line Last round of adapting style of documenting argument default values. ................ r74835 | georg.brandl | 2009-09-16 18:00:31 +0200 (Mi, 16 Sep 2009) | 33 lines Merged revisions 74817-74820,74822-74824 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74817 | georg.brandl | 2009-09-16 11:05:11 +0200 (Mi, 16 Sep 2009) | 1 line Make deprecation notices as visible as warnings are right now. ........ r74818 | georg.brandl | 2009-09-16 11:23:04 +0200 (Mi, 16 Sep 2009) | 1 line #6880: add reference to classes section in exceptions section, which comes earlier. ........ r74819 | georg.brandl | 2009-09-16 11:24:57 +0200 (Mi, 16 Sep 2009) | 1 line #6876: fix base class constructor invocation in example. ........ r74820 | georg.brandl | 2009-09-16 11:30:48 +0200 (Mi, 16 Sep 2009) | 1 line #6891: comment out dead link to Unicode article. ........ r74822 | georg.brandl | 2009-09-16 12:12:06 +0200 (Mi, 16 Sep 2009) | 1 line #5621: refactor description of how class/instance attributes interact on a.x=a.x+1 or augassign. ........ r74823 | georg.brandl | 2009-09-16 15:06:22 +0200 (Mi, 16 Sep 2009) | 1 line Remove strange trailing commas. ........ r74824 | georg.brandl | 2009-09-16 15:11:06 +0200 (Mi, 16 Sep 2009) | 1 line #6892: fix optparse example involving help option. ........ ................
1 parent f4b4623 commit b044b2a

79 files changed

Lines changed: 611 additions & 629 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Doc/howto/unicode.rst‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,12 @@ To help understand the standard, Jukka Korpela has written an introductory guide
212212
to reading the Unicode character tables, available at
213213
<http://www.cs.tut.fi/~jkorpela/unicode/guide.html>.
214214

215-
Two other good introductory articles were written by Joel Spolsky
216-
<http://www.joelonsoftware.com/articles/Unicode.html> and Jason Orendorff
217-
<http://www.jorendorff.com/articles/unicode/>. If this introduction didn't make
218-
things clear to you, you should try reading one of these alternate articles
219-
before continuing.
215+
Another good introductory article was written by Joel Spolsky
216+
<http://www.joelonsoftware.com/articles/Unicode.html>.
217+
If this introduction didn't make things clear to you, you should try reading this
218+
alternate article before continuing.
219+
220+
.. Jason Orendorff XXX http://www.jorendorff.com/articles/unicode/ is broken
220221
221222
Wikipedia entries are often helpful; see the entries for "character encoding"
222223
<http://en.wikipedia.org/wiki/Character_encoding> and UTF-8

‎Doc/library/optparse.rst‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ user-friendly (documented) options::
467467
action="store_false", dest="verbose",
468468
help="be vewwy quiet (I'm hunting wabbits)")
469469
parser.add_option("-f", "--filename",
470-
metavar="FILE", help="write output to FILE"),
470+
metavar="FILE", help="write output to FILE")
471471
parser.add_option("-m", "--mode",
472472
default="intermediate",
473473
help="interaction mode: novice, intermediate, "
@@ -1014,12 +1014,15 @@ must specify for any option using that action.
10141014

10151015
from optparse import OptionParser, SUPPRESS_HELP
10161016

1017-
parser = OptionParser()
1018-
parser.add_option("-h", "--help", action="help"),
1017+
# usually, a help option is added automatically, but that can
1018+
# be suppressed using the add_help_option argument
1019+
parser = OptionParser(add_help_option=False)
1020+
1021+
parser.add_option("-h", "--help", action="help")
10191022
parser.add_option("-v", action="store_true", dest="verbose",
10201023
help="Be moderately verbose")
10211024
parser.add_option("--file", dest="filename",
1022-
help="Input file to read data from"),
1025+
help="Input file to read data from")
10231026
parser.add_option("--secret", help=SUPPRESS_HELP)
10241027

10251028
If :mod:`optparse` sees either ``"-h"`` or ``"--help"`` on the command line, it

‎Doc/library/pdb.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ of the debugger is::
4141
:file:`pdb.py` can also be invoked as a script to debug other scripts. For
4242
example::
4343

44-
python -m pdb myscript.py
44+
python3 -m pdb myscript.py
4545

4646
When invoked as a script, pdb will automatically enter post-mortem debugging if
4747
the program being debugged exits abnormally. After post-mortem debugging (or

‎Doc/library/readline.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ support history save/restore. ::
206206
class HistoryConsole(code.InteractiveConsole):
207207
def __init__(self, locals=None, filename="<console>",
208208
histfile=os.path.expanduser("~/.console-history")):
209-
code.InteractiveConsole.__init__(self)
209+
code.InteractiveConsole.__init__(self, locals, filename)
210210
self.init_history(histfile)
211211

212212
def init_history(self, histfile):

‎Doc/library/someos.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
.. _someos:
32

43
**********************************
@@ -8,7 +7,7 @@ Optional Operating System Services
87
The modules described in this chapter provide interfaces to operating system
98
features that are available on selected operating systems only. The interfaces
109
are generally modeled after the Unix or C interfaces but they are available on
11-
some other systems as well (e.g. Windows or NT). Here's an overview:
10+
some other systems as well (e.g. Windows). Here's an overview:
1211

1312

1413
.. toctree::

‎Doc/library/spwd.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
:mod:`spwd` --- The shadow password database
32
============================================
43

@@ -48,7 +47,7 @@ below, see ``<shadow.h>``):
4847
The sp_nam and sp_pwd items are strings, all others are integers.
4948
:exc:`KeyError` is raised if the entry asked for cannot be found.
5049

51-
It defines the following items:
50+
The following functions are defined:
5251

5352

5453
.. function:: getspnam(name)

‎Doc/library/ssl.rst‎

Lines changed: 261 additions & 275 deletions
Large diffs are not rendered by default.

‎Doc/library/stat.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
21
:mod:`stat` --- Interpreting :func:`stat` results
32
=================================================
43

54
.. module:: stat
6-
:synopsis: Utilities for interpreting the results of os.stat(), os.lstat() and os.fstat().
5+
:synopsis: Utilities for interpreting the results of os.stat(),
6+
os.lstat() and os.fstat().
77
.. sectionauthor:: Skip Montanaro <[email protected]>
88

99

‎Doc/library/string.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -479,19 +479,19 @@ these rules. The methods of :class:`Template` are:
479479
The constructor takes a single argument which is the template string.
480480

481481

482-
.. method:: substitute(mapping[, **kws])
482+
.. method:: substitute(mapping, **kwds)
483483

484484
Performs the template substitution, returning a new string. *mapping* is
485485
any dictionary-like object with keys that match the placeholders in the
486486
template. Alternatively, you can provide keyword arguments, where the
487-
keywords are the placeholders. When both *mapping* and *kws* are given
488-
and there are duplicates, the placeholders from *kws* take precedence.
487+
keywords are the placeholders. When both *mapping* and *kwds* are given
488+
and there are duplicates, the placeholders from *kwds* take precedence.
489489

490490

491-
.. method:: safe_substitute(mapping[, **kws])
491+
.. method:: safe_substitute(mapping, **kwds)
492492

493493
Like :meth:`substitute`, except that if placeholders are missing from
494-
*mapping* and *kws*, instead of raising a :exc:`KeyError` exception, the
494+
*mapping* and *kwds*, instead of raising a :exc:`KeyError` exception, the
495495
original placeholder will appear in the resulting string intact. Also,
496496
unlike with :meth:`substitute`, any other appearances of the ``$`` will
497497
simply return ``$`` instead of raising :exc:`ValueError`.

‎Doc/library/stringprep.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
:mod:`stringprep` --- Internet String Preparation
32
=================================================
43

0 commit comments

Comments
 (0)