From 23924c58707ee2a2aef039163edbbcc5d0746508 Mon Sep 17 00:00:00 2001 From: Ciaran McCreesh Date: Sat, 16 Jul 2011 23:51:39 +0100 Subject: Check for null explicitly --- python/dep_spec_TEST.py | 2 ++ python/slot_requirement.cc | 3 +++ 2 files changed, 5 insertions(+) diff --git a/python/dep_spec_TEST.py b/python/dep_spec_TEST.py index fb05ba232..9b28d2828 100755 --- a/python/dep_spec_TEST.py +++ b/python/dep_spec_TEST.py @@ -63,6 +63,8 @@ class TestCase_1_DepSpecs(unittest.TestCase): self.assert_(isinstance(self.pds.slot_requirement, SlotExactRequirement)) self.assertEqual(str(self.pds.slot_requirement.slot), "100") + self.assertEqual(self.pds2.slot_requirement, None) + def test_05_package(self): self.get_depspecs() self.assertEqual(str(self.pds.package), "foo/bar") diff --git a/python/slot_requirement.cc b/python/slot_requirement.cc index 09453d968..6cde77286 100644 --- a/python/slot_requirement.cc +++ b/python/slot_requirement.cc @@ -72,6 +72,9 @@ namespace static PyObject * convert(const std::shared_ptr & m) { + if (! m) + return Py_None; + SlotRequirementSptrToPythonVisitor v(m); m->accept(v); return bp::incref(v.obj.ptr()); -- cgit v1.2.3