Bug fix -- we weren't handling NULL keywords dictionaries in raw_function

dabrahams · dabrahams · commit a3cdacd08803 · 2003-07-30T11:34:50.000Z
[SVN r19359]
diff --git a/include/boost/python/raw_function.hpp b/include/boost/python/raw_function.hpp
@@ -29,7 +29,10 @@ namespace detail
       {
           return incref(
               object(
-                  f(tuple(borrowed_reference(args)), dict(borrowed_reference(keywords)))
+                  f(
+                      tuple(borrowed_reference(args))
+                    , keywords ? dict(borrowed_reference(keywords)) : dict()
+                  )
               ).ptr()
           );
       }
diff --git a/test/args.cpp b/test/args.cpp
@@ -90,3 +90,5 @@ BOOST_PYTHON_MODULE(args_ext)
 
     def("inner", &X::inner, "docstring", args("self", "n"), return_internal_reference<>());
 }
+
+#include "module_tail.cpp"
diff --git a/test/args.py b/test/args.py
@@ -4,6 +4,14 @@
 >>> raw(3, 4, foo = 'bar', baz = 42)
 ((3, 4), {'foo': 'bar', 'baz': 42})
 
+   Prove that we can handle empty keywords and non-keywords
+   
+>>> raw(3, 4)
+((3, 4), {})
+
+>>> raw(foo = 'bar')
+((), {'foo': 'bar'})
+
 >>> f(x= 1, y = 3, z = 'hello')
 (1, 3.0, 'hello')
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,10 @@ namespace detail`
`29`	`29`	`{`
`30`	`30`	`return incref(`
`31`	`31`	`object(`
`32`		`- f(tuple(borrowed_reference(args)), dict(borrowed_reference(keywords)))`
	`32`	`+ f(`
	`33`	`+ tuple(borrowed_reference(args))`
	`34`	`+ , keywords ? dict(borrowed_reference(keywords)) : dict()`
	`35`	`+ )`
`33`	`36`	`).ptr()`
`34`	`37`	`);`
`35`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,3 +90,5 @@ BOOST_PYTHON_MODULE(args_ext)`
`90`	`90`
`91`	`91`	`def("inner", &X::inner, "docstring", args("self", "n"), return_internal_reference<>());`
`92`	`92`	`}`
	`93`	`+`
	`94`	`+#include "module_tail.cpp"`