Fix dict bug

dabrahams · dabrahams · commit e13a11eb7ff9 · 2003-01-11T00:18:59.000Z
[SVN r16866]
diff --git a/src/dict.cpp b/src/dict.cpp
@@ -65,8 +65,8 @@ object dict_base::get(object_cref k) const
 {
     if (check_exact(this))
     {
-        return object(detail::borrowed_reference(
-                          PyDict_GetItem(this->ptr(),k.ptr())));
+        PyObject* result = PyDict_GetItem(this->ptr(),k.ptr());
+        return object(detail::borrowed_reference(result ? result : Py_None));
     }
     else
     {
diff --git a/test/dict.cpp b/test/dict.cpp
@@ -61,6 +61,7 @@ void test_templates(object print)
     //print(tmp[1]);
     tmp[1.5] = 13;
     print(tmp.get(1.5));
+    print(tmp.get(44));
     print(tmp);
     print(tmp.get(2,"default"));
     print(tmp.has_key(key));
diff --git a/test/dict.py b/test/dict.py
@@ -20,6 +20,7 @@
 >>> test_templates(printer)
 a test string
 13
+None
 {1.5: 13, 1: 'a test string'}
 default
 0

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ object dict_base::get(object_cref k) const`
`65`	`65`	`{`
`66`	`66`	`if (check_exact(this))`
`67`	`67`	`{`
`68`		`- return object(detail::borrowed_reference(`
`69`		`- PyDict_GetItem(this->ptr(),k.ptr())));`
	`68`	`+ PyObject* result = PyDict_GetItem(this->ptr(),k.ptr());`
	`69`	`+ return object(detail::borrowed_reference(result ? result : Py_None));`
`70`	`70`	`}`
`71`	`71`	`else`
`72`	`72`	`{`