Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r76196 - in trunk/libs/python/doc/tutorial/doc/html: . python
From: dnljms_at_[hidden]
Date: 2011-12-26 16:56:25

Author: danieljames
Date: 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
New Revision: 76196
URL: http://svn.boost.org/trac/boost/changeset/76196

Log:
Rebuild python tutorial with recent versions of tools.

This will make further changes less noisy and also happens to fix the misparse
of `__main__`.

Text files modified:
   trunk/libs/python/doc/tutorial/doc/html/index.html | 24 ++++------
   trunk/libs/python/doc/tutorial/doc/html/python/embedding.html | 56 ++++++++++++-------------
   trunk/libs/python/doc/tutorial/doc/html/python/exception.html | 4
   trunk/libs/python/doc/tutorial/doc/html/python/exposing.html | 84 ++++++++++++++++-----------------------
   trunk/libs/python/doc/tutorial/doc/html/python/functions.html | 56 ++++++++++++--------------
   trunk/libs/python/doc/tutorial/doc/html/python/hello.html | 22 +++++-----
   trunk/libs/python/doc/tutorial/doc/html/python/iterators.html | 38 ++++++-----------
   trunk/libs/python/doc/tutorial/doc/html/python/object.html | 48 +++++++++-------------
   trunk/libs/python/doc/tutorial/doc/html/python/techniques.html | 50 +++++++++--------------
   9 files changed, 162 insertions(+), 220 deletions(-)

Modified: trunk/libs/python/doc/tutorial/doc/html/index.html
==============================================================================
--- trunk/libs/python/doc/tutorial/doc/html/index.html (original)
+++ trunk/libs/python/doc/tutorial/doc/html/index.html 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Chapter 1. python 2.0</title>
<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="Chapter 1. python 2.0">
<link rel="next" href="python/hello.html" title="Building Hello World">
</head>
@@ -31,7 +31,7 @@
<div>Copyright © 2002-2005 Joel
 de Guzman, David Abrahams</div>
<div><div class="legalnotice">
-<a name="id759709"></a>
+<a name="python.legal"></a>
 Distributed under the Boost Software License, Version 1.0. (See accompanying
 file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">
 http://www.boost.org/LICENSE_1_0.txt </a>)
@@ -42,8 +42,8 @@
Table of Contents
<dl>
<dt>QuickStart</dt>
-<dt> Building Hello World</dt>
-<dt> Exposing Classes</dt>
+<dt>Building Hello World</dt>
+<dt>Exposing Classes</dt>
<dd><dl>
<dt>Constructors</dt>
<dt>Class Data Members</dt>
@@ -60,7 +60,7 @@
<dt>Default Arguments</dt>
<dt>Auto-Overloading</dt>
</dl></dd>
-<dt> Object Interface</dt>
+<dt>Object Interface</dt>
<dd><dl>
<dt>Basic Interface</dt>
<dt>Derived Object types</dt>
@@ -70,8 +70,8 @@
<dt>Embedding</dt>
<dd><dl><dt>Using the interpreter</dt></dl></dd>
<dt>Iterators</dt>
-<dt> Exception Translation</dt>
-<dt> General Techniques</dt>
+<dt>Exception Translation</dt>
+<dt>General Techniques</dt>
<dd><dl>
<dt>Creating Packages</dt>
<dt>Extending Wrapped Objects in Python</dt>
@@ -93,8 +93,8 @@
 code takes on the look of a kind of declarative interface definition language
 (IDL).
 
-<a name="quickstart.hello_world"></a><h3>
-<a name="id759740"></a>
+<h3>
+<a name="quickstart.hello_world"></a>
 Hello World
 </h3>

@@ -121,14 +121,10 @@
 That's it. We're done. We can now build this as a shared library. The resulting
 DLL is now visible to Python. Here's a sample Python session:
 
-
- 
<pre class="programlisting">>>> import hello_ext
>>> print hello_ext.greet()
hello, world
</pre>
-
- 
<div class="blockquote"><blockquote class="blockquote">
 Next stop... Building your Hello World module
 from start to finish...
@@ -136,7 +132,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: July 01, 2010 at 21:56:58 GMT</td>
+<td align="left">Last revised: December 26, 2011 at 21:51:27 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

Modified: trunk/libs/python/doc/tutorial/doc/html/python/embedding.html
==============================================================================
--- trunk/libs/python/doc/tutorial/doc/html/python/embedding.html (original)
+++ trunk/libs/python/doc/tutorial/doc/html/python/embedding.html 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Embedding</title>
<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Chapter 1. python 2.0">
<link rel="up" href="../index.html" title="Chapter 1. python 2.0">
<link rel="prev" href="object.html" title="Object Interface">
@@ -39,8 +39,8 @@
 a lot easier and, in a future version, it may become unnecessary to touch the
 Python/C API at all. So stay tuned... <img src="../images/smiley.png" alt="smiley">
 
-<a name="embedding.building_embedded_programs"></a><h3>
-<a name="id773307"></a>
+<h3>
+<a name="embedding.building_embedded_programs"></a>
 Building embedded programs
 </h3>

@@ -81,8 +81,8 @@
 <library-path>$(PYTHON_LIB_PATH)
 <find-library>$(PYTHON_EMBEDDED_LIBRARY) ;
</pre>
-<a name="embedding.getting_started"></a><h3>
-<a name="id773391"></a>
+<h3>
+<a name="embedding.getting_started"></a>
 Getting started
 </h3>

@@ -95,8 +95,7 @@
 </li>
<li class="listitem">
 Call Py_Initialize()
- to start the interpreter and create the <code class="literal">_main_</code>
- module.
+ to start the interpreter and create the <code class="literal">__main__</code> module.
 </li>
<li class="listitem">
 Call other Python C API routines to use the interpreter.
@@ -132,8 +131,8 @@
 and object class templates to
 automate the process.
 
-<a name="using_the_interpreter.running_python_code"></a><h3>
-<a name="id773549"></a>
+<h3>
+<a name="using_the_interpreter.running_python_code"></a>
 Running Python code
 </h3>

@@ -152,8 +151,7 @@
 The <code class="literal">globals</code> and <code class="literal">locals</code> parameters are
 Python dictionaries containing the globals and locals of the context in which
 to run the code. For most intents and purposes you can use the namespace
- dictionary of the <code class="literal">_main_</code>
- module for both parameters.
+ dictionary of the <code class="literal">__main__</code> module for both parameters.
 

 Boost.python provides a function to import a module:
@@ -165,8 +163,8 @@
 first), and returns it.
 

- Let's import the <code class="literal">_main_</code>
- module and run some Python code in its namespace:
+ Let's import the <code class="literal">__main__</code> module and run some Python code
+ in its namespace:
 
<pre class="programlisting">object main_module = import("__main__");
object main_namespace = main_module.attr("__dict__");
@@ -180,8 +178,8 @@
 This should create a file called 'hello.txt' in the current directory containing
 a phrase that is well-known in programming circles.
 
-<a name="using_the_interpreter.manipulating_python_objects"></a><h3>
-<a name="id774064"></a>
+<h3>
+<a name="using_the_interpreter.manipulating_python_objects"></a>
 Manipulating Python objects
 </h3>

@@ -197,16 +195,16 @@
int five_squared = extract<int>(main_namespace["result"]);
</pre>

- Here we create a dictionary object for the <code class="literal">_main_</code>
- module's namespace. Then we assign 5 squared to the result variable and read
- this variable from the dictionary. Another way to achieve the same result
- is to use eval instead, which returns the result directly:
+ Here we create a dictionary object for the <code class="literal">__main__</code> module's
+ namespace. Then we assign 5 squared to the result variable and read this
+ variable from the dictionary. Another way to achieve the same result is to
+ use eval instead, which returns the result directly:
 
<pre class="programlisting">object result = eval("5 ** 2");
int five_squared = extract<int>(result);
</pre>
-<a name="using_the_interpreter.exception_handling"></a><h3>
-<a name="id774390"></a>
+<h3>
+<a name="using_the_interpreter.exception_handling"></a>
 Exception handling
 </h3>

@@ -216,13 +214,13 @@
<pre class="programlisting">try
{
 object result = eval("5/0");
- // execution will never get here:
- int five_divided_by_zero = extract<int>(result);
+ // execution will never get here:
+ int five_divided_by_zero = extract<int>(result);
}
catch(error_already_set const &)
{
- // handle the exception in some way
-}
+ // handle the exception in some way
+}
</pre>

 The <code class="literal">error_already_set</code> exception class doesn't carry any
@@ -238,12 +236,12 @@
{
 if (PyErr_ExceptionMatches(PyExc_ZeroDivisionError))
 {
- // handle ZeroDivisionError specially
- }
+ // handle ZeroDivisionError specially
+ }
 else
 {
- // print all other errors to stderr
- PyErr_Print();
+ // print all other errors to stderr
+ PyErr_Print();
 }
}
</pre>

Modified: trunk/libs/python/doc/tutorial/doc/html/python/exception.html
==============================================================================
--- trunk/libs/python/doc/tutorial/doc/html/python/exception.html (original)
+++ trunk/libs/python/doc/tutorial/doc/html/python/exception.html 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Exception Translation</title>
<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Chapter 1. python 2.0">
<link rel="up" href="../index.html" title="Chapter 1. python 2.0">
<link rel="prev" href="iterators.html" title="Iterators">
@@ -24,7 +24,7 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="python.exception"></a> Exception Translation</h2></div></div></div>
+<a name="python.exception"></a>Exception Translation</h2></div></div></div>

All C++ exceptions must be caught at the boundary with Python code. This boundary
is the point where C++ meets Python. Boost.Python provides a default exception

Modified: trunk/libs/python/doc/tutorial/doc/html/python/exposing.html
==============================================================================
--- trunk/libs/python/doc/tutorial/doc/html/python/exposing.html (original)
+++ trunk/libs/python/doc/tutorial/doc/html/python/exposing.html 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Exposing Classes</title>
<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Chapter 1. python 2.0">
<link rel="up" href="../index.html" title="Chapter 1. python 2.0">
<link rel="prev" href="hello.html" title="Building Hello World">
@@ -24,7 +24,7 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="python.exposing"></a> Exposing Classes</h2></div></div></div>
+<a name="python.exposing"></a>Exposing Classes</h2></div></div></div>
<div class="toc"><dl>
<dt>Constructors</dt>
<dt>Class Data Members</dt>
@@ -67,8 +67,6 @@
 we may use our class <code class="literal">World</code> in Python. Here's a sample Python
 session:
 
-
- 
<pre class="programlisting">>>> import hello
>>> planet = hello.World()
>>> planet.set('howdy')
@@ -90,12 +88,10 @@
 We may wish to wrap a class with a non-default constructor. Let us build
 on our previous example:
 
-
- 
<pre class="programlisting">struct World
{
- World(std::string msg): msg(msg) {} // added constructor
- void set(std::string msg) { this->msg = msg; }
+ World(std::string msg): msg(msg) {} // added constructor
+ void set(std::string msg) { this->msg = msg; }
 std::string greet() { return msg; }
 std::string msg;
};
@@ -120,7 +116,7 @@

 <code class="literal">init<std::string>()</code> exposes the constructor taking
 in a <code class="literal">std::string</code> (in Python, constructors are spelled
- "<code class="literal">"_init_"</code>").
+ "<code class="literal">"__init__"</code>").
 

 We can expose additional constructors by passing more <code class="literal">init<...></code>s
@@ -140,8 +136,8 @@
<pre class="programlisting">class_<Abstract>("Abstract", no_init)
</pre>

- This actually adds an <code class="literal">_init_</code>
- method which always raises a Python RuntimeError exception.
+ This actually adds an <code class="literal">__init__</code> method which always raises
+ a Python RuntimeError exception.
 
</div>
<div class="section">
@@ -172,8 +168,6 @@
 Then, in Python, assuming we have placed our Var class inside the namespace
 hello as we did before:
 
-
- 
<pre class="programlisting">>>> x = hello.Var('pi')
>>> x.value = 3.14
>>> print x.name, 'is around', x.value
@@ -183,8 +177,8 @@
 Note that <code class="literal">name</code> is exposed as read-only
 while <code class="literal">value</code> is exposed as read-write.
 
-<pre class="programlisting">>>> x.name = 'e' # can't change name
-Traceback (most recent call last):
+<pre class="programlisting">>>> x.name = 'e' # can't change name
+Traceback (most recent call last):
 File "<stdin>", line 1, in ?
AttributeError: can't set attribute
</pre>
@@ -198,8 +192,6 @@
 The only way to access the class' data is through access (getter/setter)
 functions. Access functions expose class properties. Here's an example:
 
-
- 
<pre class="programlisting">struct Num
{
 Num();
@@ -221,21 +213,17 @@

 And at last, in Python:
 
-
- 
<pre class="programlisting">>>> x = Num()
>>> x.value = 3.14
>>> x.value, x.rovalue
(3.14, 3.14)
->>> x.rovalue = 2.17 # error!
-</pre>
+>>> x.rovalue = 2.17 # error!
+</pre>

 Take note that the class property <code class="literal">rovalue</code> is exposed as
 read-only since the <code class="literal">rovalue</code>
 setter member function is not passed in:
 
-
- 
<pre class="programlisting">.add_property("rovalue", &Num::get)
</pre>
</div>
@@ -310,8 +298,8 @@
 is destroyed. We will see more of Boost.Python <a class="link" href="functions.html#python.call_policies" title="Call Policies">call
 policies</a> later.
 
-<pre class="programlisting">// Tell Python to take ownership of factory's result
-def("factory", factory,
+<pre class="programlisting">// Tell Python to take ownership of factory's result
+def("factory", factory,
 return_value_policy<manage_new_object>());
</pre>
</div>
@@ -356,7 +344,7 @@
 the job of wrapping classes that are meant to overridden in Python, easier.
 
<div class="sidebar">
-
+<div class="titlepage"></div>

 <img src="../images/alert.png" alt="alert"> MSVC6/7 Workaround
 
@@ -436,8 +424,8 @@
 int f()
 {
 if (override f = this->get_override("f"))
- return f(); // *note*
- return Base::f();
+ return f(); // *note*
+ return Base::f();
 }

 int default_f() { return this->Base::f(); }
@@ -449,7 +437,7 @@
 If none, then we call <code class="computeroutput">Base::f()</code>.
 
<div class="sidebar">
-
+<div class="titlepage"></div>

 <img src="../images/alert.png" alt="alert"> MSVC6/7 Workaround
 
@@ -477,8 +465,6 @@

 In Python, the results would be as expected:
 
-
- 
<pre class="programlisting">>>> base = Base()
>>> class Derived(Base):
... def f(self):
@@ -502,8 +488,8 @@
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
<a name="python.class_operators_special_functions"></a>Class Operators/Special Functions</h3></div></div></div>
-<a name="class_operators_special_functions.python_operators"></a><h3>
-<a name="id764956"></a>
+<h3>
+<a name="class_operators_special_functions.python_operators"></a>
 Python Operators
 </h3>

@@ -515,8 +501,6 @@
 Consider a file position class <code class="literal">FilePos</code> and a set of operators
 that take on FilePos instances:
 
-
- 
<pre class="programlisting">class FilePos { /*...*/ };

FilePos operator+(FilePos, int);
@@ -532,14 +516,14 @@
 and intuitively:
 
<pre class="programlisting">class_<FilePos>("FilePos")
- .def(self + int()) // __add__
- .def(int() + self) // __radd__
- .def(self - self) // __sub__
- .def(self - int()) // __sub__
- .def(self += int()) // __iadd__
- .def(self -= other<int>())
- .def(self < self); // __lt__
-</pre>
+ .def(self + int()) // __add__
+ .def(int() + self) // __radd__
+ .def(self - self) // __sub__
+ .def(self - int()) // __sub__
+ .def(self += int()) // __iadd__
+ .def(self -= other<int>())
+ .def(self < self); // __lt__
+</pre>

 The code snippet above is very clear and needs almost no explanation at all.
 It is virtually the same as the operators' signatures. Just take note that
@@ -549,8 +533,8 @@
 in place of an actual <code class="literal">T</code> instance when writing "self
 expressions".
 
-<a name="class_operators_special_functions.special_methods"></a><h3>
-<a name="id765570"></a>
+<h3>
+<a name="class_operators_special_functions.special_methods"></a>
 Special Methods
 </h3>

@@ -568,11 +552,11 @@
ostream& operator<<(ostream&,Rational);

class_<Rational>("Rational")
- .def(float_(self)) // __float__
- .def(pow(self, other<Rational>)) // __pow__
- .def(abs(self)) // __abs__
- .def(str(self)) // __str__
- ;
+ .def(float_(self)) // __float__
+ .def(pow(self, other<Rational>)) // __pow__
+ .def(abs(self)) // __abs__
+ .def(str(self)) // __str__
+ ;
</pre>

 Need we say more?

Modified: trunk/libs/python/doc/tutorial/doc/html/python/functions.html
==============================================================================
--- trunk/libs/python/doc/tutorial/doc/html/python/functions.html (original)
+++ trunk/libs/python/doc/tutorial/doc/html/python/functions.html 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Functions</title>
<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Chapter 1. python 2.0">
<link rel="up" href="../index.html" title="Chapter 1. python 2.0">
<link rel="prev" href="exposing.html" title="Exposing Classes">
@@ -136,11 +136,9 @@

 We could copy result into a new object:
 
-
- 
-<pre class="programlisting">>>> f(y, z).set(42) # Result disappears
->>> y.x.get() # No crash, but still bad
-3.14
+<pre class="programlisting">>>> f(y, z).set(42) # Result disappears
+>>> y.x.get() # No crash, but still bad
+3.14
</pre>

 This is not really our intent of our C++ interface. We've broken our promise
@@ -150,8 +148,6 @@

 Our problems do not end there. Suppose Y is implemented as follows:
 
-
- 
<pre class="programlisting">struct Y
{
 X x; Z* z;
@@ -203,8 +199,8 @@
 BOOM!
 </li>
</ol></div>
-<a name="call_policies.call_policies"></a><h3>
-<a name="id767074"></a>
+<h3>
+<a name="call_policies.call_policies"></a>
 Call Policies
 </h3>

@@ -284,7 +280,7 @@
 </li>
</ul></div>
<div class="sidebar">
-
+<div class="titlepage"></div>

 <img src="../images/smiley.png" alt="smiley"> Remember the Zen, Luke:
 
@@ -362,30 +358,30 @@
 But the type of a pointer to the function <code class="literal">f</code> has no information
 about its default arguments:
 
-<pre class="programlisting">int(*g)(int,double,char const*) = f; // defaults lost!
-</pre>
+<pre class="programlisting">int(*g)(int,double,char const*) = f; // defaults lost!
+</pre>

 When we pass this function pointer to the <code class="literal">def</code> function,
 there is no way to retrieve the default arguments:
 
-<pre class="programlisting">def("f", f); // defaults lost!
-</pre>
+<pre class="programlisting">def("f", f); // defaults lost!
+</pre>

 Because of this, when wrapping C++ code, we had to resort to manual wrapping
 as outlined in the <a class="link" href="functions.html#python.overloading" title="Overloading">previous section</a>,
 or writing thin wrappers:
 
-<pre class="programlisting">// write "thin wrappers"
-int f1(int x) { f(x); }
+<pre class="programlisting">// write "thin wrappers"
+int f1(int x) { f(x); }
int f2(int x, double y) { f(x,y); }

/*...*/

- // in module init
- def("f", f); // all arguments
- def("f", f2); // two arguments
- def("f", f1); // one argument
-</pre>
+ // in module init
+ def("f", f); // all arguments
+ def("f", f2); // two arguments
+ def("f", f1); // one argument
+</pre>

 When you want to wrap functions (or member functions) that either:
 
@@ -397,8 +393,8 @@
 are overloaded with a common sequence of initial arguments
 </li>
</ul></div>
-<a name="default_arguments.boost_python_function_overloads"></a><h3>
-<a name="id769042"></a>
+<h3>
+<a name="default_arguments.boost_python_function_overloads"></a>
 BOOST_PYTHON_FUNCTION_OVERLOADS
 </h3>

@@ -424,8 +420,8 @@
 
<pre class="programlisting">def("foo", foo, foo_overloads());
</pre>
-<a name="default_arguments.boost_python_member_function_overloads"></a><h3>
-<a name="id769301"></a>
+<h3>
+<a name="default_arguments.boost_python_member_function_overloads"></a>
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS
 </h3>

@@ -467,8 +463,8 @@
 See the <a href="../../../../v2/overloads.html#BOOST_PYTHON_FUNCTION_OVERLOADS-spec" target="_top">overloads
 reference</a> for details.
 
-<a name="default_arguments.init_and_optional"></a><h3>
-<a name="id769596"></a>
+<h3>
+<a name="default_arguments.init_and_optional"></a>
 init and optional
 </h3>

@@ -536,8 +532,8 @@
 Notice though that we have a situation now where we have a minimum of zero
 (0) arguments and a maximum of 3 arguments.
 
-<a name="auto_overloading.manual_wrapping"></a><h3>
-<a name="id770226"></a>
+<h3>
+<a name="auto_overloading.manual_wrapping"></a>
 Manual Wrapping
 </h3>

Modified: trunk/libs/python/doc/tutorial/doc/html/python/hello.html
==============================================================================
--- trunk/libs/python/doc/tutorial/doc/html/python/hello.html (original)
+++ trunk/libs/python/doc/tutorial/doc/html/python/hello.html 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Building Hello World</title>
<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Chapter 1. python 2.0">
<link rel="up" href="../index.html" title="Chapter 1. python 2.0">
<link rel="prev" href="../index.html" title="Chapter 1. python 2.0">
@@ -24,9 +24,9 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="python.hello"></a> Building Hello World</h2></div></div></div>
-<a name="hello.from_start_to_finish"></a><h3>
-<a name="id760024"></a>
+<a name="python.hello"></a>Building Hello World</h2></div></div></div>
+<h3>
+<a name="hello.from_start_to_finish"></a>
 From Start To Finish
 </h3>

@@ -91,8 +91,8 @@
 in the command line. Pre-built Boost.Jam executables are available for most
 platforms. The complete list of Bjam executables can be found here.
 
-<a name="hello.let_s_jam_"></a><h3>
-<a name="id760177"></a>
+<h3>
+<a name="hello.let_s_jam_"></a>
 Let's Jam!
 </h3>

@@ -107,8 +107,8 @@
 The comments contained in the Jamrules file above should be sufficient to get
 you going.
 
-<a name="hello.running_bjam"></a><h3>
-<a name="id760225"></a>
+<h3>
+<a name="hello.running_bjam"></a>
 Running bjam
 </h3>

@@ -133,12 +133,12 @@
using msvc : 8.0 ;

# Python configuration
-using python : 2.4 : C:/dev/toolsPython ;
+using python : 2.4 : C:dev/tools/Python ;
</pre>

 The first rule tells Bjam to use the MSVC 8.0 compiler and associated tools.
 The second rule provides information on Python, its version and where it is
- located. The above assumes that the Python installation is in <code class="literal">C:/dev/tools/Python/</code>.
+ located. The above assumes that the Python installation is in <code class="literal">C:dev/tools\/Python</code>.
 If you have one fairly "standard" python installation for your platform,
 you might not need to do this.
 
@@ -165,7 +165,7 @@
 And so on... Finally:
 
<pre class="programlisting">Creating library path-to-boost_python.dll
- Creating library path-to-'''hello_ext'''.exp
+ Creating library /path-to-hello_ext.exp/
**passed** ... hello.test
...updated 35 targets...
</pre>

Modified: trunk/libs/python/doc/tutorial/doc/html/python/iterators.html
==============================================================================
--- trunk/libs/python/doc/tutorial/doc/html/python/iterators.html (original)
+++ trunk/libs/python/doc/tutorial/doc/html/python/iterators.html 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Iterators</title>
<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Chapter 1. python 2.0">
<link rel="up" href="../index.html" title="Chapter 1. python 2.0">
<link rel="prev" href="embedding.html" title="Embedding">
@@ -62,22 +62,18 @@
 The typical Python iteration protocol: <code class="literal">for y
 in x...</code> is as follows:
 
-
- 
-<pre class="programlisting">iter = x.__iter__() # get iterator
-try:
+<pre class="programlisting">iter = x.__iter__() # get iterator
+try:
 while 1:
- y = iter.next() # get each item
- ... # process y
-except StopIteration: pass # iterator exhausted
-</pre>
+ y = iter.next() # get each item
+ ... # process y
+except StopIteration: pass # iterator exhausted
+</pre>

 Boost.Python provides some mechanisms to make C++ iterators play along nicely
 as Python iterators. What we need to do is to produce appropriate <code class="computeroutput">__iter__</code> function from C++ iterators that
 is compatible with the Python iteration protocol. For example:
 
-
- 
<pre class="programlisting">object get_iterator = iterator<vector<int> >();
object iter = get_iterator(v);
object first = iter.next();
@@ -129,8 +125,6 @@
 Let's put this into action... Here's an example from some hypothetical bogon
 Particle accelerator code:
 
-
- 
<pre class="programlisting">f = Field()
for x in f.pions:
 smash(x)
@@ -140,8 +134,6 @@

 Now, our C++ Wrapper:
 
-
- 
<pre class="programlisting">class_<F>("Field")
 .property("pions", range(&F::p_begin, &F::p_end))
 .property("bogons", range(&F::b_begin, &F::b_end));
@@ -156,27 +148,23 @@
 a Python iterator look like an STL iterator. For that, we use <code class="computeroutput">stl_input_iterator<></code>.
 Consider how we might implement a function that exposes <code class="computeroutput">std::list<int>::assign()</code> to Python:
 
-
- 
<pre class="programlisting">template<typename T>
void list_assign(std::list<T>& l, object o) {
- // Turn a Python sequence into an STL input range
- stl_input_iterator<T> begin(o), end;
+ // Turn a Python sequence into an STL input range
+ stl_input_iterator<T> begin(o), end;
 l.assign(begin, end);
}

-// Part of the wrapper for list<int>
-class_<std::list<int> >("list_int")
+// Part of the wrapper for list<int>
+class_<std::list<int> >("list_int")
 .def("assign", &list_assign<int>)
- // ...
- ;
+ // ...
+ ;
</pre>

 Now in Python, we can assign any integer sequence to <code class="computeroutput">list_int</code>
 objects:
 
-
- 
<pre class="programlisting">x = list_int();
x.assign([1,2,3,4,5])
</pre>

Modified: trunk/libs/python/doc/tutorial/doc/html/python/object.html
==============================================================================
--- trunk/libs/python/doc/tutorial/doc/html/python/object.html (original)
+++ trunk/libs/python/doc/tutorial/doc/html/python/object.html 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Object Interface</title>
<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Chapter 1. python 2.0">
<link rel="up" href="../index.html" title="Chapter 1. python 2.0">
<link rel="prev" href="functions.html" title="Functions">
@@ -24,7 +24,7 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="python.object"></a> Object Interface</h2></div></div></div>
+<a name="python.object"></a>Object Interface</h2></div></div></div>
<div class="toc"><dl>
<dt>Basic Interface</dt>
<dt>Derived Object types</dt>
@@ -60,8 +60,6 @@

 To illustrate, this Python code snippet:
 
-
- 
<pre class="programlisting">def f(x, y):
 if (y == 'foo'):
 x[3:7] = 'bar'
@@ -75,8 +73,6 @@

 Can be rewritten in C++ using Boost.Python facilities this way:
 
-
- 
<pre class="programlisting">object f(object x, object y) {
 if (y == "foo")
 x.slice(3,7) = "bar";
@@ -147,9 +143,9 @@
 
<pre class="programlisting">void f(str name)
{
- object n2 = name.attr("upper")(); // NAME = name.upper()
- str NAME = name.upper(); // better
- object msg = "%s is bigger than %s" % make_tuple(NAME,name);
+ object n2 = name.attr("upper")(); // NAME = name.upper()
+ str NAME = name.upper(); // better
+ object msg = "%s is bigger than %s" % make_tuple(NAME,name);
}
</pre>

@@ -169,7 +165,7 @@
 do that in std C++.
 
<div class="sidebar">
-
+<div class="titlepage"></div>

 <img src="../images/alert.png" alt="alert"> Beware the common pitfall
 of forgetting that the constructors of most of Python's mutable types make
@@ -179,17 +175,17 @@

 Python:
 
-<pre class="programlisting">>>> d = dict(x.__dict__) # copies x.__dict__
->>> d['whatever'] = 3 # modifies the copy
-</pre>
+<pre class="programlisting">>>> d = dict(x.__dict__) # copies x.__dict__
+>>> d['whatever'] = 3 # modifies the copy
+</pre>

 C++:
 
-<pre class="programlisting">dict d(x.attr("__dict__")); // copies x.__dict__
-d['whatever'] = 3; // modifies the copy
-</pre>
-<a name="derived_object_types.class__lt_t_gt__as_objects"></a><h3>
-<a name="id771905"></a>
+<pre class="programlisting">dict d(x.attr("__dict__")); // copies x.__dict__
+d['whatever'] = 3; // modifies the copy
+</pre>
+<h3>
+<a name="derived_object_types.class__lt_t_gt__as_objects"></a>
 class_<T> as objects
 </h3>

@@ -217,8 +213,8 @@
 can be achieved with the <code class="literal">extract<T></code> function. Consider
 the following:
 
-<pre class="programlisting">double x = o.attr("length"); // compile error
-</pre>
+<pre class="programlisting">double x = o.attr("length"); // compile error
+</pre>

 In the code above, we got a compiler error because Boost.Python <code class="literal">object</code>
 can't be implicitly converted to <code class="literal">double</code>s. Instead, what
@@ -250,8 +246,8 @@
 facility in fact solves the mutable copying problem:
 
<pre class="programlisting">dict d = extract<dict>(x.attr("__dict__"));
-d["whatever"] = 3; // modifies x.__dict__ !
-</pre>
+d["whatever"] = 3; // modifies x.__dict__ !
+</pre>
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
@@ -299,8 +295,6 @@

 You can access those values in Python as
 
-
- 
<pre class="programlisting">>>> my_module.choice.red
my_module.choice.red
</pre>
@@ -308,15 +302,13 @@
 where my_module is the module where the enum is declared. You can also create
 a new scope around a class:
 
-
- 
<pre class="programlisting">scope in_X = class_<X>("X")
 .def( ... )
 .def( ... )
 ;

-// Expose X::nested as X.nested
-enum_<X::nested>("nested")
+// Expose X::nested as X.nested
+enum_<X::nested>("nested")
 .value("red", red)
 .value("blue", blue)
 ;

Modified: trunk/libs/python/doc/tutorial/doc/html/python/techniques.html
==============================================================================
--- trunk/libs/python/doc/tutorial/doc/html/python/techniques.html (original)
+++ trunk/libs/python/doc/tutorial/doc/html/python/techniques.html 2011-12-26 16:56:24 EST (Mon, 26 Dec 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>General Techniques</title>
<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Chapter 1. python 2.0">
<link rel="up" href="../index.html" title="Chapter 1. python 2.0">
<link rel="prev" href="exception.html" title="Exception Translation">
@@ -23,7 +23,7 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="python.techniques"></a> General Techniques</h2></div></div></div>
+<a name="python.techniques"></a>General Techniques</h2></div></div></div>
<div class="toc"><dl>
<dt>Creating Packages</dt>
<dt>Extending Wrapped Objects in Python</dt>
@@ -62,8 +62,8 @@
 him to write code like this:
 
<pre class="programlisting">import sounds.filters
-sounds.filters.echo(...) # echo is a C++ function
-</pre>
+sounds.filters.echo(...) # echo is a C++ function
+</pre>

 The first step is to write the wrapping code. We have to export each module
 separately with Boost.Python, like this:
@@ -124,8 +124,6 @@
 into his PYTHONPATH
 and fire up the interpreter:
 
-
- 
<pre class="programlisting">>>> import sounds.io
>>> import sounds.filters
>>> sound = sounds.io.open('file.mp3')
@@ -146,8 +144,6 @@
 If we want this flexibility, we will have to complicate our package hierarchy
 a little. First, we will have to change the name of the extension modules:
 
-
- 
<pre class="programlisting">/* file core.cpp */
BOOST_PYTHON_MODULE(_core)
{
@@ -178,8 +174,6 @@
 to each one. But if we leave it that way, the user will have to access the
 functions in the core module with this syntax:
 
-
- 
<pre class="programlisting">>>> import sounds.core._core
>>> sounds.core._core.foo(...)
</pre>
@@ -188,7 +182,7 @@
 magic: everything that is brought to the <code class="literal">__init__.py</code> namespace
 can be accessed directly by the user. So, all we have to do is bring the
 entire namespace from <code class="literal">_core.pyd</code> to <code class="literal">core/__init__.py</code>.
- So add this line of code to <code class="literal">soundscore__init__.py</code>:
+ So add this line of code to <code class="literal">sounds/core/__init__.py</code>:
 
<pre class="programlisting">from _core import *
</pre>
@@ -216,7 +210,7 @@
 return s
</pre>

- Next, we add this line to <code class="literal">soundsfilters__init__.py</code>:
+ Next, we add this line to <code class="literal">sounds/filters/__init__.py</code>:
 
<pre class="programlisting">from echo_noise import echo_noise
</pre>
@@ -237,11 +231,11 @@
 
<pre class="programlisting">>>> class C(object): pass
>>>
->>> # a regular function
->>> def C_str(self): return 'A C instance!'
+>>> # a regular function
+>>> def C_str(self): return 'A C instance!'
>>>
->>> # now we turn it in a member function
->>> C.__str__ = C_str
+>>> # now we turn it in a member function
+>>> C.__str__ = C_str
>>>
>>> c = C()
>>> print c
@@ -256,8 +250,6 @@
 We can do the same with classes that were wrapped with Boost.Python. Suppose
 we have a class <code class="literal">point</code> in C++:
 
-
- 
<pre class="programlisting">class point {...};

BOOST_PYTHON_MODULE(_geom)
@@ -269,16 +261,14 @@
 If we are using the technique from the previous session, <a class="link" href="techniques.html#python.creating_packages" title="Creating Packages">Creating
 Packages</a>, we can code directly into <code class="literal">geom/__init__.py</code>:
 
-
- 
<pre class="programlisting">from _geom import *

-# a regular function
-def point_str(self):
+# a regular function
+def point_str(self):
 return str((self.x, self.y))

-# now we turn it into a member function
-point.__str__ = point_str
+# now we turn it into a member function
+point.__str__ = point_str
</pre>

 All point instances created from C++ will
@@ -303,9 +293,9 @@
 You can even add a little syntactic sugar with the use of metaclasses. Let's
 create a special metaclass that "injects" methods in other classes.
 
-<pre class="programlisting"># The one Boost.Python uses for all wrapped classes.
-# You can use here any class exported by Boost instead of "point"
-BoostPythonMetaclass = point.__class__
+<pre class="programlisting"># The one Boost.Python uses for all wrapped classes.
+# You can use here any class exported by Boost instead of "point"
+BoostPythonMetaclass = point.__class__

class injector(object):
 class __metaclass__(BoostPythonMetaclass):
@@ -316,8 +306,8 @@
 setattr(b,k,v)
 return type.__init__(self, name, bases, dict)

-# inject some methods in the point foo
-class more_point(injector, point):
+# inject some methods in the point foo
+class more_point(injector, point):
 def __repr__(self):
 return 'Point(x=%s, y=%s)' % (self.x, self.y)
 def foo(self):
@@ -355,8 +345,6 @@
 can easily become too high. If this is causing you problems, you can split
 the class_ definitions in multiple files:
 
-
- 
<pre class="programlisting">/* file point.cpp */
#include <point.h>
#include <boost/python.hpp>

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk