Release

[SVN r43921]
2026-01-20 04:42:28 +00:00 · 2008-03-29 11:50:24 +00:00
31 changed files with 287 additions and 581 deletions
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -11,7 +11,7 @@
   :alt: Boost C++ Libraries:
   :class: boost-logo

-__ ../index.html
+__ ../index.htm


 .. section-numbering::
--- a/doc/projects.html
+++ b/doc/projects.html
@@ -375,27 +375,6 @@
      application modules, including GUI and post-processing of results.</p>
    </dd>

-    <dt><b><a href="http://polybori.sourceforge.net/">PolyBoRi</a></b></dt>
-
-    <dd>
-      <p><a href="mailto:brickenstein@mfo.de"
-        >Michael Brickenstein</a> writes:</p>
-
-      <blockquote>
-        <p>The core of PolyBoRi is a C++ library, which provides
-        high-level data types for Boolean polynomials and monomials,
-        exponent vectors, as well as for the underlying polynomial
-        rings and subsets of the powerset of the Boolean variables. As
-        a unique approach, binary decision diagrams are used as
-        internal storage type for polynomial structures. On top of
-        this C++-library we provide a Python interface. This allows
-        parsing of complex polynomial systems, as well as sophisticated
-        and extendable strategies for Gr&ouml;bner basis computation.
-        Boost.Python has helped us to create this interface in a
-        very clean way.</p>
-      </blockquote>
-    </dd>
-
    <dt><b><a href="http://www.rationaldiscovery.com">Rational Discovery
    LLC</a></b></dt>

@@ -456,11 +435,11 @@
  </dl>
  <hr>

-  <p>Revised
+  <p>Revised 
  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-   29 May, 2008</p>
+   15 July, 2003</p>

  <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
-  Abrahams</a> 2002-2008.</i></p>
+  Abrahams</a> 2002-2003.</i></p>
 </body>
 </html>
--- a/doc/tutorial/doc/html/index.html
+++ b/doc/tutorial/doc/html/index.html
@@ -3,17 +3,17 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Chapter 1. python 1.0</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
 <link rel="start" href="index.html" title="Chapter 1. python 1.0">
-<link rel="next" href="python/hello.html" title=" Building Hello World">
+<link rel="next" href="python/hello.html" title="Building Hello World">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
-<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
+<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
@@ -31,7 +31,7 @@
 <div><p class="copyright">Copyright © 2002-2005 Joel
      de Guzman, David Abrahams</p></div>
 <div><div class="legalnotice">
-<a name="id455921"></a><p>
+<a name="id2625929"></a><p>
        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>)
@@ -93,10 +93,10 @@
      code takes on the look of a kind of declarative interface definition language
      (IDL).
    </p>
-<a name="quickstart.hello_world"></a><h2>
-<a name="id385276"></a>
+<a name="quickstart.hello_world"></a><h3>
+<a name="id2625972"></a>
      Hello World
-    </h2>
+    </h3>
 <p>
      Following C/C++ tradition, let's start with the "hello, world". A
      C++ Function:
@@ -136,8 +136,8 @@
 <p>
        </p>
 <p>
-          <span class="emphasis"><em><span class="bold"><b>Next stop... Building your Hello World
-          module from start to finish...</b></span></em></span>
+          <span class="emphasis"><em><span class="bold"><strong>Next stop... Building your Hello World
+          module from start to finish...</strong></span></em></span>
        </p>
 <p>
      </p>
@@ -145,7 +145,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: March 24, 2008 at 23:09:39 GMT</small></p></td>
+<td align="left"><p><small>Last revised: March 15, 2008 at 13:46:47 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
--- a/doc/tutorial/doc/html/python/embedding.html
+++ b/doc/tutorial/doc/html/python/embedding.html
@@ -40,7 +40,7 @@
      Python/C API at all. So stay tuned... <span class="inlinemediaobject"><img src="../images/smiley.png" alt="smiley"></span>
    </p>
 <a name="embedding.building_embedded_programs"></a><h2>
-<a name="id471330"></a>
+<a name="id471329"></a>
      Building embedded programs
    </h2>
 <p>
@@ -82,7 +82,7 @@ exe embedded_program # name of the executable
    &lt;find-library&gt;$(PYTHON_EMBEDDED_LIBRARY) ;
 </pre>
 <a name="embedding.getting_started"></a><h2>
-<a name="id471435"></a>
+<a name="id471434"></a>
      Getting started
    </h2>
 <p>
@@ -139,7 +139,7 @@ exe embedded_program # name of the executable
        automate the process.
      </p>
 <a name="using_the_interpreter.running_python_code"></a><h2>
-<a name="id471598"></a>
+<a name="id471597"></a>
        Running Python code
      </h2>
 <p>
@@ -190,7 +190,7 @@ exe embedded_program # name of the executable
        a phrase that is well-known in programming circles.
      </p>
 <a name="using_the_interpreter.manipulating_python_objects"></a><h2>
-<a name="id472186"></a>
+<a name="id472185"></a>
        Manipulating Python objects
      </h2>
 <p>
@@ -217,7 +217,7 @@ exe embedded_program # name of the executable
 <span class="keyword">int</span> <span class="identifier">five_squared</span> <span class="special">=</span> <span class="identifier">extract</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">result</span><span class="special">);</span>
 </pre>
 <a name="using_the_interpreter.exception_handling"></a><h2>
-<a name="id472558"></a>
+<a name="id472557"></a>
        Exception handling
      </h2>
 <p>
--- a/doc/tutorial/doc/html/python/exposing.html
+++ b/doc/tutorial/doc/html/python/exposing.html
@@ -533,7 +533,7 @@
 <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><h2>
-<a name="id461482"></a>
+<a name="id461481"></a>
        Python Operators
      </h2>
 <p>
@@ -582,7 +582,7 @@
        expressions".
      </p>
 <a name="class_operators_special_functions.special_methods"></a><h2>
-<a name="id462239"></a>
+<a name="id462238"></a>
        Special Methods
      </h2>
 <p>
--- a/doc/tutorial/doc/html/python/functions.html
+++ b/doc/tutorial/doc/html/python/functions.html
@@ -212,7 +212,7 @@ Namespaces are one honking great idea -- let's do more of those!
 <li><span class="bold"><b>BOOM!</b></span></li>
 </ol></div>
 <a name="call_policies.call_policies"></a><h2>
-<a name="id464236"></a>
+<a name="id464235"></a>
        Call Policies
      </h2>
 <p>
@@ -445,7 +445,7 @@ Namespaces are one honking great idea -- let's do more of those!
 <span class="identifier">def</span><span class="special">(</span><span class="string">"foo"</span><span class="special">,</span> <span class="identifier">foo</span><span class="special">,</span> <span class="identifier">foo_overloads</span><span class="special">());</span>
 </pre>
 <a name="default_arguments.boost_python_member_function_overloads"></a><h2>
-<a name="id466595"></a>
+<a name="id466594"></a>
        BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS
      </h2>
 <p>
@@ -565,7 +565,7 @@ Namespaces are one honking great idea -- let's do more of those!
        (0) arguments and a maximum of 3 arguments.
      </p>
 <a name="auto_overloading.manual_wrapping"></a><h2>
-<a name="id467740"></a>
+<a name="id467739"></a>
        Manual Wrapping
      </h2>
 <p>
--- a/doc/tutorial/doc/html/python/hello.html
+++ b/doc/tutorial/doc/html/python/hello.html
@@ -187,8 +187,7 @@ bjam
 </tr>
 <tr><td colspan="2" align="left" valign="top"><p>
        Starting from Boost 1.35, bjam erases the generated executables (e.g. pyd
-        file) after the test has concluded to conserve disk space. To keep bjam from
-        doing that, pass --preserve-test-targets to bjam.
+        file). To keep bjam from doing that, pass --preserve-test-targets to bjam.
      </p></td></tr>
 </table></div>
 <div class="blockquote"><blockquote class="blockquote">
--- a/doc/tutorial/doc/html/python/object.html
+++ b/doc/tutorial/doc/html/python/object.html
@@ -196,7 +196,7 @@
 </span><span class="identifier">d</span><span class="special">[</span><span class="char">'whatever'</span><span class="special">]</span> <span class="special">=</span> <span class="number">3</span><span class="special">;</span>           <span class="comment">// modifies the copy
 </span></pre>
 <a name="derived_object_types.class__lt_t_gt__as_objects"></a><h2>
-<a name="id469745"></a>
+<a name="id469744"></a>
        class_&lt;T&gt; as objects
      </h2>
 <p>
--- a/doc/tutorial/doc/tutorial.qbk
+++ b/doc/tutorial/doc/tutorial.qbk
@@ -186,10 +186,6 @@ And so on... Finally:
 Or something similar. If all is well, you should now have built the DLLs and
 run the Python program.

-[note Starting from Boost 1.35, bjam erases the generated executables
-(e.g. pyd file) after the test has concluded to conserve disk space.
-To keep bjam from doing that, pass --preserve-test-targets to bjam.]
-
 [:[*There you go... Have fun!]]

 [endsect]
@@ -1385,9 +1381,9 @@ interpreter. This may be fixed in a future version of boost.python.]
 [section Using the interpreter]

 As you probably already know, objects in Python are reference-counted.
-Naturally, the [^PyObject]s of the Python\/C API are also reference-counted.
+Naturally, the [^PyObject]s of the Python/C API are also reference-counted.
 There is a difference however. While the reference-counting is fully
-automatic in Python, the Python\/C API requires you to do it
+automatic in Python, the Python/C API requires you to do it
 [@http://www.python.org/doc/current/api/refcounts.html by hand]. This is
 messy and especially hard to get right in the presence of C++ exceptions.
 Fortunately Boost.Python provides the [@../../../v2/handle.html handle] and
--- a/doc/tutorial/index.html
+++ b/doc/tutorial/index.html
@@ -11,8 +11,8 @@
    <a href="doc/html/index.html">link</a> &nbsp;<hr>
    <p>© Copyright Beman Dawes, 2001</p>
    <p>Distributed under the Boost Software License, Version 1.0. (See 
-    accompanying file <a href="../../../../LICENSE_1_0.txt">
+    accompanying file <a href="../../../LICENSE_1_0.txt">
    LICENSE_1_0.txt</a> or copy at
    <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
  </body>
-</html>
+</html>
--- a/doc/v2/Dereferenceable.html
+++ b/doc/v2/Dereferenceable.html
@@ -4,7 +4,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../../boost.css">
+<link rel="stylesheet" type="text/css" href=../../../../boost.css>
 <title>Boost.Python - Dereferenceable Concept</title>
 </head>
 <body link="#0000ff" vlink="#800080">
--- a/doc/v2/Extractor.html
+++ b/doc/v2/Extractor.html
@@ -4,7 +4,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../../boost.css">
+<link rel="stylesheet" type="text/css" href=../../../../boost.css>
 <title>Boost.Python - Extractor Concept</title>
 </head>
 <body link="#0000ff" vlink="#800080">
--- a/doc/v2/HolderGenerator.html
+++ b/doc/v2/HolderGenerator.html
@@ -4,7 +4,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../../boost.css">
+<link rel="stylesheet" type="text/css" href=../../../../boost.css>
 <title>Boost.Python - Holder Concept</title>
 </head>
 <body link="#0000ff" vlink="#800080">
--- a/doc/v2/object.html
+++ b/doc/v2/object.html
@@ -74,32 +74,6 @@
            </dl>
          </dd>

-          <dt><a href="#const_objattribute_policies-spec">Class
-          <code>const_objattribute_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#const_objattribute_policies-spec-synopsis">Class
-              <code>const_objattribute_policies</code> synopsis</a></dt>
-
-              <dt><a href="#const_objattribute_policies-spec-statics">Class
-              <code>const_objattribute_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#objattribute_policies-spec">Class
-          <code>objattribute_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#objattribute_policies-spec-synopsis">Class
-              <code>objattribute_policies</code> synopsis</a></dt>
-
-              <dt><a href="#objattribute_policies-spec-statics">Class
-              <code>objattribute_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
          <dt><a href="#const_item_policies-spec">Class
          <code>const_item_policies</code></a></dt>

@@ -354,102 +328,6 @@ static void del(object const&amp;target, char const* key);
    <!-- end -->
    <!-- begin -->

-    <h3><a name="const_objattribute_policies-spec"></a>Class
-    <code>const_objattribute_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an attribute
-    access to a <code>const&nbsp;object</code> when the attribute name is
-    given as a <code>const&nbsp;object</code>.</p>
-
-    <h4><a name="const_objattribute_policies-spec-synopsis"></a>Class
-    <code>const_objattribute_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct const_objattribute_policies
-  {
-      typedef object const& key_type;
-      static object get(object const&amp; target, object const& key);
-  };
-}}}
-</pre>
-
-    <h4><a name="const_objattribute_policies-spec-statics"></a>Class
-    <code>const_objattribute_policies</code> static functions</h4>
-<pre>
-static object get(object const&amp; target, object const& key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>key</code> is an <code>object</code>
-      holding a string.</dt>
-
-      <dt><b>Effects:</b> accesses the attribute of <code>target</code> named
-      by <code>key</code>.</dt>
-
-      <dt><b>Returns:</b> An <code>object</code> managing the result of the
-      attribute access.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-
-    <h3><a name="objattribute_policies-spec"></a>Class
-    <code>objattribute_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an attribute
-    access to a mutable <code>object</code> when the attribute name is
-    given as a <code>const&nbsp;object</code>.</p>
-
-    <h4><a name="objattribute_policies-spec-synopsis"></a>Class
-    <code>objattribute_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct objattribute_policies : const_objattribute_policies
-  {
-      static object const&amp; set(object const&amp; target, object const& key, object const&amp; value);
-      static void del(object const&amp;target, object const& key);
-  };
-}}}
-</pre>
-
-    <h4><a name="objattribute_policies-spec-statics"></a>Class
-    <code>objattribute_policies</code> static functions</h4>
-<pre>
-static object const&amp; set(object const&amp; target, object const& key, object const&amp; value);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>key</code> is an <code>object</code>
-      holding a string.</dt>
-
-      <dt><b>Effects:</b> sets the attribute of <code>target</code> named by
-      <code>key</code> to <code>value</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-<pre>
-static void del(object const&amp;target, object const& key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>key</code> is an <code>object</code>
-      holding a string.</dt>
-
-      <dt><b>Effects:</b> deletes the attribute of <code>target</code> named
-      by <code>key</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-    <!-- end -->
-    <!-- begin -->
-
    <h3><a name="const_item_policies-spec"></a>Class
    <code>const_item_policies</code></h3>

@@ -664,8 +542,6 @@ namespace boost { namespace python { namespace api
      //
      proxy&lt;const_object_attribute&gt; attr(char const*) const;
      proxy&lt;object_attribute&gt; attr(char const*);
-      proxy&lt;const_object_objattribute&gt; attr(object const&) const;
-      proxy&lt;object_objattribute&gt; attr(object const&);

      // item access
      //
@@ -732,21 +608,6 @@ proxy&lt;object_attribute&gt; attr(char const* name);
      <code>name</code> as its key.</dt>
    </dl>
 <pre>
-proxy&lt;const_object_objattribute&gt; attr(const object& name) const;
-proxy&lt;object_objattribute&gt; attr(const object& name);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> name is a <code>object</code> holding a string.</dt>
-
-      <dt><b>Effects:</b> accesses the named attribute of
-      <code>*this</code>.</dt>
-
-      <dt><b>Returns:</b> a proxy object which binds
-      <code>object(*static_cast&lt;U*&gt;(this))</code> as its target, and
-      <code>name</code> as its key.</dt>
-    </dl>
-<pre>
 template &lt;class T&gt;
 proxy&lt;const_object_item&gt; operator[](T const&amp; key) const;
 template &lt;class T&gt;
@@ -1077,11 +938,11 @@ object sum_items(object seq)
 </pre>
    <p>Revised 
    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  27 May, 2008
+  13 January, 2006
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
    </p>

    <p><i>&copy; Copyright <a href=
-    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2008.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2006.</i></p>
  </body>
 </html>
--- a/doc/v2/pickle.html
+++ b/doc/v2/pickle.html
@@ -1,93 +1,112 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN"
+"http://www.w3.org/TR/REC-html40/strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>Boost.Python Pickle Support</title>
-</head>
+<title>Boost.Python Pickle Support</title>

-<body>
-  <div>
-    <img src="../../../../boost.png" alt="boost.png (6897 bytes)" align=
-    "center" width="277" height="86" />
-    <hr />
+<div>

-    <h1>Boost.Python Pickle Support</h1>Pickle is a Python module for object
-    serialization, also known as persistence, marshalling, or flattening.
+<img src="../../../../boost.png"
+     alt="boost.png (6897 bytes)"
+     align="center"
+     width="277" height="86">

-    <p>It is often necessary to save and restore the contents of an object to
-    a file. One approach to this problem is to write a pair of functions that
-    read and write data from a file in a special format. A powerful
-    alternative approach is to use Python's pickle module. Exploiting
-    Python's ability for introspection, the pickle module recursively
-    converts nearly arbitrary Python objects into a stream of bytes that can
-    be written to a file.</p>
+<hr>
+<h1>Boost.Python Pickle Support</h1>

-    <p>The Boost Python Library supports the pickle module through the
-    interface as described in detail in the <a href=
-    "http://www.python.org/doc/current/lib/module-pickle.html">Python Library
-    Reference for pickle.</a> This interface involves the special methods
-    <tt>__getinitargs__</tt>, <tt>__getstate__</tt> and <tt>__setstate__</tt>
-    as described in the following. Note that Boost.Python is also fully
-    compatible with Python's cPickle module.</p>
-    <hr />
+Pickle is a Python module for object serialization, also known
+as persistence, marshalling, or flattening.

-    <h2>The Boost.Python Pickle Interface</h2>At the user level, the
-    Boost.Python pickle interface involves three special methods:
+<p>
+It is often necessary to save and restore the contents of an object to
+a file. One approach to this problem is to write a pair of functions
+that read and write data from a file in a special format. A powerful
+alternative approach is to use Python's pickle module. Exploiting
+Python's ability for introspection, the pickle module recursively
+converts nearly arbitrary Python objects into a stream of bytes that
+can be written to a file.

-    <dl>
-      <dt><strong><tt>__getinitargs__</tt></strong></dt>
+<p>
+The Boost Python Library supports the pickle module
+through the interface as described in detail in the
+<a href="http://www.python.org/doc/current/lib/module-pickle.html"
+>Python Library Reference for pickle.</a> This interface
+involves the special methods <tt>__getinitargs__</tt>,
+<tt>__getstate__</tt> and <tt>__setstate__</tt> as described
+in the following. Note that Boost.Python is also fully compatible
+with Python's cPickle module.

-      <dd>
-        When an instance of a Boost.Python extension class is pickled, the
-        pickler tests if the instance has a <tt>__getinitargs__</tt> method.
-        This method must return a Python tuple (it is most convenient to use
-        a boost::python::tuple). When the instance is restored by the
-        unpickler, the contents of this tuple are used as the arguments for
-        the class constructor.
+<hr>
+<h2>The Boost.Python Pickle Interface</h2>

-        <p>If <tt>__getinitargs__</tt> is not defined, <tt>pickle.load</tt>
-        will call the constructor (<tt>__init__</tt>) without arguments;
-        i.e., the object must be default-constructible.</p>
-      </dd>
+At the user level, the Boost.Python pickle interface involves three special
+methods:

-      <dt><strong><tt>__getstate__</tt></strong></dt>
+<dl>
+<dt>
+<strong><tt>__getinitargs__</tt></strong>
+<dd>
+  When an instance of a Boost.Python extension class is pickled, the
+  pickler tests if the instance has a <tt>__getinitargs__</tt> method.
+  This method must return a Python tuple (it is most convenient to use
+  a boost::python::tuple). When the instance is restored by the
+  unpickler, the contents of this tuple are used as the arguments for
+  the class constructor.

-      <dd>When an instance of a Boost.Python extension class is pickled, the
-      pickler tests if the instance has a <tt>__getstate__</tt> method. This
-      method should return a Python object representing the state of the
-      instance.</dd>
+  <p>
+  If <tt>__getinitargs__</tt> is not defined, <tt>pickle.load</tt>
+  will call the constructor (<tt>__init__</tt>) without arguments;
+  i.e., the object must be default-constructible.

-      <dt><strong><tt>__setstate__</tt></strong></dt>
+<p>
+<dt>
+<strong><tt>__getstate__</tt></strong>

-      <dd>When an instance of a Boost.Python extension class is restored by
-      the unpickler (<tt>pickle.load</tt>), it is first constructed using the
-      result of <tt>__getinitargs__</tt> as arguments (see above).
-      Subsequently the unpickler tests if the new instance has a
-      <tt>__setstate__</tt> method. If so, this method is called with the
-      result of <tt>__getstate__</tt> (a Python object) as the argument.</dd>
-    </dl>The three special methods described above may be <tt>.def()</tt>'ed
-    individually by the user. However, Boost.Python provides an easy to use
-    high-level interface via the
-    <strong><tt>boost::python::pickle_suite</tt></strong> class that also
-    enforces consistency: <tt>__getstate__</tt> and <tt>__setstate__</tt>
-    must be defined as pairs. Use of this interface is demonstrated by the
-    following examples.
-    <hr />
+<dd>
+  When an instance of a Boost.Python extension class is pickled, the
+  pickler tests if the instance has a <tt>__getstate__</tt> method.
+  This method should return a Python object representing the state of
+  the instance.

-    <h2>Examples</h2>There are three files in <tt>boost/libs/python/test</tt>
-    that show how to provide pickle support.
-    <hr />
+<p>
+<dt>
+<strong><tt>__setstate__</tt></strong>

-    <h3><a href="../../test/pickle1.cpp"><tt>pickle1.cpp</tt></a></h3>The C++
-    class in this example can be fully restored by passing the appropriate
-    argument to the constructor. Therefore it is sufficient to define the
-    pickle interface method <tt>__getinitargs__</tt>. This is done in the
-    following way:
+<dd>
+  When an instance of a Boost.Python extension class is restored by the
+  unpickler (<tt>pickle.load</tt>), it is first constructed using the
+  result of <tt>__getinitargs__</tt> as arguments (see above). Subsequently
+  the unpickler tests if the new instance has a <tt>__setstate__</tt>
+  method. If so, this method is called with the result of
+  <tt>__getstate__</tt> (a Python object) as the argument.

-    <ul>
-      <li>1. Definition of the C++ pickle function:
-        <pre>
+</dl>
+
+The three special methods described above may be <tt>.def()</tt>'ed
+individually by the user. However, Boost.Python provides an easy to use
+high-level interface via the
+<strong><tt>boost::python::pickle_suite</tt></strong> class that also
+enforces consistency: <tt>__getstate__</tt> and <tt>__setstate__</tt>
+must be defined as pairs. Use of this interface is demonstrated by the
+following examples.
+
+<hr>
+<h2>Examples</h2>
+
+There are three files in 
+<tt>boost/libs/python/test</tt> that show how to
+provide pickle support.
+
+<hr>
+<h3><a href="../../test/pickle1.cpp"><tt>pickle1.cpp</tt></a></h3>
+
+    The C++ class in this example can be fully restored by passing the
+    appropriate argument to the constructor. Therefore it is sufficient
+    to define the pickle interface method <tt>__getinitargs__</tt>.
+    This is done in the following way:
+
+<ul>
+<li>1. Definition of the C++ pickle function:
+<pre>
  struct world_pickle_suite : boost::python::pickle_suite
  {
    static
@@ -98,28 +117,26 @@
    }
  };
 </pre>
-      </li>
-
-      <li>2. Establishing the Python binding:
-        <pre>
+<li>2. Establishing the Python binding:
+<pre>
  class_&lt;world&gt;("world", args&lt;const std::string&amp;&gt;())
      // ...
      .def_pickle(world_pickle_suite())
      // ...
 </pre>
-      </li>
-    </ul>
-    <hr />
+</ul>

-    <h3><a href="../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a></h3>The C++
-    class in this example contains member data that cannot be restored by any
-    of the constructors. Therefore it is necessary to provide the
-    <tt>__getstate__</tt>/<tt>__setstate__</tt> pair of pickle interface
-    methods:
+<hr>
+<h3><a href="../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a></h3>

-    <ul>
-      <li>1. Definition of the C++ pickle functions:
-        <pre>
+    The C++ class in this example contains member data that cannot be
+    restored by any of the constructors. Therefore it is necessary to
+    provide the <tt>__getstate__</tt>/<tt>__setstate__</tt> pair of
+    pickle interface methods:
+
+<ul>
+<li>1. Definition of the C++ pickle functions:
+<pre>
  struct world_pickle_suite : boost::python::pickle_suite
  {
    static
@@ -144,76 +161,92 @@
    }
  };
 </pre>
-      </li>
-
-      <li>2. Establishing the Python bindings for the entire suite:
-        <pre>
+<li>2. Establishing the Python bindings for the entire suite:
+<pre>
  class_&lt;world&gt;("world", args&lt;const std::string&amp;&gt;())
      // ...
      .def_pickle(world_pickle_suite())
      // ...
 </pre>
-      </li>
-    </ul>
+</ul>

-    <p>For simplicity, the <tt>__dict__</tt> is not included in the result of
-    <tt>__getstate__</tt>. This is not generally recommended, but a valid
-    approach if it is anticipated that the object's <tt>__dict__</tt> will
-    always be empty. Note that the safety guard described below will catch
-    the cases where this assumption is violated.</p>
-    <hr />
+    <p>
+    For simplicity, the <tt>__dict__</tt> is not included in the result
+    of <tt>__getstate__</tt>. This is not generally recommended, but a
+    valid approach if it is anticipated that the object's
+    <tt>__dict__</tt> will always be empty. Note that the safety guard
+    described below will catch the cases where this assumption is violated.

-    <h3><a href="../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a></h3>This
-    example is similar to <a href=
-    "../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a>. However, the object's
-    <tt>__dict__</tt> is included in the result of <tt>__getstate__</tt>.
-    This requires a little more code but is unavoidable if the object's
-    <tt>__dict__</tt> is not always empty.
-    <hr />
+<hr>
+<h3><a href="../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a></h3>

-    <h2>Pitfall and Safety Guard</h2>The pickle protocol described above has
-    an important pitfall that the end user of a Boost.Python extension module
-    might not be aware of:
+    This example is similar to <a
+    href="../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a>. However, the
+    object's <tt>__dict__</tt> is included in the result of
+    <tt>__getstate__</tt>.  This requires a little more code but is
+    unavoidable if the object's <tt>__dict__</tt> is not always empty.

-    <p><strong><tt>__getstate__</tt> is defined and the instance's
-    <tt>__dict__</tt> is not empty.</strong></p>
+<hr>
+<h2>Pitfall and Safety Guard</h2>

-    <p>The author of a Boost.Python extension class might provide a
-    <tt>__getstate__</tt> method without considering the possibilities
-    that:</p>
+The pickle protocol described above has an important pitfall that the
+end user of a Boost.Python extension module might not be aware of:
+<p>
+<strong>
+<tt>__getstate__</tt> is defined and the instance's <tt>__dict__</tt>
+is not empty.
+</strong>
+<p>

-    <ul>
-      <li>his class is used in Python as a base class. Most likely the
-      <tt>__dict__</tt> of instances of the derived class needs to be pickled
-      in order to restore the instances correctly.</li>
+  The author of a Boost.Python extension class might provide a
+  <tt>__getstate__</tt> method without considering the possibilities
+  that:

-      <li>the user adds items to the instance's <tt>__dict__</tt> directly.
-      Again, the <tt>__dict__</tt> of the instance then needs to be
-      pickled.</li>
-    </ul>
+  <p>
+  <ul>
+  <li>
+    his class is used in Python as a base class. Most likely the
+    <tt>__dict__</tt> of instances of the derived class needs to be
+    pickled in order to restore the instances correctly.

-    <p>To alert the user to this highly unobvious problem, a safety guard is
-    provided. If <tt>__getstate__</tt> is defined and the instance's
-    <tt>__dict__</tt> is not empty, Boost.Python tests if the class has an
-    attribute <tt>__getstate_manages_dict__</tt>. An exception is raised if
-    this attribute is not defined:</p>
-    <pre>
+  <p>
+  <li>
+    the user adds items to the instance's <tt>__dict__</tt> directly.
+    Again, the <tt>__dict__</tt> of the instance then needs to be
+    pickled.
+
+  </ul>
+  <p>
+
+  To alert the user to this highly unobvious problem, a safety guard is
+  provided. If <tt>__getstate__</tt> is defined and the instance's
+  <tt>__dict__</tt> is not empty, Boost.Python tests if the class has
+  an attribute <tt>__getstate_manages_dict__</tt>. An exception is
+  raised if this attribute is not defined:
+
+<pre>
    RuntimeError: Incomplete pickle support (__getstate_manages_dict__ not set)
-</pre>To resolve this problem, it should first be established that the <tt>
-    __getstate__</tt> and <tt>__setstate__</tt> methods manage the
-    instances's <tt>__dict__</tt> correctly. Note that this can be done
-    either at the C++ or the Python level. Finally, the safety guard should
-    intentionally be overridden. E.g. in C++ (from <a href=
-    "../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a>):
-    <pre>
+</pre>
+
+  To resolve this problem, it should first be established that the
+  <tt>__getstate__</tt> and <tt>__setstate__</tt> methods manage the
+  instances's <tt>__dict__</tt> correctly. Note that this can be done
+  either at the C++ or the Python level. Finally, the safety guard
+  should intentionally be overridden. E.g. in C++ (from
+  <a href="../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a>):
+
+<pre>
  struct world_pickle_suite : boost::python::pickle_suite
  {
    // ...

    static bool getstate_manages_dict() { return true; }
  };
-</pre>Alternatively in Python:
-    <pre>
+</pre>
+
+  Alternatively in Python:
+
+<pre>
    import your_bpl_module
    class your_class(your_bpl_module.your_class):
      __getstate_manages_dict__ = 1
@@ -222,41 +255,54 @@
      def __setstate__(self, state):
        # your code here
 </pre>
-    <hr />

-    <h2>Practical Advice</h2>
+<hr>
+<h2>Practical Advice</h2>

-    <ul>
-      <li>In Boost.Python extension modules with many extension classes,
-      providing complete pickle support for all classes would be a
-      significant overhead. In general complete pickle support should only be
-      implemented for extension classes that will eventually be pickled.</li>
+<ul>
+<li>
+  In Boost.Python extension modules with many extension classes,
+  providing complete pickle support for all classes would be a
+  significant overhead. In general complete pickle support should
+  only be implemented for extension classes that will eventually
+  be pickled.

-      <li>Avoid using <tt>__getstate__</tt> if the instance can also be
-      reconstructed by way of <tt>__getinitargs__</tt>. This automatically
-      avoids the pitfall described above.</li>
+<p>
+<li>
+  Avoid using <tt>__getstate__</tt> if the instance can also be
+  reconstructed by way of <tt>__getinitargs__</tt>. This automatically
+  avoids the pitfall described above.

-      <li>If <tt>__getstate__</tt> is required, include the instance's
-      <tt>__dict__</tt> in the Python object that is returned.</li>
-    </ul>
-    <hr />
+<p>
+<li>
+  If <tt>__getstate__</tt> is required, include the instance's
+  <tt>__dict__</tt> in the Python object that is returned.

-    <h2>Light-weight alternative: pickle support implemented in Python</h2>
+</ul>

-    <h3><a href="../../test/pickle4.cpp"><tt>pickle4.cpp</tt></a></h3>The
-    <tt>pickle4.cpp</tt> example demonstrates an alternative technique for
-    implementing pickle support. First we direct Boost.Python via the
-    <tt>class_::enable_pickling()</tt> member function to define only the
-    basic attributes required for pickling:
-    <pre>
+<hr>
+<h2>Light-weight alternative: pickle support implemented in Python</h2>
+
+<h3><a href="../../test/pickle4.cpp"><tt>pickle4.cpp</tt></a></h3>
+
+The <tt>pickle4.cpp</tt> example demonstrates an alternative technique
+for implementing pickle support. First we direct Boost.Python via
+the <tt>class_::enable_pickling()</tt> member function to define only
+the basic attributes required for pickling:
+
+<pre>
  class_&lt;world&gt;("world", args&lt;const std::string&amp;&gt;())
      // ...
      .enable_pickling()
      // ...
-</pre>This enables the standard Python pickle interface as described in the
-Python documentation. By "injecting" a <tt>__getinitargs__</tt> method into
-the definition of the wrapped class we make all instances pickleable:
-    <pre>
+</pre>
+
+This enables the standard Python pickle interface as described
+in the Python documentation. By &quot;injecting&quot; a
+<tt>__getinitargs__</tt> method into the definition of the wrapped
+class we make all instances pickleable:
+
+<pre>
  # import the wrapped world class
  from pickle4_ext import world

@@ -266,15 +312,18 @@ the definition of the wrapped class we make all instances pickleable:

  # now inject __getinitargs__ (Python is a dynamic language!)
  world.__getinitargs__ = world_getinitargs
-</pre>See also the <a href=
-"../tutorial/doc/html/python/techniques.html#python.extending_wrapped_objects_in_python">
-    tutorial section</a> on injecting additional methods from Python.
-    <hr />
-    © Copyright Ralf W. Grosse-Kunstleve 2001-2004. Distributed under the
-    Boost Software License, Version 1.0. (See accompanying file
-    LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+</pre>

-    <p>Updated: Feb 2004.</p>
-  </div>
-</body>
-</html>
+See also the
+<a href="../tutorial/doc/html/python/techniques.html#python.extending_wrapped_objects_in_python"
+>tutorial section</a> on injecting additional methods from Python.
+
+<hr>
+
+&copy; Copyright Ralf W. Grosse-Kunstleve 2001-2004. Distributed under
+  the Boost Software License, Version 1.0. (See accompanying file
+  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+<p>
+Updated: Feb 2004.
+</div>
--- a/include/boost/python/iterator.hpp
+++ b/include/boost/python/iterator.hpp
@@ -14,16 +14,6 @@
 # include <boost/type_traits/cv_traits.hpp>
 # include <boost/type_traits/transform_traits.hpp>

-# if defined(BOOST_MSVC) && (BOOST_MSVC == 1400) /*
-> warning C4180: qualifier applied to function type has no meaning; ignored
-Peter Dimov wrote:
-This warning is caused by an overload resolution bug in VC8 that cannot be
-worked around and will probably not be fixed by MS in the VC8 line. The
-problematic overload is only instantiated and never called, and the code
-works correctly. */
-#  pragma warning(disable: 4180)
-# endif
-
 # include <boost/bind.hpp>
 # include <boost/bind/protect.hpp>

--- a/include/boost/python/object_attributes.hpp
+++ b/include/boost/python/object_attributes.hpp
@@ -17,7 +17,6 @@ struct const_attribute_policies
 {
    typedef char const* key_type;
    static object get(object const& target, char const* key);
-    static object get(object const& target, object const& key);
 };
  
 struct attribute_policies : const_attribute_policies
@@ -26,18 +25,6 @@ struct attribute_policies : const_attribute_policies
    static void del(object const&target, char const* key);
 };

-struct const_objattribute_policies
-{
-    typedef object const key_type;
-    static object get(object const& target, object const& key);
-};
-  
-struct objattribute_policies : const_objattribute_policies
-{
-    static object const& set(object const& target, object const& key, object const& value);
-    static void del(object const&target, object const& key);
-};
-
 //
 // implementation
 //
@@ -55,30 +42,11 @@ inline const_object_attribute object_operators<U>::attr(char const* name) const
    return const_object_attribute(x, name);
 }

-template <class U>
-inline object_objattribute object_operators<U>::attr(object const& name)
-{
-    object_cref2 x = *static_cast<U*>(this);
-    return object_objattribute(x, name);
-}
-
-template <class U>
-inline const_object_objattribute object_operators<U>::attr(object const& name) const
-{
-    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_objattribute(x, name);
-}
-
 inline object const_attribute_policies::get(object const& target, char const* key)
 {
    return python::getattr(target, key);
 }

-inline object const_objattribute_policies::get(object const& target, object const& key)
-{
-    return python::getattr(target, key);
-}
-
 inline object const& attribute_policies::set(
    object const& target
    , char const* key
@@ -88,15 +56,6 @@ inline object const& attribute_policies::set(
    return value;
 }

-inline object const& objattribute_policies::set(
-    object const& target
-    , object const& key
-    , object const& value)
-{
-    python::setattr(target, key, value);
-    return value;
-}
-
 inline void attribute_policies::del(
    object const& target
    , char const* key)
@@ -104,13 +63,6 @@ inline void attribute_policies::del(
    python::delattr(target, key);
 }

-inline void objattribute_policies::del(
-    object const& target
-    , object const& key)
-{
-    python::delattr(target, key);
-}
-
 }}} // namespace boost::python::api

 #endif // OBJECT_ATTRIBUTES_DWA2002615_HPP
--- a/include/boost/python/object_core.hpp
+++ b/include/boost/python/object_core.hpp
@@ -59,8 +59,6 @@ namespace api
  
  struct const_attribute_policies;
  struct attribute_policies;
-  struct const_objattribute_policies;
-  struct objattribute_policies;
  struct const_item_policies;
  struct item_policies;
  struct const_slice_policies;
@@ -69,8 +67,6 @@ namespace api

  typedef proxy<const_attribute_policies> const_object_attribute;
  typedef proxy<attribute_policies> object_attribute;
-  typedef proxy<const_objattribute_policies> const_object_objattribute;
-  typedef proxy<objattribute_policies> object_objattribute;
  typedef proxy<const_item_policies> const_object_item;
  typedef proxy<item_policies> object_item;
  typedef proxy<const_slice_policies> const_object_slice;
@@ -112,8 +108,6 @@ namespace api
      //
      const_object_attribute attr(char const*) const;
      object_attribute attr(char const*);
-      const_object_objattribute attr(object const&) const;
-      object_objattribute attr(object const&);

      // item access
      //
--- a/include/boost/python/ptr.hpp
+++ b/include/boost/python/ptr.hpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 // Based on boost/ref.hpp, thus:
-//  Copyright (C) 1999, 2000 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+//  Copyright (C) 1999, 2000 Jaakko Järvi (jaakko.jarvi@cs.utu.fi)
 //  Copyright (C) 2001 Peter Dimov

 # if _MSC_VER+0 >= 1020
--- a/include/boost/python/suite/indexing/container_utils.hpp
+++ b/include/boost/python/suite/indexing/container_utils.hpp
@@ -7,12 +7,9 @@
 #ifndef PY_CONTAINER_UTILS_JDG20038_HPP
 # define PY_CONTAINER_UTILS_JDG20038_HPP

-# include <utility>
-# include <boost/foreach.hpp>
 # include <boost/python/object.hpp>
 # include <boost/python/handle.hpp>
 # include <boost/python/extract.hpp>
-# include <boost/python/stl_iterator.hpp>

 namespace boost { namespace python { namespace container_utils {
        
@@ -22,13 +19,11 @@ namespace boost { namespace python { namespace container_utils {
    {
        typedef typename Container::value_type data_type;
        
-        //  l must be iterable
-        BOOST_FOREACH(object elem,
-            std::make_pair(
-              boost::python::stl_input_iterator<object>(l),
-              boost::python::stl_input_iterator<object>()
-              ))
+        //  l must be a list or some container
+
+        for (int i = 0; i < l.attr("__len__")(); i++)
        {
+            object elem(l[i]);
            extract<data_type const&> x(elem);
            //  try if elem is an exact data_type type
            if (x.check())
--- a/include/boost/python/type_id.hpp
+++ b/include/boost/python/type_id.hpp
@@ -11,7 +11,6 @@
 # include <boost/operators.hpp>
 # include <typeinfo>
 # include <cstring>
-# include <ostream>
 # include <boost/static_assert.hpp>
 # include <boost/detail/workaround.hpp>
 # include <boost/type_traits/same_traits.hpp>
--- a/include/boost/python/with_custodian_and_ward.hpp
+++ b/include/boost/python/with_custodian_and_ward.hpp
@@ -68,9 +68,8 @@ struct with_custodian_and_ward : BasePolicy_
    
        bool result = BasePolicy_::precall(args_);

-        if (!result) {
+        if (!result)
            Py_DECREF(life_support);
-        }
    
        return result;
    }
--- a/src/errors.cpp
+++ b/src/errors.cpp
@@ -41,10 +41,6 @@ BOOST_PYTHON_DECL bool handle_exception_impl(function0<void> f)
    {
        PyErr_SetString(PyExc_IndexError, x.what());
    }
-    catch(const std::invalid_argument& x)
-    {
-        PyErr_SetString(PyExc_ValueError, x.what());
-    }
    catch(const std::exception& x)
    {
        PyErr_SetString(PyExc_RuntimeError, x.what());
--- a/test/args.cpp
+++ b/test/args.cpp
@@ -14,7 +14,7 @@

 using namespace boost::python;

-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
 # define make_tuple boost::python::make_tuple
 #endif 

--- a/test/module_tail.cpp
+++ b/test/module_tail.cpp
@@ -13,7 +13,6 @@
 # endif

 # ifdef _MSC_VER
-#  include <eh.h> // for _set_se_translator()
 #  pragma warning(push)
 #  pragma warning(disable:4297)
 #  pragma warning(disable:4535)
--- a/test/numpy.cpp
+++ b/test/numpy.cpp
@@ -10,16 +10,19 @@
 #include <boost/python/str.hpp>

 using namespace boost::python;
-namespace py = boost::python;
+
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
+# define make_tuple boost::python::make_tuple
+#endif 

 // See if we can invoke array() from C++
 numeric::array new_array()
 {
    return numeric::array(
-        py::make_tuple(
-            py::make_tuple(1,2,3)
-          , py::make_tuple(4,5,6)
-          , py::make_tuple(7,8,9)
+        make_tuple(
+            make_tuple(1,2,3)
+          , make_tuple(4,5,6)
+          , make_tuple(7,8,9)
            )
        );
 }
@@ -48,7 +51,7 @@ namespace
      str format("exception type: %sn");                                 
      format += "exception value: %sn";                                  
      format += "traceback:n%s" ;                                        
-      object ret = format % py::make_tuple(ty, v, tr);
+      object ret = format % boost::python::make_tuple(ty, v, tr);
      return ret;
  }
 }
@@ -68,7 +71,7 @@ namespace
 // inherits that behavior from object.
 void exercise(numeric::array& y, object check)
 {
-    y[py::make_tuple(2,1)] = 3;
+    y[make_tuple(2,1)] = 3;
    CHECK(y);
    CHECK(y.astype('D'));
    CHECK(y.copy());
@@ -113,12 +116,12 @@ void exercise_numarray(numeric::array& y, object check)
    CHECK(y);
    CHECK(y.type());

-    CHECK(y.factory(py::make_tuple(1.2, 3.4)));
-    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8"));
-    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8", true));
-    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8", true, false));
-    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8", true, false, object()));
-    CHECK (y.factory(py::make_tuple(1.2, 3.4), "f8", true, false, object(), py::make_tuple(1,2,1)));
+    CHECK(y.factory(make_tuple(1.2, 3.4)));
+    CHECK(y.factory(make_tuple(1.2, 3.4), "f8"));
+    CHECK(y.factory(make_tuple(1.2, 3.4), "f8", true));
+    CHECK(y.factory(make_tuple(1.2, 3.4), "f8", true, false));
+    CHECK(y.factory(make_tuple(1.2, 3.4), "f8", true, false, object()));
+    CHECK (y.factory(make_tuple(1.2, 3.4), "f8", true, false, object(), make_tuple(1,2,1)));

 }

--- a/test/object.cpp
+++ b/test/object.cpp
@@ -38,61 +38,26 @@ object obj_getattr(object x, char const* name)
    return x.attr(name);
 }

-object obj_objgetattr(object x, object const& name)
-{
-    return x.attr(name);
-}
-
 object obj_const_getattr(object const& x, char const* name)
 {
    return x.attr(name);
 }

-object obj_const_objgetattr(object const& x, object const& name)
-{
-    return x.attr(name);
-}
-
 void obj_setattr(object x, char const* name, object value)
 {
    x.attr(name) = value;
 }

-void obj_objsetattr(object x, object const& name, object value)
-{
-    x.attr(name) = value;
-}
-
 void obj_setattr42(object x, char const* name)
 {
    x.attr(name) = 42;
 }

-void obj_objsetattr42(object x, object const& name)
-{
-    x.attr(name) = 42;
-}
-
 void obj_moveattr(object& x, char const* src, char const* dst)
 {
    x.attr(dst) = x.attr(src);
 }

-void obj_objmoveattr(object& x, object const& src, object const& dst)
-{
-    x.attr(dst) = x.attr(src);
-}
-
-void obj_delattr(object x, char const* name)
-{
-    x.attr(name).del();
-}
-
-void obj_objdelattr(object x, object const& name)
-{
-    x.attr(name).del();
-}
-
 object obj_getitem(object x, object key)
 {
    return x[key];
@@ -143,21 +108,11 @@ bool test_attr(object y, char* name)
    return y.attr(name);
 }

-bool test_objattr(object y, object& name)
-{
-    return y.attr(name);
-}
-
 bool test_not_attr(object y, char* name)
 {
    return !y.attr(name);
 }

-bool test_not_objattr(object y, object& name)
-{
-    return !y.attr(name);
-}
-
 bool test_item(object y, object key)
 {
    return y[key];
@@ -346,17 +301,11 @@ BOOST_PYTHON_MODULE(object_ext)
    def("number", number);

    def("obj_getattr", obj_getattr);
-    def("obj_objgetattr", obj_objgetattr);
    def("obj_const_getattr", obj_const_getattr);
-    def("obj_const_objgetattr", obj_const_objgetattr);
    def("obj_setattr", obj_setattr);
-    def("obj_objsetattr", obj_objsetattr);
    def("obj_setattr42", obj_setattr42);
-    def("obj_objsetattr42", obj_objsetattr42);
    def("obj_moveattr", obj_moveattr);
-    def("obj_objmoveattr", obj_objmoveattr);
-    def("obj_delattr", obj_delattr);
-    def("obj_objdelattr", obj_objdelattr);
+

    def("obj_getitem", obj_getitem);
    def("obj_getitem3", obj_getitem);
@@ -370,9 +319,7 @@ BOOST_PYTHON_MODULE(object_ext)
    def("test_not", test_not);

    def("test_attr", test_attr);
-    def("test_objattr", test_objattr);
    def("test_not_attr", test_not_attr);
-    def("test_not_objattr", test_not_objattr);

    def("test_item", test_item);
    def("test_not_item", test_not_item);
--- a/test/object.py
+++ b/test/object.py
@@ -34,68 +34,29 @@
 >>> try: obj_getattr(x, 'foo')
 ... except AttributeError: pass
 ... else: print 'expected an exception'
->>> try: obj_objgetattr(x, 'objfoo')
-... except AttributeError: pass
-... else: print 'expected an exception'

 >>> obj_setattr(x, 'foo', 1)
 >>> x.foo
 1
->>> obj_objsetattr(x, 'objfoo', 1)
->>> try:obj_objsetattr(x, 1)
-... except TypeError: pass
-... else: print 'expected an exception'
->>> x.objfoo
-1
 >>> obj_getattr(x, 'foo')
 1
->>> obj_objgetattr(x, 'objfoo')
-1
->>> try:obj_objgetattr(x, 1)
-... except TypeError: pass
-... else: print 'expected an exception'
 >>> obj_const_getattr(x, 'foo')
 1
->>> obj_const_objgetattr(x, 'objfoo')
-1
 >>> obj_setattr42(x, 'foo')
 >>> x.foo
 42
->>> obj_objsetattr42(x, 'objfoo')
->>> x.objfoo
-42
 >>> obj_moveattr(x, 'foo', 'bar')
 >>> x.bar
 42
->>> obj_objmoveattr(x, 'objfoo', 'objbar')
->>> x.objbar
-42
 >>> test_attr(x, 'foo')
 1
->>> test_objattr(x, 'objfoo')
-1
 >>> test_not_attr(x, 'foo')
 0
->>> test_not_objattr(x, 'objfoo')
-0
 >>> x.foo = None
 >>> test_attr(x, 'foo')
 0
->>> x.objfoo = None
->>> test_objattr(x, 'objfoo')
-0
 >>> test_not_attr(x, 'foo')
 1
->>> test_not_objattr(x, 'objfoo')
-1
->>> obj_delattr(x, 'foo')
->>> obj_objdelattr(x, 'objfoo')
->>> try:obj_delattr(x, 'foo')
-... except AttributeError: pass
-... else: print 'expected an exception'
->>> try:obj_objdelattr(x, 'objfoo')
-... except AttributeError: pass
-... else: print 'expected an exception'

        Items

--- a/test/pickle3.cpp
+++ b/test/pickle3.cpp
@@ -25,7 +25,7 @@
 #include <boost/python/extract.hpp>
 #include <boost/python/back_reference.hpp>

-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
 # define make_tuple boost::python::make_tuple
 #endif 

--- a/test/slice.cpp
+++ b/test/slice.cpp
@@ -10,7 +10,7 @@

 using namespace boost::python;

-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
 # define make_tuple boost::python::make_tuple
 #endif 

--- a/test/vector_indexing_suite.py
+++ b/test/vector_indexing_suite.py
@@ -321,19 +321,6 @@ e
 >>> print_xvec(v)
 [ a b c d e f g h i j ]

-#####################################################################
-# extend using a generator expression
-#####################################################################
->>> v[:] = ['a','b','c','d','e'] # reset again
->>> def generator():
-...   addlist = ['f','g','h','i','j']
-...   for i in addlist:
-...     if i != 'g':
-...       yield i
->>> v.extend(generator())
->>> print_xvec(v)
-[ a b c d e f h i j ]
-
 #####################################################################
 # vector of strings
 #####################################################################