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

Skip to content

Commit 1e25755

Browse files
author
Stefan Krah
committed
Merge.
2 parents 0e41981 + daa0654 commit 1e25755

20 files changed

Lines changed: 1941 additions & 1938 deletions

‎Doc/glossary.rst‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Glossary
194194
An object exposing a file-oriented API (with methods such as
195195
:meth:`read()` or :meth:`write()`) to an underlying resource. Depending
196196
on the way it was created, a file object can mediate access to a real
197-
on-disk file or to another other type of storage or communication device
197+
on-disk file or to another type of storage or communication device
198198
(for example standard input/output, in-memory buffers, sockets, pipes,
199199
etc.). File objects are also called :dfn:`file-like objects` or
200200
:dfn:`streams`.
@@ -523,6 +523,20 @@ Glossary
523523
definition), or pass several arguments as a list to a function. See
524524
:term:`argument`.
525525

526+
provisional package
527+
A provisional package is one which has been deliberately excluded from the
528+
standard library's backwards compatibility guarantees. While major
529+
changes to such packages are not expected, as long as they are marked
530+
provisional, backwards incompatible changes (up to and including removal
531+
of the package) may occur if deemed necessary by core developers. Such
532+
changes will not be made gratuitously -- they will occur only if serious
533+
flaws are uncovered that were missed prior to the inclusion of the
534+
package.
535+
536+
This process allows the standard library to continue to evolve over time,
537+
without locking in problematic design errors for extended periods of time.
538+
See :pep:`411` for more details.
539+
526540
Python 3000
527541
Nickname for the Python 3.x release line (coined long ago when the release
528542
of version 3 was something in the distant future.) This is also

‎Doc/library/development.rst‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ The list of modules described in this chapter is:
2020
doctest.rst
2121
unittest.rst
2222
unittest.mock.rst
23-
unittest.mock-patch.rst
24-
unittest.mock-magicmethods.rst
25-
unittest.mock-helpers.rst
26-
unittest.mock-getting-started.rst
2723
unittest.mock-examples.rst
2824
2to3.rst
2925
test.rst

‎Doc/library/syslog.rst‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,14 @@ Priority levels (high to low):
7878
Facilities:
7979
:const:`LOG_KERN`, :const:`LOG_USER`, :const:`LOG_MAIL`, :const:`LOG_DAEMON`,
8080
:const:`LOG_AUTH`, :const:`LOG_LPR`, :const:`LOG_NEWS`, :const:`LOG_UUCP`,
81-
:const:`LOG_CRON` and :const:`LOG_LOCAL0` to :const:`LOG_LOCAL7`.
81+
:const:`LOG_CRON`, :const:`LOG_SYSLOG`, :const:`LOG_LOCAL0` to
82+
:const:`LOG_LOCAL7`, and, if defined in ``<syslog.h>``,
83+
:const:`LOG_AUTHPRIV`.
8284

8385
Log options:
84-
:const:`LOG_PID`, :const:`LOG_CONS`, :const:`LOG_NDELAY`, :const:`LOG_NOWAIT`
85-
and :const:`LOG_PERROR` if defined in ``<syslog.h>``.
86+
:const:`LOG_PID`, :const:`LOG_CONS`, :const:`LOG_NDELAY`, and, if defined
87+
in ``<syslog.h>``, :const:`LOG_ODELAY`, :const:`LOG_NOWAIT`, and
88+
:const:`LOG_PERROR`.
8689

8790

8891
Examples

‎Doc/library/time.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,26 +143,30 @@ The module defines the following functions and data items:
143143

144144
.. versionadded:: 3.3
145145

146+
146147
.. function:: clock_gettime(clk_id)
147148

148149
Return the time of the specified clock *clk_id*.
149150

150151
.. versionadded:: 3.3
151152

153+
152154
.. data:: CLOCK_REALTIME
153155

154156
System-wide real-time clock. Setting this clock requires appropriate
155157
privileges.
156158

157159
.. versionadded:: 3.3
158160

161+
159162
.. data:: CLOCK_MONOTONIC
160163

161164
Clock that cannot be set and represents monotonic time since some
162165
unspecified starting point.
163166

164167
.. versionadded:: 3.3
165168

169+
166170
.. data:: CLOCK_MONOTONIC_RAW
167171

168172
Similar to :data:`CLOCK_MONOTONIC`, but provides access to a raw
@@ -172,18 +176,21 @@ The module defines the following functions and data items:
172176

173177
.. versionadded:: 3.3
174178

179+
175180
.. data:: CLOCK_PROCESS_CPUTIME_ID
176181

177182
High-resolution per-process timer from the CPU.
178183

179184
.. versionadded:: 3.3
180185

186+
181187
.. data:: CLOCK_THREAD_CPUTIME_ID
182188

183189
Thread-specific CPU-time clock.
184190

185191
.. versionadded:: 3.3
186192

193+
187194
.. function:: ctime([secs])
188195

189196
Convert a time expressed in seconds since the epoch to a string representing

0 commit comments

Comments
 (0)