--- a/Python/bltinmodule.c	Mon Aug 27 11:33:42 2007 +0000
+++ b/Python/bltinmodule.c	Mon Aug 27 15:02:28 2007 +0000
@@ -403,18 +403,16 @@
 	char *str;
 	Py_ssize_t size;
 
-	if (!PyObject_CheckReadBuffer(cmd) &&
-	    !PyUnicode_Check(cmd)) {
-		PyErr_SetString(PyExc_TypeError,
-			   "eval()/exec() arg 1 must be a string, bytes or code object");
-		return NULL;
-	}
-
 	if (PyUnicode_Check(cmd)) {
 		cmd = _PyUnicode_AsDefaultEncodedString(cmd, NULL);
 		if (cmd == NULL)
 			return NULL;
 	}
+	else if (!PyObject_CheckReadBuffer(cmd)) {
+		PyErr_SetString(PyExc_TypeError,
+		  "eval()/exec() arg 1 must be a string, bytes or code object");
+		return NULL;
+	}
 	if (PyObject_AsReadBuffer(cmd, (const void **)&str, &size) < 0) {
 		return NULL;
 	}