[Boost-commit] svn:boost r72277 - in branches/release: boost/python libs/python libs/python/doc/tutorial/doc libs/python/doc/tutorial/doc/html libs/python/test

Subject: [Boost-commit] svn:boost r72277 - in branches/release: boost/python libs/python libs/python/doc/tutorial/doc libs/python/doc/tutorial/doc/html libs/python/test
From: rwgk_at_[hidden]
Date: 2011-05-30 01:51:51

Author: rwgk
Date: 2011-05-30 01:51:49 EDT (Mon, 30 May 2011)
New Revision: 72277
URL: http://svn.boost.org/trac/boost/changeset/72277

Log:
merging current boost/python and libs/python from trunk into release branch
Properties modified: 
   branches/release/boost/python/   (props changed)
   branches/release/libs/python/   (props changed)
Text files modified: 
   branches/release/libs/python/doc/tutorial/doc/html/index.html |     2 +-                                      
   branches/release/libs/python/doc/tutorial/doc/tutorial.qbk    |     2 +-                                      
   branches/release/libs/python/test/Jamfile.v2                  |     4 ++++                                    
   3 files changed, 6 insertions(+), 2 deletions(-)

Modified: branches/release/libs/python/doc/tutorial/doc/html/index.html
==============================================================================
--- branches/release/libs/python/doc/tutorial/doc/html/index.html	(original)
+++ branches/release/libs/python/doc/tutorial/doc/html/index.html	2011-05-30 01:51:49 EDT (Mon, 30 May 2011)
@@ -124,7 +124,7 @@
 <p>
     </p>
 <pre class="programlisting"><span class="special">&gt;&gt;&gt;</span> <span class="keyword">import</span> <span class="identifier">hello_ext</span>
-<span class="special">&gt;&gt;&gt;</span> <span class="keyword">print</span> <span class="identifier">hello</span><span class="special">.</span><span class="identifier">greet</span><span class="special">()</span>
+<span class="special">&gt;&gt;&gt;</span> <span class="keyword">print</span> <span class="identifier">hello_ext</span><span class="special">.</span><span class="identifier">greet</span><span class="special">()</span>
 <span class="identifier">hello</span><span class="special">,</span> <span class="identifier">world</span>
 </pre>
 <p>

Modified: branches/release/libs/python/doc/tutorial/doc/tutorial.qbk
==============================================================================
--- branches/release/libs/python/doc/tutorial/doc/tutorial.qbk	(original)
+++ branches/release/libs/python/doc/tutorial/doc/tutorial.qbk	2011-05-30 01:51:49 EDT (Mon, 30 May 2011)
@@ -62,7 +62,7 @@
 [python]
 
     >>> import hello_ext
-    >>> print hello.greet()
+    >>> print hello_ext.greet()
     hello, world
 
 [c++]

Modified: branches/release/libs/python/test/Jamfile.v2
==============================================================================
--- branches/release/libs/python/test/Jamfile.v2	(original)
+++ branches/release/libs/python/test/Jamfile.v2	2011-05-30 01:51:49 EDT (Mon, 30 May 2011)
@@ -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
     <toolset>gcc:<cxxflags>-Wextra
+    <target-os>qnxnto:<library>socket
   ;
 
 local PY = ;