boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-22 05:22:45 +00:00
Code Issues Projects Releases Wiki Activity

Objects now throw an exception after asserting if initialized with the wrong Python type.

Browse Source 
[SVN r8147]
This commit is contained in:
Dave Abrahams
2000-11-06 05:15:26 +00:00
parent 6236939512
commit 67fbdc9da3
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
objects.cpp
View File

@@ -104,6 +104,11 @@ Tuple::Tuple(Ptr p)
: Object(p)
{
assert(accepts(p));
if (!accepts(p))
{
PyErr_SetString(PyExc_TypeError, p->ob_type->tp_name);
throw ErrorAlreadySet();
}
}
PyTypeObject* Tuple::type_object()
@@ -149,7 +154,15 @@ Tuple& Tuple::operator+=(const Tuple& rhs)
// Construct from an owned PyObject*.
// Precondition: p must point to a python string.
String::String(Ptr p)
: Object(p) { assert(accepts(p)); }
: Object(p)
{
assert(accepts(p));
if (!accepts(p))
{
PyErr_SetString(PyExc_TypeError, p->ob_type->tp_name);
throw ErrorAlreadySet();
}
}
String::String(const char* s)
: Object(Ptr(PyString_FromString(s))) {}
@@ -196,7 +209,15 @@ void String::intern()
}
Dict::Dict(Ptr p)
: Object(p) { assert(accepts(p)); }
: Object(p)
{
assert(accepts(p));
if (!accepts(p))
{
PyErr_SetString(PyExc_TypeError, p->ob_type->tp_name);
throw ErrorAlreadySet();
}
}
Dict::Dict()
: Object(Ptr(PyDict_New())) {}
@@ -336,6 +357,11 @@ List::List(Ptr p)
: Object(p)
{
assert(accepts(p));
if (!accepts(p))
{
PyErr_SetString(PyExc_TypeError, p->ob_type->tp_name);
throw ErrorAlreadySet();
}
}
List::List(std::size_t sz)