Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
82f34ada
Commit
82f34ada
authored
Jan 13, 2015
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix instances of consecutive articles (closes #23221)
Patch by Karan Goel.
parent
38dc2505
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
14 additions
and
13 deletions
+14
-13
Doc/c-api/exceptions.rst
Doc/c-api/exceptions.rst
+1
-1
Doc/c-api/init.rst
Doc/c-api/init.rst
+1
-1
Doc/c-api/structures.rst
Doc/c-api/structures.rst
+1
-1
Doc/distutils/apiref.rst
Doc/distutils/apiref.rst
+1
-1
Doc/library/unittest.mock.rst
Doc/library/unittest.mock.rst
+1
-1
Include/dynamic_annotations.h
Include/dynamic_annotations.h
+1
-1
Include/unicodeobject.h
Include/unicodeobject.h
+1
-1
Lib/distutils/dir_util.py
Lib/distutils/dir_util.py
+1
-1
Lib/http/cookiejar.py
Lib/http/cookiejar.py
+1
-1
Lib/lib2to3/fixes/fix_exitfunc.py
Lib/lib2to3/fixes/fix_exitfunc.py
+1
-1
Lib/socket.py
Lib/socket.py
+1
-1
Lib/test/test_argparse.py
Lib/test/test_argparse.py
+1
-1
Misc/ACKS
Misc/ACKS
+1
-0
Modules/_ctypes/_ctypes.c
Modules/_ctypes/_ctypes.c
+1
-1
No files found.
Doc/c-api/exceptions.rst
View file @
82f34ada
...
...
@@ -64,7 +64,7 @@ in various ways. There is a separate error indicator for each thread.
Do not compare the return value to a specific exception; use
:c:func:`PyErr_ExceptionMatches` instead, shown below. (The comparison could
easily fail since the exception may be an instance instead of a class, in the
case of a class exception, or it may
th
e a subclass of the expected exception.)
case of a class exception, or it may
b
e a subclass of the expected exception.)
.. c:function:: int PyErr_ExceptionMatches(PyObject *exc)
...
...
Doc/c-api/init.rst
View file @
82f34ada
...
...
@@ -1182,7 +1182,7 @@ These functions are only intended to be used by advanced debugging tools.
.. c:function:: PyThreadState * PyInterpreterState_ThreadHead(PyInterpreterState *interp)
Return the
a
pointer to the first :c:type:`PyThreadState` object in the list of
Return the pointer to the first :c:type:`PyThreadState` object in the list of
threads associated with the interpreter *interp*.
...
...
Doc/c-api/structures.rst
View file @
82f34ada
...
...
@@ -131,7 +131,7 @@ The :attr:`ml_meth` is a C function pointer. The functions may be of different
types, but they always return :c:type:`PyObject\*`. If the function is not of
the :c:type:`PyCFunction`, the compiler will require a cast in the method table.
Even though :c:type:`PyCFunction` defines the first parameter as
:c:type:`PyObject\*`, it is common that the method implementation uses
a
the
:c:type:`PyObject\*`, it is common that the method implementation uses the
specific C type of the *self* object.
The :attr:`ml_flags` field is a bitfield which can include the following flags.
...
...
Doc/distutils/apiref.rst
View file @
82f34ada
...
...
@@ -964,7 +964,7 @@ directories.
.. function:: create_tree(base_dir, files[, mode=0o777, verbose=0, dry_run=0])
Create all the empty directories under *base_dir* needed to put *files* there.
*base_dir* is just the
a
name of a directory which doesn't necessarily exist
*base_dir* is just the name of a directory which doesn't necessarily exist
yet; *files* is a list of filenames to be interpreted relative to *base_dir*.
*base_dir* + the directory portion of every file in *files* will be created if
it doesn't already exist. *mode*, *verbose* and *dry_run* flags are as for
...
...
Doc/library/unittest.mock.rst
View file @
82f34ada
...
...
@@ -1499,7 +1499,7 @@ where we have imported it. The patching should look like::
However, consider the alternative scenario where instead of ``from a import
SomeClass`` module b does ``import a`` and ``some_function`` uses ``a.SomeClass``. Both
of these import forms are common. In this case the class we want to patch is
being looked up
on the a
module and so we have to patch ``a.SomeClass`` instead::
being looked up
in the
module and so we have to patch ``a.SomeClass`` instead::
@patch('a.SomeClass')
...
...
Include/dynamic_annotations.h
View file @
82f34ada
...
...
@@ -150,7 +150,7 @@
/* Report that a new memory at "address" of size "size" has been allocated.
This might be used when the memory has been retrieved from a free list and
is about to be reused, or when
a
the locking discipline for a variable
is about to be reused, or when the locking discipline for a variable
changes. */
#define _Py_ANNOTATE_NEW_MEMORY(address, size) \
AnnotateNewMemory(__FILE__, __LINE__, address, size)
...
...
Include/unicodeobject.h
View file @
82f34ada
...
...
@@ -605,7 +605,7 @@ PyAPI_FUNC(PyObject*) PyUnicode_New(
);
#endif
/* Initializes the canonical string representation from
a
the deprecated
/* Initializes the canonical string representation from the deprecated
wstr/Py_UNICODE representation. This function is used to convert Unicode
objects which were created using the old API to the new flexible format
introduced with PEP 393.
...
...
Lib/distutils/dir_util.py
View file @
82f34ada
...
...
@@ -81,7 +81,7 @@ def create_tree(base_dir, files, mode=0o777, verbose=1, dry_run=0):
"""Create all the empty directories under 'base_dir' needed to put 'files'
there.
'base_dir' is just the
a
name of a directory which doesn't necessarily
'base_dir' is just the name of a directory which doesn't necessarily
exist yet; 'files' is a list of filenames to be interpreted relative to
'base_dir'. 'base_dir' + the directory portion of every file in 'files'
will be created if it doesn't already exist. 'mode', 'verbose' and
...
...
Lib/http/cookiejar.py
View file @
82f34ada
...
...
@@ -1792,7 +1792,7 @@ class FileCookieJar(CookieJar):
def lwp_cookie_str(cookie):
"""
Return
string
representation
of
Cookie
in
an
the
LWP
cookie
file
format
.
"""
Return
string
representation
of
Cookie
in
the
LWP
cookie
file
format
.
Actually
,
the
format
is
extended
a
bit
--
see
module
docstring
.
...
...
Lib/lib2to3/fixes/fix_exitfunc.py
View file @
82f34ada
...
...
@@ -35,7 +35,7 @@ class FixExitfunc(fixer_base.BaseFix):
self
.
sys_import
=
None
def
transform
(
self
,
node
,
results
):
# First, find
a
the sys import. We'll just hope it's global scope.
# First, find the sys import. We'll just hope it's global scope.
if
"sys_import"
in
results
:
if
self
.
sys_import
is
None
:
self
.
sys_import
=
results
[
"sys_import"
]
...
...
Lib/socket.py
View file @
82f34ada
...
...
@@ -299,7 +299,7 @@ if hasattr(_socket.socket, "share"):
def
fromshare
(
info
):
""" fromshare(info) -> socket object
Create a socket object from
a
the bytes object returned by
Create a socket object from the bytes object returned by
socket.share(pid).
"""
return
socket
(
0
,
0
,
0
,
info
)
...
...
Lib/test/test_argparse.py
View file @
82f34ada
...
...
@@ -644,7 +644,7 @@ class TestOptionalsChoices(ParserTestCase):
class
TestOptionalsRequired
(
ParserTestCase
):
"""Tests
the
an optional action that is required"""
"""Tests an optional action that is required"""
argument_signatures
=
[
Sig
(
'-x'
,
type
=
int
,
required
=
True
),
...
...
Misc/ACKS
View file @
82f34ada
...
...
@@ -483,6 +483,7 @@ Yannick Gingras
Matt Giuca
Wim Glenn
Michael Goderbauer
Karan Goel
Jeroen Van Goey
Christoph Gohlke
Tim Golden
...
...
Modules/_ctypes/_ctypes.c
View file @
82f34ada
...
...
@@ -4830,7 +4830,7 @@ Pointer_set_contents(CDataObject *self, PyObject *value, void *closure)
*
(
void
**
)
self
->
b_ptr
=
dst
->
b_ptr
;
/*
A Pointer instance must keep
a
the value it points to alive. So, a
A Pointer instance must keep the value it points to alive. So, a
pointer instance has b_length set to 2 instead of 1, and we set
'value' itself as the second item of the b_objects list, additionally.
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment