[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/d4860087f664
changeset:   73209:d4860087f664
parent:      73206:728595c16acd
parent:      73207:cdd9a97f3d28
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Oct 30 14:24:59 2011 -0400
summary:
  merge 3.2

files:
  Objects/setobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/setobject.c b/Objects/setobject.c
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -1906,7 +1906,7 @@
 static PyObject *
 set_discard(PySetObject *so, PyObject *key)
 {
-    PyObject *tmpkey, *result;
+    PyObject *tmpkey;
     int rv;
 
     rv = set_discard_key(so, key);

-- 
Repository URL: http://hg.python.org/cpython