diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2015-11-02 04:04:57 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2015-11-02 04:04:57 (GMT) |
| commit | 2eb819f7a82c7eb61f2d253894d9973f0ec21df2 (patch) | |
| tree | c881e371e6ae948cbd725afd91fa8f5b0c6c940f /Objects | |
| parent | 56275dc1e2a2f354620189efd751fa90af2118e1 (diff) | |
| parent | 7462b64911f1e2df2de2285ddbf8b156b5cdc418 (diff) | |
| download | cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.zip cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.tar.gz cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.tar.bz2 | |
Issue #25523: Merge "a" to "an" fixes from 3.4 into 3.5
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/abstract.c | 2 | ||||
| -rw-r--r-- | Objects/exceptions.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 039a4ca..63fcf15 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1288,7 +1288,7 @@ PyNumber_Long(PyObject *o) if (truncated == NULL || PyLong_Check(truncated)) return truncated; /* __trunc__ is specified to return an Integral type, - but int() needs to return a int. */ + but int() needs to return an int. */ m = truncated->ob_type->tp_as_number; if (m == NULL || m->nb_int == NULL) { PyErr_Format( diff --git a/Objects/exceptions.c b/Objects/exceptions.c index a275997..f5a1a2b 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -874,7 +874,7 @@ OSError_init(PyOSErrorObject *self, PyObject *args, PyObject *kwds); static int oserror_use_init(PyTypeObject *type) { - /* When __init__ is defined in a OSError subclass, we want any + /* When __init__ is defined in an OSError subclass, we want any extraneous argument to __new__ to be ignored. The only reasonable solution, given __new__ takes a variable number of arguments, is to defer arg parsing and initialization to __init__. |