[pypy-commit] pypy default: merge heads

[gutworth]

Author: Benjamin Peterson <benjamin at python.org>
Branch: 
Changeset: r53452:655d30ef8d7c
Date: 2012-03-13 12:38 -0500
http://bitbucket.org/pypy/pypy/changeset/655d30ef8d7c/

Log:	merge heads

diff --git a/pypy/module/cpyext/test/test_stringobject.py b/pypy/module/cpyext/test/test_stringobject.py
--- a/pypy/module/cpyext/test/test_stringobject.py
+++ b/pypy/module/cpyext/test/test_stringobject.py
@@ -105,6 +105,15 @@
             )])
         assert module.string_as_string("huheduwe") == "huhe"
 
+    def test_py_string_as_string_None(self):
+        module = self.import_extension('foo', [
+            ("string_None", "METH_VARARGS",
+             '''
+             return PyString_AsString(Py_None);
+             '''
+            )])
+        raises(TypeError, module.string_None)
+
     def test_AsStringAndSize(self):
         module = self.import_extension('foo', [
             ("getstring", "METH_NOARGS",