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

Skip to content

Commit 14fb44e

Browse files
benjaminpbenjaminp
committed
merge mostly from default
2 parents 1764c80 + 99a247f commit 14fb44e

149 files changed

Lines changed: 5324 additions & 4354 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.

‎Doc/ACKS.txt‎

Lines changed: 0 additions & 239 deletions
This file was deleted.

‎Doc/about.rst‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,13 @@ Many thanks go to:
2929
See :ref:`reporting-bugs` for information how to report bugs in this
3030
documentation, or Python itself.
3131

32-
.. including the ACKS file here so that it can be maintained separately
33-
.. include:: ACKS.txt
32+
33+
Contributors to the Python Documentation
34+
----------------------------------------
35+
36+
Many people have contributed to the Python language, the Python standard
37+
library, and the Python documentation. See :source:`Misc/ACKS` in the Python
38+
source distribution for a partial list of contributors.
3439

3540
It is only with the input and contributions of the Python community
3641
that Python has such wonderful documentation -- Thank You!

‎Doc/c-api/import.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Importing Modules
7676
UTF-8 encoded string instead of a Unicode object.
7777
7878
.. versionchanged:: 3.3
79-
Negative values for **level** are no longer accepted.
79+
Negative values for *level* are no longer accepted.
8080
8181
.. c:function:: PyObject* PyImport_Import(PyObject *name)
8282

‎Doc/extending/newtypes.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,9 +1277,9 @@ that the slots are present and should be checked by the interpreter. (The flag
12771277
bit does not indicate that the slot values are non-*NULL*. The flag may be set
12781278
to indicate the presence of a slot, but a slot may still be unfilled.) ::
12791279

1280-
PyNumberMethods tp_as_number;
1281-
PySequenceMethods tp_as_sequence;
1282-
PyMappingMethods tp_as_mapping;
1280+
PyNumberMethods *tp_as_number;
1281+
PySequenceMethods *tp_as_sequence;
1282+
PyMappingMethods *tp_as_mapping;
12831283

12841284
If you wish your object to be able to act like a number, a sequence, or a
12851285
mapping object, then you place the address of a structure that implements the C

‎Doc/faq/windows.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -464,13 +464,13 @@ to console subprocesses which are designed to handle those signals. See
464464
Why does os.path.isdir() fail on NT shared directories?
465465
-------------------------------------------------------
466466

467-
The solution appears to be always append the "\\" on the end of shared
468-
drives.
467+
In order to work correctly, :func:`os.path.isdir` requires a ``"\\"`` at the
468+
end of the shared drive::
469469

470470
>>> import os
471-
>>> os.path.isdir( '\\\\rorschach\\public')
471+
>>> os.path.isdir('\\\\rorschach\\public')
472472
0
473-
>>> os.path.isdir( '\\\\rorschach\\public\\')
473+
>>> os.path.isdir('\\\\rorschach\\public\\')
474474
1
475475

476476
It helps to think of share points as being like drive letters. Example::
@@ -480,7 +480,7 @@ It helps to think of share points as being like drive letters. Example::
480480
k:\media is a directory
481481
k:\media\ is not a directory
482482

483-
The same rules apply if you substitute "k:" with "\\conky\foo"::
483+
The same rules apply if you substitute ``"k:"`` with ``"\\conky\foo"``::
484484

485485
\\conky\foo is not a directory
486486
\\conky\foo\ is a directory

0 commit comments

Comments
 (0)