diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-27 18:55:54 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-27 18:55:54 (GMT) |
| commit | 412dc9c88f040abf4b23017c5e5e4d8b880d247d (patch) | |
| tree | e10dee1ac8404c0d3362c48a4350d8e8389b7789 /Objects | |
| parent | 661b0a15d78b8e86ea4b458550b1cb04f0988424 (diff) | |
| download | cpython-412dc9c88f040abf4b23017c5e5e4d8b880d247d.zip cpython-412dc9c88f040abf4b23017c5e5e4d8b880d247d.tar.gz cpython-412dc9c88f040abf4b23017c5e5e4d8b880d247d.tar.bz2 | |
Merged revisions 60350-60363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60355 | neal.norwitz | 2008-01-27 18:10:14 +0100 (Sun, 27 Jan 2008) | 1 line
Whitespace cleanup
........
r60356 | neal.norwitz | 2008-01-27 18:10:29 +0100 (Sun, 27 Jan 2008) | 1 line
Add assertion that we do not blow out newl
........
r60357 | neal.norwitz | 2008-01-27 18:10:35 +0100 (Sun, 27 Jan 2008) | 1 line
Initialize variable to prevent warning on some platform/config.
........
r60358 | neal.norwitz | 2008-01-27 18:10:43 +0100 (Sun, 27 Jan 2008) | 1 line
Update to newer version of ffi. Fixes crashes and test failures of longdouble
........
r60359 | neal.norwitz | 2008-01-27 18:10:50 +0100 (Sun, 27 Jan 2008) | 1 line
Add a tiny sleep and additional flush to force the file to really be synced.
........
r60360 | neal.norwitz | 2008-01-27 18:10:58 +0100 (Sun, 27 Jan 2008) | 1 line
Retry connection in case it fails to reduce flakiness
........
r60361 | neal.norwitz | 2008-01-27 18:11:11 +0100 (Sun, 27 Jan 2008) | 4 lines
Catch socket errors that are often the cause of transient failures.
Many of these exceptions are due to resource unavailable, so the
existing code should be able to handle many more spurious errors.
........
r60362 | neal.norwitz | 2008-01-27 18:12:15 +0100 (Sun, 27 Jan 2008) | 1 line
Reduce buffer size since we do not need 1k
........
r60363 | neal.norwitz | 2008-01-27 18:13:07 +0100 (Sun, 27 Jan 2008) | 1 line
Print periodic "still working" messages since this suite is slow.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 3342cb4..33b2023 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -59,7 +59,7 @@ type_modified(PyTypeObject *type) PyObject *raw, *ref; Py_ssize_t i, n; - if(!PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG)) + if (!PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG)) return; raw = type->tp_subclasses; @@ -95,7 +95,7 @@ type_mro_modified(PyTypeObject *type, PyObject *bases) { Py_ssize_t i, n; int clear = 0; - if(!PyType_HasFeature(type, Py_TPFLAGS_HAVE_VERSION_TAG)) + if (!PyType_HasFeature(type, Py_TPFLAGS_HAVE_VERSION_TAG)) return; n = PyTuple_GET_SIZE(bases); @@ -1342,8 +1342,8 @@ mro_implementation(PyTypeObject *type) PyObject *bases, *result; PyObject *to_merge, *bases_aslist; - if(type->tp_dict == NULL) { - if(PyType_Ready(type) < 0) + if (type->tp_dict == NULL) { + if (PyType_Ready(type) < 0) return NULL; } @@ -2204,7 +2204,7 @@ _PyType_Lookup(PyTypeObject *type, PyObject *name) unsigned int h; if (MCACHE_CACHEABLE_NAME(name) && - PyType_HasFeature(type,Py_TPFLAGS_VALID_VERSION_TAG)) { + PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG)) { /* fast path */ h = MCACHE_HASH_METHOD(type, name); if (method_cache[h].version == type->tp_version_tag && |