[Python-checkins] python/dist/src/Objects unicodeobject.c, 2.214, 2.215 stringobject.c, 2.220, 2.221

[lemburg at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32170/Objects

Modified Files:
	unicodeobject.c stringobject.c 
Log Message:
.encode()/.decode() patch part 2.



Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.214
retrieving revision 2.215
diff -C2 -d -r2.214 -r2.215
*** unicodeobject.c	8 Jul 2004 17:57:32 -0000	2.214
--- unicodeobject.c	8 Jul 2004 19:13:54 -0000	2.215
***************
*** 4936,4939 ****
--- 4936,4941 ----
          return NULL;
      v = PyUnicode_AsEncodedObject((PyObject *)self, encoding, errors);
+     if (v == NULL)
+         goto onError;
      if (!PyString_Check(v) && !PyUnicode_Check(v)) {
          PyErr_Format(PyExc_TypeError,
***************
*** 4945,4948 ****
--- 4947,4953 ----
      }
      return v;
+ 
+  onError:
+     return NULL;
  }
  
***************
*** 4967,4970 ****
--- 4972,4977 ----
          return NULL;
      v = PyUnicode_AsDecodedObject((PyObject *)self, encoding, errors);
+     if (v == NULL)
+         goto onError;
      if (!PyString_Check(v) && !PyUnicode_Check(v)) {
          PyErr_Format(PyExc_TypeError,
***************
*** 4976,4979 ****
--- 4983,4989 ----
      }
      return v;
+ 
+  onError:
+     return NULL;
  }
  

Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.220
retrieving revision 2.221
diff -C2 -d -r2.220 -r2.221
*** stringobject.c	8 Jul 2004 17:57:31 -0000	2.220
--- stringobject.c	8 Jul 2004 19:13:55 -0000	2.221
***************
*** 2679,2682 ****
--- 2679,2684 ----
          return NULL;
      v = PyString_AsEncodedObject((PyObject *)self, encoding, errors);
+     if (v == NULL)
+         goto onError;
      if (!PyString_Check(v) && !PyUnicode_Check(v)) {
          PyErr_Format(PyExc_TypeError,
***************
*** 2688,2691 ****
--- 2690,2696 ----
      }
      return v;
+ 
+  onError:
+     return NULL;
  }
  
***************
*** 2711,2714 ****
--- 2716,2721 ----
          return NULL;
      v = PyString_AsDecodedObject((PyObject *)self, encoding, errors);
+     if (v == NULL)
+         goto onError;
      if (!PyString_Check(v) && !PyUnicode_Check(v)) {
          PyErr_Format(PyExc_TypeError,
***************
*** 2720,2723 ****
--- 2727,2733 ----
      }
      return v;
+ 
+  onError:
+     return NULL;
  }