From faf3cd0b78c5f4cce924498c93d786028e253ba3 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Mon, 30 May 2011 05:51:49 +0000 Subject: [PATCH] merging current boost/python and libs/python from trunk into release branch [SVN r72277] --- doc/tutorial/doc/html/index.html | 2 +- doc/tutorial/doc/tutorial.qbk | 2 +- test/Jamfile.v2 | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/tutorial/doc/html/index.html b/doc/tutorial/doc/html/index.html index d63480c1..6e43c390 100644 --- a/doc/tutorial/doc/html/index.html +++ b/doc/tutorial/doc/html/index.html @@ -124,7 +124,7 @@ 

>>> import hello_ext
->>> print hello.greet()
+>>> print hello_ext.greet()
 hello, world

diff --git a/doc/tutorial/doc/tutorial.qbk b/doc/tutorial/doc/tutorial.qbk index f1697fae..94ecc55b 100644 --- a/doc/tutorial/doc/tutorial.qbk +++ b/doc/tutorial/doc/tutorial.qbk @@ -62,7 +62,7 @@ resulting DLL is now visible to Python. Here's a sample Python session: [python] >>> import hello_ext - >>> print hello.greet() + >>> print hello_ext.greet() hello, world [c++] diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 876fde12..55241880 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -3,11 +3,15 @@ # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) import python ; +import os ; + +lib socket ; use-project /boost/python : ../build ; project /boost/python/test : requirements gcc:-Wextra + qnxnto:socket ; local PY = ;