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

Skip to content

Commit 1b329e7

Browse files
larryhastingslarryhastings
committed
Merge.
2 parents 9bb2005 + 1e957d1 commit 1b329e7

110 files changed

Lines changed: 1523 additions & 794 deletions

File tree

Some content is hidden

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

‎.hgtags‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2
146146
b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
147147
04f3f725896c6961212c3a12e8ac25be6958f4fa v3.4.4rc1
148148
737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4
149+
3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
149150
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
150151
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
151152
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3

‎Doc/Makefile‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ autobuild-dev:
166166
-make suspicious
167167

168168
# for quick rebuilds (HTML only)
169-
autobuild-html:
169+
autobuild-dev-html:
170170
make html SPHINXOPTS='-A daily=1 -A versionswitcher=1'
171171

172172
# for stable releases: only build if not in pre-release stage (alpha, beta)
@@ -177,3 +177,10 @@ autobuild-stable:
177177
exit 1;; \
178178
esac
179179
@make autobuild-dev
180+
181+
autobuild-stable-html:
182+
@case $(DISTVERSION) in *[ab]*) \
183+
echo "Not building; $(DISTVERSION) is not a release version."; \
184+
exit 1;; \
185+
esac
186+
@make autobuild-dev-html

‎Doc/c-api/module.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ Module Objects
5959
.. index:: single: __dict__ (module attribute)
6060
6161
Return the dictionary object that implements *module*'s namespace; this object
62-
is the same as the :attr:`__dict__` attribute of the module object. This
62+
is the same as the :attr:`~object.__dict__` attribute of the module object. This
6363
function never fails. It is recommended extensions use other
6464
:c:func:`PyModule_\*` and :c:func:`PyObject_\*` functions rather than directly
65-
manipulate a module's :attr:`__dict__`.
65+
manipulate a module's :attr:`~object.__dict__`.
6666
6767
6868
.. c:function:: PyObject* PyModule_GetNameObject(PyObject *module)

‎Doc/c-api/structures.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,8 @@ specific C type of the *self* object.
150150
The :attr:`ml_flags` field is a bitfield which can include the following flags.
151151
The individual flags indicate either a calling convention or a binding
152152
convention. Of the calling convention flags, only :const:`METH_VARARGS` and
153-
:const:`METH_KEYWORDS` can be combined (but note that :const:`METH_KEYWORDS`
154-
alone is equivalent to ``METH_VARARGS | METH_KEYWORDS``). Any of the calling
155-
convention flags can be combined with a binding flag.
153+
:const:`METH_KEYWORDS` can be combined. Any of the calling convention flags
154+
can be combined with a binding flag.
156155

157156

158157
.. data:: METH_VARARGS

‎Doc/c-api/typeobj.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ type objects) *must* have the :attr:`ob_size` field.
111111
For statically allocated type objects, the tp_name field should contain a dot.
112112
Everything before the last dot is made accessible as the :attr:`__module__`
113113
attribute, and everything after the last dot is made accessible as the
114-
:attr:`__name__` attribute.
114+
:attr:`~definition.__name__` attribute.
115115

116116
If no dot is present, the entire :c:member:`~PyTypeObject.tp_name` field is made accessible as the
117-
:attr:`__name__` attribute, and the :attr:`__module__` attribute is undefined
117+
:attr:`~definition.__name__` attribute, and the :attr:`__module__` attribute is undefined
118118
(unless explicitly set in the dictionary, as explained above). This means your
119119
type will be impossible to pickle.
120120

‎Doc/faq/general.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ remember the methods for a list, they can do something like this::
438438
>>> L
439439
[1]
440440

441-
With the interpreter, documentation is never far from the student as he's
441+
With the interpreter, documentation is never far from the student as they are
442442
programming.
443443

444444
There are also good IDEs for Python. IDLE is a cross-platform IDE for Python

‎Doc/howto/regex.rst‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,7 @@ module. If you have :mod:`tkinter` available, you may also want to look at
374374
:source:`Tools/demo/redemo.py`, a demonstration program included with the
375375
Python distribution. It allows you to enter REs and strings, and displays
376376
whether the RE matches or fails. :file:`redemo.py` can be quite useful when
377-
trying to debug a complicated RE. Phil Schwartz's `Kodos
378-
<http://kodos.sourceforge.net/>`_ is also an interactive tool for developing and
379-
testing RE patterns.
377+
trying to debug a complicated RE.
380378

381379
This HOWTO uses the standard Python interpreter for its examples. First, run the
382380
Python interpreter, import the :mod:`re` module, and compile a RE::

‎Doc/library/builtins.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ that wants to implement an :func:`open` function that wraps the built-in
3737

3838
As an implementation detail, most modules have the name ``__builtins__`` made
3939
available as part of their globals. The value of ``__builtins__`` is normally
40-
either this module or the value of this module's :attr:`__dict__` attribute.
40+
either this module or the value of this module's :attr:`~object.__dict__` attribute.
4141
Since this is an implementation detail, it may not be used by alternate
4242
implementations of Python.

‎Doc/library/curses.ascii.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ C library:
115115

116116
.. function:: isblank(c)
117117

118-
Checks for an ASCII whitespace character.
118+
Checks for an ASCII whitespace character; space or horizontal tab.
119119

120120

121121
.. function:: iscntrl(c)
122122

123-
Checks for an ASCII control character (in the range 0x00 to 0x1f).
123+
Checks for an ASCII control character (in the range 0x00 to 0x1f or 0x7f).
124124

125125

126126
.. function:: isdigit(c)

‎Doc/library/dbm.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ The individual submodules are described in the following sections.
128128
:platform: Unix
129129
:synopsis: GNU's reinterpretation of dbm.
130130

131+
**Source code:** :source:`Lib/dbm/gnu.py`
132+
133+
--------------
131134

132135
This module is quite similar to the :mod:`dbm` module, but uses the GNU library
133136
``gdbm`` instead to provide some additional functionality. Please note that the
@@ -237,6 +240,9 @@ supported.
237240
:platform: Unix
238241
:synopsis: The standard "database" interface, based on ndbm.
239242

243+
**Source code:** :source:`Lib/dbm/ndbm.py`
244+
245+
--------------
240246

241247
The :mod:`dbm.ndbm` module provides an interface to the Unix "(n)dbm" library.
242248
Dbm objects behave like mappings (dictionaries), except that keys and values are
@@ -299,6 +305,8 @@ to locate the appropriate header file to simplify building this module.
299305
.. module:: dbm.dumb
300306
:synopsis: Portable implementation of the simple DBM interface.
301307

308+
**Source code:** :source:`Lib/dbm/dumb.py`
309+
302310
.. index:: single: databases
303311

304312
.. note::
@@ -308,6 +316,8 @@ to locate the appropriate header file to simplify building this module.
308316
module is not written for speed and is not nearly as heavily used as the other
309317
database modules.
310318

319+
--------------
320+
311321
The :mod:`dbm.dumb` module provides a persistent dictionary-like interface which
312322
is written entirely in Python. Unlike other modules such as :mod:`dbm.gnu` no
313323
external library is required. As with other persistent mappings, the keys and

0 commit comments

Comments
 (0)