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

[ezio.melotti]

http://hg.python.org/cpython/rev/2d1d9759d3a4
changeset:   69246:2d1d9759d3a4
parent:      69242:3644a1e3a289
parent:      69245:6b4467e71872
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Apr 11 03:51:14 2011 +0300
summary:
  Merge with 3.2.

files:
  Modules/pyexpat.c |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -847,7 +847,6 @@
 
     readmethod = PyObject_GetAttrString(f, "read");
     if (readmethod == NULL) {
-        PyErr_Clear();
         PyErr_SetString(PyExc_TypeError,
                         "argument must have 'read' attribute");
         return NULL;

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