diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 21:06:46 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 21:06:46 (GMT) |
| commit | d070cc5350178e0ddbd429763b5754c7718a2f70 (patch) | |
| tree | 3ec6e413065e8f0c9d29074576cc02aa1e72852e /Objects/unicodeobject.c | |
| parent | f0881ab1fe819dfb833daf7eafc6d488f3d4706a (diff) | |
| download | cpython-d070cc5350178e0ddbd429763b5754c7718a2f70.zip cpython-d070cc5350178e0ddbd429763b5754c7718a2f70.tar.gz cpython-d070cc5350178e0ddbd429763b5754c7718a2f70.tar.bz2 | |
Merged revisions 83226-83227,83229-83230,83232 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83226 | georg.brandl | 2010-07-29 16:17:12 +0200 (Do, 29 Jul 2010) | 1 line
#1090076: explain the behavior of *vars* in get() better.
........
r83227 | georg.brandl | 2010-07-29 16:23:06 +0200 (Do, 29 Jul 2010) | 1 line
Use Py_CLEAR().
........
r83229 | georg.brandl | 2010-07-29 16:32:22 +0200 (Do, 29 Jul 2010) | 1 line
#9407: document configparser.Error.
........
r83230 | georg.brandl | 2010-07-29 16:36:11 +0200 (Do, 29 Jul 2010) | 1 line
Use correct directive and name.
........
r83232 | georg.brandl | 2010-07-29 16:49:08 +0200 (Do, 29 Jul 2010) | 1 line
#9388: remove ERA_YEAR which is never defined in the source code.
........
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index f373eeb..07b4e19 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -285,8 +285,7 @@ int unicode_resize(register PyUnicodeObject *unicode, reset: /* Reset the object caches */ if (unicode->defenc) { - Py_DECREF(unicode->defenc); - unicode->defenc = NULL; + Py_CLEAR(unicode->defenc); } unicode->hash = -1; @@ -384,8 +383,7 @@ void unicode_dealloc(register PyUnicodeObject *unicode) unicode->length = 0; } if (unicode->defenc) { - Py_DECREF(unicode->defenc); - unicode->defenc = NULL; + Py_CLEAR(unicode->defenc); } /* Add to free list */ *(PyUnicodeObject **)unicode = free_list; |