Release 1.52.0

[SVN r81201]

doc/projects.html

@@ -396,33 +396,27 @@
       </blockquote>
     </dd>
 
-    <dt><b><a href="http://pyrap.googlecode.com/">Pyrap</a></b></dt>
-    <dd>
-      <p><a href="diepen@astron.nl"
-        >Ger van Diepen</a> writes:</p>
-
-      <blockquote>
-        <p>Pyrap is the python interface to the Radio-Astronomical Package
-        casacore (<a href="http://casacore.googlecode.com/"
-        >casacore.googlecode.com</a>). Astronomers love pyrap because
-        it makes it easily possible to get their data (observed with
-        radio-astronomical telescopes like LOFAR, ASKAP, and eVLA) in numpy
-        arrays and do basic data inspection and manipulation using the many
-        python packages that are available.</p>
-
-        <p>Boost.Python made it quite easily possible to create converters for
-        the various data types, also for numpy arrays and individual elements
-        of a numpy array. It's nice they work fully recursively. Mapping C++
-        functions to Python was straightforward.</p>
-      </blockquote>
-    </dd>
-
-    <dt><b><a href="http://www.rdkit.org/"
-           >RDKit: Cheminformatics and Machine Learning Software</a></b></dt>
+    <dt><b><a href="http://www.rationaldiscovery.com">Rational Discovery
+    LLC</a></b></dt>
 
     <dd>
-      A collection of cheminformatics and machine-learning software
-      written in C++ and Python.
+      Rational Discovery provides computational modeling, combinatorial
+      library design and custom software development services to the
+      pharmaceutical, biotech and chemical industries. We do a substantial
+      amount of internal research to develop new approaches for applying
+      machine-learning techniques to solve chemical problems. Because we're a
+      small organization and chemistry is a large and complex field, it is
+      essential that we be able to quickly and easily prototype and test new
+      algorithms.
+
+      <p>For our internal software, we implement core data structures in C
+      and expose them to Python using Boost.Python. Algorithm development is
+      done in Python and then translated to C if required (often it's not).
+      This hybrid development approach not only greatly increases our
+      productivity, but it also allows "non-developers" (people without C
+      experience) to take part in method development. Learning C is a
+      daunting task, but "Python fits your brain." (Thanks to Bruce Eckel for
+      the quote.)</p>
     </dd>
   </dl>
 

example/Jamroot

@@ -11,10 +11,7 @@ use-project boost
 # boost_python library from the project whose global ID is
 # /boost/python.
 project
-  : requirements <library>/boost/python//boost_python 
-                 <implicit-dependency>/boost//headers 
-  : usage-requirements <implicit-dependency>/boost//headers 
-  ;
+  : requirements <library>/boost/python//boost_python ;
 
 # Declare the three extension modules.  You can specify multiple
 # source files after the colon separated by spaces.

example/quickstart/Jamroot

@@ -12,8 +12,6 @@ use-project boost
 # /boost/python.
 project boost-python-quickstart
   : requirements <library>/boost/python//boost_python 
-    		 <implicit-dependency>/boost//headers 
-  : usage-requirements <implicit-dependency>/boost//headers 	 
     ;
 
 # Make the definition of the python-extension rule available

example/tutorial/Jamroot

@@ -20,10 +20,7 @@ use-project boost
 # boost_python library from the project whose global ID is
 # /boost/python.
 project
-  : requirements <library>/boost/python//boost_python 
-                 <implicit-dependency>/boost//headers 
-  : usage-requirements <implicit-dependency>/boost//headers 
-  ;
+  : requirements <library>/boost/python//boost_python ;
 
 # Declare the three extension modules.  You can specify multiple
 # source files after the colon separated by spaces.

include/boost/python/exception_translator.hpp

@@ -8,7 +8,6 @@
 # include <boost/python/detail/prefix.hpp>
 
 # include <boost/bind.hpp>
-# include <boost/bind/placeholders.hpp>
 # include <boost/type.hpp>
 # include <boost/python/detail/translate_exception.hpp>
 # include <boost/python/detail/exception_handler.hpp>

meta/libraries.json

@@ -1,15 +0,0 @@
-{
-    "key": "python",
-    "name": "Python",
-    "authors": [
-        "Dave Abrahams"
-    ],
-    "description": "The Boost Python Library is a framework for interfacing Python and C++. It allows you to quickly and seamlessly expose C++ classes functions and objects to Python, and vice-versa, using no special tools -- just your C++ compiler.",
-    "category": [
-        "Inter-language"
-    ],
-    "maintainers": [
-        "Ralf Grosse-Kunstleve <rwgrosse-kunstleve -at- lbl.gov>",
-        "Ravi Rajagopal <lists_ravi -at- lavabit.com>"
-    ]
-}

src/converter/builtin_converters.cpp

@@ -377,8 +377,7 @@ namespace
       static unaryfunc* get_slot(PyObject* obj)
       {
 #if PY_VERSION_HEX >= 0x03000000
-          return (PyUnicode_Check(obj)) ? &py_unicode_as_string_unaryfunc : 
-                  PyBytes_Check(obj) ? &py_object_identity : 0;
+          return (PyUnicode_Check(obj)) ? &py_unicode_as_string_unaryfunc : 0;
 #else
           return (PyString_Check(obj)) ? &obj->ob_type->tp_str : 0;
 

src/exec.cpp

@@ -84,24 +84,22 @@ object BOOST_PYTHON_DECL exec_file(str filename, object global, object local)
   if (local.is_none()) local = global;
   // should be 'char const *' but older python versions don't use 'const' yet.
   char *f = python::extract<char *>(filename);
-
-  // Let python open the file to avoid potential binary incompatibilities.
 #if PY_VERSION_HEX >= 0x03000000
-  // See http://www.codeproject.com/Articles/820116/Embedding-Python-program-in-a-C-Cplusplus-code
-  FILE *fs = _Py_fopen(f, "r");
+  // TODO(bhy) temporary workaround for Python 3.
+  // should figure out a way to avoid binary incompatibilities as the Python 2
+  // version did.
+  FILE *fs = fopen(f, "r");
 #else
+  // Let python open the file to avoid potential binary incompatibilities.
   PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
   if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
   python::handle<> file(pyfile);
   FILE *fs = PyFile_AsFile(file.get());
 #endif
-
-  int closeit = 1;  // Close file before PyRun returns
-  PyObject* result = PyRun_FileEx(fs,
+  PyObject* result = PyRun_File(fs,
                 f,
                 Py_file_input,
-                global.ptr(), local.ptr(),
-                closeit);
+                global.ptr(), local.ptr());
   if (!result) throw_error_already_set();
   return object(detail::new_reference(result));
 }