]> granicus.if.org Git - python/commitdiff
merge 3.4 (#27774)
authorBenjamin Peterson <benjamin@python.org>
Tue, 16 Aug 2016 05:05:06 +0000 (22:05 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 16 Aug 2016 05:05:06 +0000 (22:05 -0700)
1  2 
Misc/NEWS
Modules/_sre.c

diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_sre.c
index 84c8769455832ad0d6f3db97bb0e4f16cf3008b5,8d111e382ab03a635d510c09966444a8ff971b37..09b58352de4f82d9027c7673dbd4d31f73b0251f
@@@ -2195,11 -2136,9 +2195,9 @@@ _sre_SRE_Match_groupdict_impl(MatchObje
          key = PyList_GET_ITEM(keys, index);
          if (!key)
              goto failed;
 -        value = match_getslice(self, key, def);
 +        value = match_getslice(self, key, default_value);
-         if (!value) {
-             Py_DECREF(key);
+         if (!value)
              goto failed;
-         }
          status = PyDict_SetItem(result, key, value);
          Py_DECREF(value);
          if (status < 0)