# HG changeset patch
# Parent c821e3a54930c949b8612a3d6bad15059e4a7e43

diff -r c821e3a54930 Misc/ACKS
--- a/Misc/ACKS	Mon Aug 15 14:28:46 2011 +0300
+++ b/Misc/ACKS	Mon Aug 22 11:48:24 2011 +1000
@@ -749,6 +749,7 @@
 Jean-François Piéronne
 Guilherme Polo
 Michael Pomraning
+Martin Pool
 Iustin Pop
 John Popplewell
 Amrit Prem
diff -r c821e3a54930 Misc/NEWS
--- a/Misc/NEWS	Mon Aug 15 14:28:46 2011 +0300
+++ b/Misc/NEWS	Mon Aug 22 11:48:24 2011 +1000
@@ -1131,6 +1131,8 @@
 - Do not accidentally include the directory containing sqlite.h twice when
   building sqlite3.
 
+- Issue #10951: Fix some gcc 4.6 warnings.
+
 - Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds,
   ensure "make install" creates symlinks in --prefix bin for the "-32"
   files in the framework bin directory like the installer does.
diff -r c821e3a54930 Modules/_pickle.c
--- a/Modules/_pickle.c	Mon Aug 15 14:28:46 2011 +0300
+++ b/Modules/_pickle.c	Mon Aug 22 11:48:24 2011 +1000
@@ -5200,7 +5200,6 @@
 static PyObject *
 load(UnpicklerObject *self)
 {
-    PyObject *err;
     PyObject *value = NULL;
     char *s;
 
@@ -5217,7 +5216,7 @@
 
     while (1) {
         if (_Unpickler_Read(self, &s, 1) < 0)
-            break;
+            return NULL;
 
         switch ((enum opcode)s[0]) {
         OP(NONE, load_none)
@@ -5278,10 +5277,6 @@
         case STOP:
             break;
 
-        case '\0':
-            PyErr_SetNone(PyExc_EOFError);
-            return NULL;
-
         default:
             PyErr_Format(UnpicklingError,
                          "invalid load key, '%c'.", s[0]);
@@ -5294,13 +5289,8 @@
     if (_Unpickler_SkipConsumed(self) < 0)
         return NULL;
 
-    /* XXX: It is not clear what this is actually for. */
-    if ((err = PyErr_Occurred())) {
-        if (err == PyExc_EOFError) {
-            PyErr_SetNone(PyExc_EOFError);
-        }
-        return NULL;
-    }
+    if (PyErr_Occurred())
+	return NULL;
 
     PDATA_POP(self->stack, value);
     return value;