diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 03:59:46 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 03:59:46 (GMT) |
| commit | 4969f709cc07088a40574c05724d83cddc8fafc7 (patch) | |
| tree | ddb254d02f2bd0c4d9d7c141f5f95521669042a0 /Objects | |
| parent | c48c19afe031d0a35a3d5aacddad4e113e1aeaf0 (diff) | |
| parent | 42da663e6fe7ecbb89b17d596c76812a91bb99a4 (diff) | |
| download | cpython-4969f709cc07088a40574c05724d83cddc8fafc7.zip cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.gz cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.bz2 | |
#11515: Merge with 3.1.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/bytearrayobject.c | 2 | ||||
| -rw-r--r-- | Objects/bytesobject.c | 2 | ||||
| -rw-r--r-- | Objects/longobject.c | 2 | ||||
| -rw-r--r-- | Objects/stringlib/string_format.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index aefec94..0fb7658 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2221,7 +2221,7 @@ bytearray_extend(PyByteArrayObject *self, PyObject *arg) if (it == NULL) return NULL; - /* Try to determine the length of the argument. 32 is abitrary. */ + /* Try to determine the length of the argument. 32 is arbitrary. */ buf_size = _PyObject_LengthHint(arg, 32); if (buf_size == -1) { Py_DECREF(it); diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index ba33608..fcc499e 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -487,7 +487,7 @@ PyObject *PyBytes_DecodeEscape(const char *s, default: *p++ = '\\'; s--; - goto non_esc; /* an arbitry number of unescaped + goto non_esc; /* an arbitrary number of unescaped UTF-8 bytes may follow. */ } } diff --git a/Objects/longobject.c b/Objects/longobject.c index 4737787..7c9506a 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -3120,7 +3120,7 @@ ah*bh and al*bl too. * of slices, each with a->ob_size digits, and multiply the slices by a, * one at a time. This gives k_mul balanced inputs to work with, and is * also cache-friendly (we compute one double-width slice of the result - * at a time, then move on, never bactracking except for the helpful + * at a time, then move on, never backtracking except for the helpful * single-width slice overlap between successive partial sums). */ static PyLongObject * diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h index c1a6d1d..6f10727 100644 --- a/Objects/stringlib/string_format.h +++ b/Objects/stringlib/string_format.h @@ -6,7 +6,7 @@ */ -/* Defines for Python 2.6 compatability */ +/* Defines for Python 2.6 compatibility */ #if PY_VERSION_HEX < 0x03000000 #define PyLong_FromSsize_t _PyLong_FromSsize_t #endif |