Commit 25bf8639 authored by Patrick Strawderman's avatar Patrick Strawderman

Raise an error when an invalid argument is passed to persistent.simple_new.

parent 6f077e60
...@@ -1235,6 +1235,12 @@ Per_setstate(cPersistentObject *self) ...@@ -1235,6 +1235,12 @@ Per_setstate(cPersistentObject *self)
static PyObject * static PyObject *
simple_new(PyObject *self, PyObject *type_object) simple_new(PyObject *self, PyObject *type_object)
{ {
if (!PyType_Check(type_object))
{
PyErr_SetString(PyExc_TypeError,
"simple_new argument must be a type object.");
return NULL;
}
return PyType_GenericNew((PyTypeObject *)type_object, NULL, NULL); return PyType_GenericNew((PyTypeObject *)type_object, NULL, NULL);
} }
......
...@@ -462,7 +462,7 @@ that might be tedious. ...@@ -462,7 +462,7 @@ that might be tedious.
Interfaces Interfaces
---------- ----------
Some versions of Zope and ZODB have the `zope.interfaces` package available. Some versions of Zope and ZODB have the `zope.interface` package available.
If it is available, then persistent will be associated with several If it is available, then persistent will be associated with several
interfaces. It's hard to write a doctest test that runs the tests only if interfaces. It's hard to write a doctest test that runs the tests only if
`zope.interface` is available, so this test looks a little unusual. One `zope.interface` is available, so this test looks a little unusual. One
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
############################################################################## ##############################################################################
import unittest import unittest
from zope.testing import doctest from zope.testing import doctest
from persistent import Persistent from persistent import Persistent, simple_new
class P(Persistent): class P(Persistent):
def __init__(self): def __init__(self):
...@@ -35,6 +35,13 @@ def cpersistent_setstate_pointer_sanity(): ...@@ -35,6 +35,13 @@ def cpersistent_setstate_pointer_sanity():
TypeError: this object has no instance dictionary TypeError: this object has no instance dictionary
""" """
def cpersistent_simple_new_invalid_argument():
"""
>>> simple_new('')
Traceback (most recent call last):
...
TypeError: simple_new argument must be a type object.
"""
def test_suite(): def test_suite():
return unittest.TestSuite(( return unittest.TestSuite((
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment