diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 21:03:01 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 21:03:01 (GMT) |
| commit | 1fa11af7aa52e481caafe8cb56e68a1adbd3ced2 (patch) | |
| tree | 8e57019e0b9d5f9d12c42758511f1196cac9e558 /Objects/unicodeobject.c | |
| parent | 745e86b3f81463ab1a18e63374f27a522a0a784f (diff) | |
| download | cpython-1fa11af7aa52e481caafe8cb56e68a1adbd3ced2.zip cpython-1fa11af7aa52e481caafe8cb56e68a1adbd3ced2.tar.gz cpython-1fa11af7aa52e481caafe8cb56e68a1adbd3ced2.tar.bz2 | |
Merged revisions 83226-83227,83229-83232 via svnmerge from
svn+ssh://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.
........
r83231 | georg.brandl | 2010-07-29 16:46:07 +0200 (Do, 29 Jul 2010) | 1 line
#9397: remove mention of dbm.bsd which does not exist anymore.
........
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 199f34a..028b42d 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -294,8 +294,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; @@ -414,8 +413,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; |