commit 787269797e92e44d3edeab5d8dd0436170748e7e
author Benjamin Peterson <benjamin@python.org> Tue Sep 11 12:05:18 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Tue Sep 11 12:05:18 2012 -0400
tree eacf0f5457e1098d4327db7b205209fd7bb4a7ce
parent 6f3e5e48d37388f820642f3f71dcc8da4c79ad19
parent e9a6d62d9fb6f0e88318a4279b54288b5ab08ee3

merge heads

Python/structmember.c

diff --git a/Python/structmember.c b/Python/structmember.c
index ddedea5..af0296d 100644
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -254,12 +254,8 @@
         char *string;
         Py_ssize_t len;
 
-        if (!PyUnicode_Check(v)) {
-            PyErr_BadArgument();
-            return -1;
-        }
         string = _PyUnicode_AsStringAndSize(v, &len);
-        if (len != 1) {
+        if (string == NULL || len != 1) {
             PyErr_BadArgument();
             return -1;
         }