From: Georg Brandl <georg@python.org>
Date: Wed, 16 Jul 2008 23:17:46 +0000 (+0000)
Subject: Backport part of r65043.
X-Git-Tag: v2.6b2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3238a3e3297fd691cde3b73bbe066f60f56c018f;p=thirdparty%2FPython%2Fcpython.git

Backport part of r65043.
---

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 31b58048711c..e31b7d5fdf3d 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -55,10 +55,9 @@ _getbytevalue(PyObject* arg, int *value)
         face_value = PyLong_AsLong(index);
         Py_DECREF(index);
     }
-    if (face_value == -1 && PyErr_Occurred())
-        return 0;
 
     if (face_value < 0 || face_value >= 256) {
+        /* this includes the OverflowError in case the long is too large */
         PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)");
         return 0;
     }