Daniel Holth's PyBool mods (dholth-at-fastmail.fm)

dabrahams · dabrahams · commit 7171a34364e5 · 2004-09-08T19:18:57.000Z
[SVN r24980]
diff --git a/doc/news.html b/doc/news.html
@@ -29,6 +29,15 @@ <h2 align="center">News/Change Log</h2>
     <hr>
 
     <dl class="page-index">
+      <dt>8 Sept 2004</dt>
+
+      <dd>
+        <ul>
+        Support for Python's Bool type, thanks to <a
+        mailto="dholth-at-fastmail.fm">Daniel Holth</a>.
+        </ul>
+      </dd>
+
       <dt>11 Sept 2003</dt>
 
       <dd>
diff --git a/include/boost/python/converter/builtin_converters.hpp b/include/boost/python/converter/builtin_converters.hpp
@@ -91,8 +91,12 @@ namespace detail
         : ::PyInt_FromLong(x))
 
 // Bool is not signed.
+#if PY_VERSION_HEX >= 0x02030000
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(bool, ::PyBool_FromLong(x))
+#else
 BOOST_PYTHON_TO_PYTHON_BY_VALUE(bool, ::PyInt_FromLong(x))
-
+#endif
+  
 // note: handles signed char and unsigned char, but not char (see below)
 BOOST_PYTHON_TO_INT(char)
 
diff --git a/test/defaults.cpp b/test/defaults.cpp
@@ -91,7 +91,7 @@ struct X {
     {}
 
     X(std::string s, bool b)
-    : state("Got exactly two arguments from constructor: string(%s); bool(%s); " % make_tuple(s, b))
+    : state("Got exactly two arguments from constructor: string(%s); bool(%s); " % make_tuple(s, b*1))
     {}
 
     object
@@ -114,19 +114,19 @@ struct X {
     object
     foo(int a, bool b=false) const
     {
-        return "int(%s); bool(%s); " % make_tuple(a, b);
+        return "int(%s); bool(%s); " % make_tuple(a, b*1);
     }
 
     object
     foo(std::string a, bool b=false) const
     {
-        return "string(%s); bool(%s); " % make_tuple(a, b);
+        return "string(%s); bool(%s); " % make_tuple(a, b*1);
     }
 
     object
     foo(list a, list b, bool c=false) const
     {
-        return "list(%s); list(%s); bool(%s); " % make_tuple(a, b, c);
+        return "list(%s); list(%s); bool(%s); " % make_tuple(a, b, c*1);
     }
 
     object
diff --git a/test/defaults.py b/test/defaults.py
@@ -2,8 +2,12 @@
 # Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 """
->>> False = 0 # Python 2.2 needs these
->>> True = 1
+# Use builtin True/False when available:
+>>> try:
+...     assert(True == 1)
+... except:
+...     True = 1
+...     False = 0
 
 >>> from defaults_ext import *
 >>> bar(1)
diff --git a/test/dict.cpp b/test/dict.cpp
@@ -67,8 +67,9 @@ void test_templates(object print)
     print(tmp.get(44));
     print(tmp);
     print(tmp.get(2,"default"));
-    print(tmp.has_key(key));
     print(tmp.setdefault(3,"default"));
+
+    assert(!tmp.has_key(key));
     //print(tmp[3]);
 }
     
diff --git a/test/dict.py b/test/dict.py
@@ -26,7 +26,6 @@
 None
 {1.5: 13, 1: 'a test string'}
 default
-0
 default
 """
 
diff --git a/test/str.cpp b/test/str.cpp
@@ -24,8 +24,10 @@ void work_with_string(object print)
     print(data.count("t"));
     print(data.encode("utf-8"));
     print(data.decode("utf-8"));
-    print(data.endswith("xx"));
-    print(data.startswith("test"));
+    
+    assert(!data.endswith("xx"));
+    assert(!data.startswith("test"));
+    
     print(data.splitlines());
     print(data.strip());
     print(data.swapcase());
@@ -51,8 +53,10 @@ void work_with_string(object print)
     print(data.replace("demo",std::string("blabla")));
     print(data.rfind("i",5));
     print(data.rindex("i",5));
-    print(data.startswith("asdf"));
-    print(data.endswith("asdf"));
+
+    assert(!data.startswith("asdf"));
+    assert(!data.endswith("asdf"));
+    
     print(data.translate(str('a')*256));
 
 
diff --git a/test/str.py b/test/str.py
@@ -16,8 +16,6 @@
 2
 this is a demo string
 this is a demo string
-0
-0
 ['this is a demo string']
 this is a demo string
 THIS IS A DEMO STRING
@@ -36,8 +34,6 @@
 this is a blabla string
 18
 18
-0
-0
 aaaaaaaaaaaaaaaaaaaaa
 """
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ struct X {`
`91`	`91`	`{}`
`92`	`92`
`93`	`93`	`X(std::string s, bool b)`
`94`		`- : state("Got exactly two arguments from constructor: string(%s); bool(%s); " % make_tuple(s, b))`
	`94`	`+ : state("Got exactly two arguments from constructor: string(%s); bool(%s); " % make_tuple(s, b*1))`
`95`	`95`	`{}`
`96`	`96`
`97`	`97`	`object`
`@@ -114,19 +114,19 @@ struct X {`
`114`	`114`	`object`
`115`	`115`	`foo(int a, bool b=false) const`
`116`	`116`	`{`
`117`		`- return "int(%s); bool(%s); " % make_tuple(a, b);`
	`117`	`+ return "int(%s); bool(%s); " % make_tuple(a, b*1);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`object`
`121`	`121`	`foo(std::string a, bool b=false) const`
`122`	`122`	`{`
`123`		`- return "string(%s); bool(%s); " % make_tuple(a, b);`
	`123`	`+ return "string(%s); bool(%s); " % make_tuple(a, b*1);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`object`
`127`	`127`	`foo(list a, list b, bool c=false) const`
`128`	`128`	`{`
`129`		`- return "list(%s); list(%s); bool(%s); " % make_tuple(a, b, c);`
	`129`	`+ return "list(%s); list(%s); bool(%s); " % make_tuple(a, b, c*1);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`object`
-Original file line number
+Diff line change
 None
 {1.5: 13, 1: 'a test string'}
 default
 -0
 default
 """
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`	`2`
`17`	`17`	`this is a demo string`
`18`	`18`	`this is a demo string`
`19`		`-0`
`20`		`-0`
`21`	`19`	`['this is a demo string']`
`22`	`20`	`this is a demo string`
`23`	`21`	`THIS IS A DEMO STRING`
`@@ -36,8 +34,6 @@`
`36`	`34`	`this is a blabla string`
`37`	`35`	`18`
`38`	`36`	`18`
`39`		`-0`
`40`		`-0`
`41`	`37`	`aaaaaaaaaaaaaaaaaaaaa`
`42`	`38`	`"""`
`43`	`39`