rpms/python/devel python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch, 1.1, 1.2

[dmalcolm]

Author: dmalcolm

Update of /cvs/pkgs/rpms/python/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22121

Modified Files:
	python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch 
Log Message:
updated version of patch


python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch:
 exceptions.c |    3 ---
 1 file changed, 3 deletions(-)

Index: python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch	22 Jun 2010 18:40:57 -0000	1.1
+++ python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch	22 Jun 2010 19:07:26 -0000	1.2
@@ -2,24 +2,13 @@ Index: Objects/exceptions.c
 ===================================================================
 --- Objects/exceptions.c	(revision 82153)
 +++ Objects/exceptions.c	(working copy)
-@@ -1784,11 +1784,15 @@
+@@ -1784,9 +1784,6 @@
      const char *encoding, const char *object, Py_ssize_t length,
      Py_ssize_t start, Py_ssize_t end, const char *reason)
  {
 -    assert(length < INT_MAX);
 -    assert(start < INT_MAX);
 -    assert(end < INT_MAX);
--    return PyObject_CallFunction(PyExc_UnicodeDecodeError, "ss#nns",
--                                 encoding, object, length, start, end, reason);
-+    PyObject *str;
-+
-+    str = PyString_FromStringAndSize(object, length);
-+
-+    if (!str)
-+        return NULL;
-+
-+    return PyObject_CallFunction(PyExc_UnicodeDecodeError, "sNnns",
-+				 encoding, str, start, end, reason);
+     return PyObject_CallFunction(PyExc_UnicodeDecodeError, "ss#nns",
+                                  encoding, object, length, start, end, reason);
  }
- 
-