Merge branch 'develop'

PyLong_Type raises an exception if the argument is not convertible to
long, therefore, this has to be handled as new_reference and not
new_non_null_reference, otherwise a segfault will occur.

.appveyor.yml

@@ -4,7 +4,6 @@ environment:
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
     # See: http://stackoverflow.com/a/13751649/163740
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\run_with_env.cmd"
-    BOOST_PREFIX: C:\Libraries\boost_1_66_0
 
   matrix:
 
@@ -12,24 +11,28 @@ environment:
     # a later point release.
     # See: http://www.appveyor.com/docs/installed-software#python
 
-    - PYTHON: "C:\\Python27"
+    - PYTHON: C:\\Python36-x64
-      PYTHON_VERSION: "2.7.x" # currently 2.7.9
+      PYTHON_VERSION: 3.6.x
-      PYTHON_ARCH: "32"
+      PYTHON_ARCH: 64
-      MSVC: "14.0"
+      MSVC: 12.0
-      ARCH: x86
-
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.x"
-      PYTHON_ARCH: "64"
-      MSVC: "12.0"
       ARCH: x86_64
+      BOOST_PREFIX: C:\Libraries\boost_1_66_0
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      PYTHON: "C:\\Python36-x64"
+      PYTHON: C:\\Python36-x64
-      PYTHON_VERSION: "3.6.x"
+      PYTHON_VERSION: 3.6.x
-      PYTHON_ARCH: "64"
+      PYTHON_ARCH: 64
-      MSVC: "14.13.26128"
+      MSVC: 15.9.19
       ARCH: x86_64
+      BOOST_PREFIX: C:\Libraries\boost_1_69_0
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      PYTHON: C:\\Python36-x64
+      PYTHON_VERSION: 3.6.x
+      PYTHON_ARCH: 64
+      MSVC: 16.7.4
+      ARCH: x86_64
+      BOOST_PREFIX: C:\Libraries\boost_1_73_0
 
 install:
   # If there is a newer build queued for the same PR, cancel this one.
@@ -64,28 +67,33 @@ install:
 
   # Upgrade to the latest version of pip to avoid it displaying warnings
   # about it being out of date.
-  - "pip install --disable-pip-version-check --user --upgrade pip"
+  - "python -m pip install --disable-pip-version-check --user --upgrade pip"
 
   # Install the build dependencies of the project. If some dependencies contain
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
-  - |
+
-     curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/snapshot/2018-04-08.tar.gz
+  - curl -LfsS -o vswhere.exe https://github.com/Microsoft/vswhere/releases/download/2.8.4/vswhere.exe
-     tar xf faber.tar.gz
+  #- |
-     CD faber-snapshot-2018-04-08
+  #   curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/snapshot/2020-08-01.tar.gz
-     python setup.py install
+  #   tar xf faber.tar.gz
-     CD ..
+  #   CD faber-snapshot-2020-08-01
+  #   python setup.py install
+  #   CD ..
+  - python -m pip install faber
   # report the available MSVC compilers
-  - faber --info=tools cxx
+  - faber --log=tools --info=tools cxx
   - easy_install sphinx
-  - pip install numpy
+  - python -m pip install numpy
+  - set FARGS=--log=summary --log=output --log=actions --log=commands --with-boost-include=%BOOST_PREFIX% target.arch=%ARCH% cxx.name=msvc cxx.version=%MSVC%
 
 build_script:
-  - faber --with-boost-include=%BOOST_PREFIX% target.arch=%ARCH% msvc.version=%MSVC%
+  - faber %FARGS% config || type config.log
+  - faber %FARGS% -j8
 
 test_script:
-  - faber --with-boost-include=%BOOST_PREFIX% test.report target.arch=%ARCH% msvc.version=%MSVC%
+  - faber %FARGS% -j8 test.report
 
 after_test:
   # If tests are successful, create binary packages for the project.

.travis.yml

@@ -6,8 +6,7 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-sudo: required
+dist: bionic
-dist: trusty
 
 language: cpp
 
@@ -15,7 +14,7 @@ env:
   global:
     - secure: BRNUkxN3p8f+uYKWC3Hr0VPqZA0PxbWr1DJlcI4hbiZtzKhMCWjDmd9UW9CzzexqeOxpd+9s0G87qvOur+wMSVxugDxtTesZrh1czXHeSVxgQrYD783XJtQJ9aYypbChkiboRD6Xpmbq7itwMuHBJMFtCuDxMynpU1jWwkyTf2Y=
 
-matrix:
+jobs:
   include:
     - os: linux
       env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++98
@@ -29,20 +28,27 @@ matrix:
       env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98
     - os: linux
       env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11
+    - os: linux
+      env: CXX=g++ PYTHON=pypy3 CXXFLAGS=-std=c++11
     - os: osx
       env: CXX=clang++ PYTHON=python CXXFLAGS=-std=c++11
     - env: PYTHON=python DOC=1
   allow_failures:
+    - os: linux
+      env: CXX=g++ PYTHON=pypy3 CXXFLAGS=-std=c++11
     - os: osx
 
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
+    - pypy
     packages:
-    - gcc-4.8
+    - gcc
-    - g++-4.8
+    - g++
     - clang
+    - pypy3-dev
+    - python3-pip
     - python-numpy
     - python-sphinx
     - python3-dev
@@ -57,12 +63,6 @@ cache:
   directories:
   - $HOME/Boost
 
-before_install:
-  # The Trusty image has several Python versions pre-installed compiled with
-  # conflicting UCS2 and UCS4 unicode. Modify the PATH to skip the TravisCI python.
-  # See https://github.com/travis-ci/travis-ci/issues/4948 for details.
-  - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
-
 install:
   # Install our own version of Boost (the subset we need) as the system version is
   # too old (for C++11 support).
@@ -83,15 +83,14 @@ install:
        echo "using cached Boost prerequisites."
      fi
      # Install Faber, the build tool.
-     date=2018-04-08
+     python3 -m pip install setuptools
-     wget https://github.com/stefanseefeld/faber/archive/snapshot/$date.tar.gz
+     python3 -m pip install faber
-     tar xf $date.tar.gz
+     #date=2020-08-01
-     pushd faber-snapshot-$date
+     #wget https://github.com/stefanseefeld/faber/archive/snapshot/$date.tar.gz
-     #wget https://github.com/stefanseefeld/faber/archive/release/0.2.tar.gz
+     #tar xf $date.tar.gz
-     #tar xf 0.2.tar.gz
+     #pushd faber-snapshot-$date
-     #pushd faber-release-0.2
+     #sudo python3 setup.py install
-     sudo python setup.py install
+     #popd
-     popd
 
 before_script:
 - sed -e "s/\$PYTHON/$PYTHON/g" .ci/faber > ~/.faber
@@ -104,7 +103,7 @@ script:
    if [ "$DOC" ]; then
      BOOST_ROOT=$HOME/Boost faber --builddir=build doc.html
    else
-     faber --with-boost-include=$HOME/Boost --builddir=build test.report cxx.name=$CXX cxxflags=$CXXFLAGS
+     faber --with-boost-include=$HOME/Boost --builddir=build test.report cxx.name=$CXX cxxflags=$CXXFLAGS -j8
    fi
 
 after_success:

Jamfile

@@ -1,68 +0,0 @@
-# Copyright (c) 2018 Stefan Seefeld
-# All rights reserved.
-#
-# 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)
-
-import option ;
-import regex ;
-import python ;
-
-#
-# The `version-suffix` rule really belongs into python.jam, and
-# should be moved there. `split-version` is only duplicated here
-# as a prerequisite. (See https://github.com/boostorg/build/pull/290)
-#
-
-
-# Validate the version string and extract the major/minor part we care about.
-#
-local rule split-version ( version )
-{
-    local major-minor = [ MATCH "^([0-9]+)\.([0-9]+)(.*)$" : $(version) : 1 2 3 ] ;
-    if ! $(major-minor[2]) || $(major-minor[3])
-    {
-        ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ;
-
-        # Add a zero to account for the missing digit if necessary.
-        major-minor += 0 ;
-    }
-
-    return $(major-minor[1]) $(major-minor[2]) ;
-}
-
-# Define a version suffix for libraries depending on Python.
-# For example, Boost.Python built for Python 2.7 uses the suffix "27"
-rule version-suffix ( version )
-{
-    local major-minor = [ split-version $(version) ] ;
-    local suffix = $(major-minor:J="") ;
-    return $(suffix) ;
-}
-
-
-# Python build id (for Python libraries only).
-python-id = [ option.get "python-buildid" ] ;
-if $(python-id)
-{
-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
-}
-
-rule python-tag ( name : type ? : property-set )
-{
-    local result = $(name) ;
-    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
-    {
-        local version = [ $(property-set).get <python> ] ;
-        local lib-suffix = [ version-suffix $(version) ] ;
-        result = $(result)$(lib-suffix) ;
-    }
-    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID)
-    {
-        result = $(result)-$(PYTHON_ID) ;
-    }
-
-    # forward to the boost tagging rule
-    return  [ tag $(result) : $(type) : $(property-set) ] ;
-}

build/Jamfile

@@ -93,7 +93,7 @@ lib boost_python
         <dependency>config-warning
         <python-debugging>on:<define>BOOST_DEBUG_PYTHON
         -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-        <tag>@$(__name__).python-tag
+        <tag>@python-tag
         <conditional>@python.require-py
 
     :   # default build
@@ -121,7 +121,7 @@ lib boost_numpy
         <library>boost_python
         <python-debugging>on:<define>BOOST_DEBUG_PYTHON
         -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-        <tag>@$(__name__).python-tag
+        <tag>@python-tag
         <conditional>@python.require-py
 
     :   # default build

fabscript

@@ -75,8 +75,8 @@ checks = [cxx_checks.has_cxx11(features, define('HAS_CXX11')),
           has_numpy(features)]
 config = report('config', checks)
 
-src = module('src', features=config.use)
+src = module('src', features=features|config.use)
-test = module('test', features=config.use)
+test = module('test', features=features|config.use)
-doc = module('doc', features=config.use)
+doc = module('doc', features=features|config.use)
 
 default = src.default

include/boost/python/call.hpp

@@ -60,7 +60,7 @@ call(PyObject* callable
     )
 {
     PyObject* const result = 
-        PyEval_CallFunction(
+        PyObject_CallFunction(
             callable
             , const_cast<char*>("(" BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FIXED, "O") ")")
             BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET, nil)
@@ -69,7 +69,7 @@ call(PyObject* callable
     // This conversion *must not* be done in the same expression as
     // the call, because, in the special case where the result is a
     // reference a Python object which was created by converting a C++
-    // argument for passing to PyEval_CallFunction, its reference
+    // argument for passing to PyObject_CallFunction, its reference
     // count will be 2 until the end of the full expression containing
     // the conversion, and that interferes with dangling
     // pointer/reference detection.

include/boost/python/call_method.hpp

@@ -69,7 +69,7 @@ call_method(PyObject* self, char const* name
     // This conversion *must not* be done in the same expression as
     // the call, because, in the special case where the result is a
     // reference a Python object which was created by converting a C++
-    // argument for passing to PyEval_CallFunction, its reference
+    // argument for passing to PyObject_CallFunction, its reference
     // count will be 2 until the end of the full expression containing
     // the conversion, and that interferes with dangling
     // pointer/reference detection.

include/boost/python/def_visitor.hpp

@@ -16,7 +16,7 @@ template <class T, class X1, class X2, class X3> class class_;
 class def_visitor_access
 {
 # if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+    || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
     // Tasteless as this may seem, making all members public allows member templates
     // to work in the absence of member template friends.
  public:
@@ -52,7 +52,7 @@ class def_visitor
     friend class def_visitor_access;
     
 # if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+    || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
     // Tasteless as this may seem, making all members public allows member templates
     // to work in the absence of member template friends.
  public:

include/boost/python/detail/caller.hpp

@@ -124,7 +124,7 @@ template<class Policies, class Sig> const signature_element* get_ret()
     };
 
     return &ret;
-};
+}
 
 #endif
 

include/boost/python/detail/wrap_python.hpp

@@ -146,7 +146,7 @@ typedef int pid_t;
 
 #  undef hypot // undo the evil #define left by Python.
 
-# elif defined(__BORLANDC__)
+# elif defined(__BORLANDC__) && !defined(__clang__)
 #  undef HAVE_HYPOT
 #  define HAVE_HYPOT 1
 # endif

include/boost/python/long.hpp

@@ -24,8 +24,8 @@ namespace detail
       BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(long_base, object)
           
    private:
-      static detail::new_non_null_reference call(object const&);
+      static detail::new_reference call(object const&);
-      static detail::new_non_null_reference call(object const&, object const&);
+      static detail::new_reference call(object const&, object const&);
   };
 }
 

include/boost/python/object/iterator.hpp

@@ -25,7 +25,7 @@
 
 # include <boost/type.hpp>
 
-# include <boost/detail/iterator.hpp>
+# include <iterator>
 
 namespace boost { namespace python { namespace objects {
 
@@ -42,7 +42,7 @@ struct iterator_range
 {
     iterator_range(object sequence, Iterator start, Iterator finish);
 
-    typedef boost::detail::iterator_traits<Iterator> traits_t;
+    typedef std::iterator_traits<Iterator> traits_t;
 
     struct next
     {

include/boost/python/override.hpp

@@ -97,7 +97,7 @@ class override : public object
     operator()() const
     {
         detail::method_result x(
-            PyEval_CallFunction(
+            PyObject_CallFunction(
                 this->ptr()
               , const_cast<char*>("()")
             ));
@@ -132,7 +132,7 @@ detail::method_result
 operator()( BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, const& a) ) const
 {
     detail::method_result x(
-        PyEval_CallFunction(
+        PyObject_CallFunction(
             this->ptr()
           , const_cast<char*>("(" BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FIXED, "O") ")")
             BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_fast_arg_to_python_get, nil)

src/exec.cpp

@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
   if (local.is_none()) local = global;
   // should be 'char const *' but older python versions don't use 'const' yet.
   char *f = const_cast<char *>(filename);
-  // Let python open the file to avoid potential binary incompatibilities.
+#if PY_VERSION_HEX >= 0x03010000
-#if PY_VERSION_HEX >= 0x03040000
+  // Let python manage any UTF bits to avoid potential incompatibilities.
-  FILE *fs = _Py_fopen(f, "r");
-#elif PY_VERSION_HEX >= 0x03000000
   PyObject *fo = Py_BuildValue("s", f);
-  FILE *fs = _Py_fopen(fo, "r");
+  PyObject *fb = Py_None;
+  PyUnicode_FSConverter(fo, &fb);
+  f = PyBytes_AsString(fb);
+  FILE *fs = fopen(f, "r");
+  Py_DECREF(fo);
+  Py_DECREF(fb);
+#elif PY_VERSION_HEX >= 0x03000000
+  // Let python open the file to avoid potential binary incompatibilities.
+  PyObject *fo = Py_BuildValue("s", f);
+  FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
   Py_DECREF(fo);
 #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);

src/long.cpp

@@ -6,16 +6,16 @@
 
 namespace boost { namespace python { namespace detail {
 
-new_non_null_reference long_base::call(object const& arg_)
+new_reference long_base::call(object const& arg_)
 {
-    return (detail::new_non_null_reference)PyObject_CallFunction(
+    return (detail::new_reference)PyObject_CallFunction(
         (PyObject*)&PyLong_Type, const_cast<char*>("(O)"), 
         arg_.ptr());
 }
 
-new_non_null_reference long_base::call(object const& arg_, object const& base)
+new_reference long_base::call(object const& arg_, object const& base)
 {
-    return (detail::new_non_null_reference)PyObject_CallFunction(
+    return (detail::new_reference)PyObject_CallFunction(
         (PyObject*)&PyLong_Type, const_cast<char*>("(OO)"), 
         arg_.ptr(), base.ptr());
 }

src/wrapper.cpp

@@ -25,7 +25,7 @@ namespace detail
             
               if (
                   PyMethod_Check(m.get())
-                  && ((PyMethodObject*)m.get())->im_self == this->m_self
+                  && PyMethod_GET_SELF(m.get()) == this->m_self
                   && class_object->tp_dict != 0
               )
               {
@@ -34,7 +34,7 @@ namespace detail
 
 
               }
-              if (borrowed_f != ((PyMethodObject*)m.get())->im_func)
+              if (borrowed_f != PyMethod_GET_FUNCTION(m.get()))
                   return override(m);
           }
       }

test/args.py

@@ -1,12 +1,16 @@
 # Copyright David Abrahams 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)
-from __future__ import print_function
 """
 >>> from args_ext import *
 
->>> raw(3, 4, foo = 'bar', baz = 42)
+>>> args, kwargs = raw(3, 4, foo = 'bar', baz = 42)
-((3, 4), {'foo': 'bar', 'baz': 42})
+>>> args
+(3, 4)
+>>> kwargs['foo']
+'bar'
+>>> kwargs['baz']
+42
 
    Prove that we can handle empty keywords and non-keywords
 
@@ -123,10 +127,16 @@ from __future__ import print_function
 1
 
 >>> y = Y(value = 33)
->>> y.raw(this = 1, that = 'the other')[1]
+>>> _, kwargs = y.raw(this = 1, that = 'the other')
-{'this': 1, 'that': 'the other'}
+>>> kwargs['this']
+1
+>>> kwargs['that']
+'the other'
 
 """
+
+from __future__ import print_function
+
 def run(args = None):
     import sys
     import doctest
@@ -143,6 +153,3 @@ if __name__ == '__main__':
     import args_ext
     help(args_ext)
     sys.exit(status)
-
-
-

test/dict.cpp

@@ -21,11 +21,13 @@ object new_dict()
 object data_dict()
 {
     dict tmp1;
-    tmp1["key1"] = "value1";
 
     dict tmp2;
     tmp2["key2"] = "value2";
     tmp1[1] = tmp2;
+
+    tmp1["key1"] = "value1";
+
     return tmp1;
 }
 
@@ -62,18 +64,16 @@ void test_templates(object print)
     std::string key = "key";
 
     dict tmp;
-    tmp[1] = "a test string";
-    print(tmp.get(1));
-    //print(tmp[1]);
     tmp[1.5] = 13;
     print(tmp.get(1.5));
+    tmp[1] = "a test string";
+    print(tmp.get(1));
     print(tmp.get(44));
     print(tmp);
     print(tmp.get(2,"default"));
     print(tmp.setdefault(3,"default"));
 
     BOOST_ASSERT(!tmp.has_key(key));
-    //print(tmp[3]);
 }
 
 BOOST_PYTHON_MODULE(dict_ext)

test/dict.py

@@ -1,7 +1,6 @@
 # Copyright David Abrahams 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)
-from __future__ import print_function
 """
 >>> from dict_ext import *
 >>> def printer(*args):
@@ -22,14 +21,16 @@ from __future__ import print_function
 >>> print(dict_from_sequence([(1,1),(2,2),(3,3)]))
 {1: 1, 2: 2, 3: 3}
 >>> test_templates(printer) #doctest: +NORMALIZE_WHITESPACE
-a test string
 13
+a test string
 None
 {1.5: 13, 1: 'a test string'}
 default
 default
 """
 
+from __future__ import print_function
+
 def run(args = None):
     import sys
     import doctest

test/fabscript

@@ -21,14 +21,14 @@ src = module('..src')
 python_libs=python.instance().libs
 features |= runpath(src.bpl.path, base='')
 
-def extension_test(name, ext=[], script=None, np=False,
+def extension_test(name, exts=[], script=None, numpy=False,
                    features=features, condition=None):
     """Create a Python extension test `name`.
     Arguments:
       * name: the name of the test.
-      * ext: extensions to be compiled, <name> if none are given.
+      * exts: extensions to be compiled, <name> if none are given.
       * script: the test script to execute, <name>.py if none is given.
-      * np: if true, add boost_numpy to sources
+      * numpy: if true, add boost_numpy to sources
       * features: pre-defined features
       * condition: any condition under which to run the test
     Return:
@@ -36,17 +36,17 @@ def extension_test(name, ext=[], script=None, np=False,
 
     features=features.copy()
     extensions = []
-    libs = [src.bnl, src.bpl] if np else [src.bpl]
+    libs = [src.bnl, src.bpl] if numpy else [src.bpl]
-    for e in ext or [name]:
+    for ext in exts or [name]:
-        if type(e) is str:  # build from a single source file
+        if type(ext) is str:  # build from a single source file
-            n = e if e != name else e + '_ext'
+            ext_name = ext if ext != name else ext + '_ext'
-            s = [e + '.cpp']
+            sources = [ext + '.cpp']
         else:  # build from a list of source files
-            n = e[0] if e[0] != name else e[0] + '_ext'
+            ext_name = ext[0] if ext[0] != name else ext[0] + '_ext'
-            s = [n + '.cpp' for n in e]
+            sources = [source + '.cpp' for source in ext]
-        e = extension(n, s + libs, features=features)
+        ext = extension(ext_name, sources + libs, features=features)
-        features |= pythonpath(e.path, base='')
+        features |= pythonpath(ext.path, base='')
-        extensions.append(e)
+        extensions.append(ext)
     if not script:
         script = name+'.py'
     return test(name, script, run=python.run, dependencies=extensions,
@@ -123,9 +123,9 @@ tests.append(extension_test('auto_ptr',
 import_ = binary('import_', ['import_.cpp', src.bpl], features=features|python_libs)
 if platform.os == 'Windows':
     command = """set PATH=$(runpath);%PATH%
-$(>[1]) $(>[2])"""
+$(>[0]) $(>[1])"""
 else:
-    command = 'LD_LIBRARY_PATH=$(runpath) $(>[1]) $(>[2])'
+    command = 'LD_LIBRARY_PATH=$(runpath) $(>[0]) $(>[1])'
 
 tests.append(test('import', [import_, 'import_.py'],
                   run=action('run', command),
@@ -167,7 +167,7 @@ for t in ['numpy/dtype',
           'numpy/ndarray',
           'numpy/indexing',
           'numpy/shapes']:
-    tests.append(extension_test(t, np=True,
+    tests.append(extension_test(t, numpy=True,
                                 condition=set.define.contains('HAS_NUMPY')))
 
 default = report('report', tests, fail_on_failures=True)

test/iterator.py

@@ -1,7 +1,6 @@
 # Copyright David Abrahams 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)
-from __future__ import print_function
 '''
 >>> from iterator_ext import *
 >>> from input_iterator import *
@@ -56,12 +55,15 @@ from __future__ import print_function
 >>> ll.push_back(x)
 >>> for a in ll: #doctest: +NORMALIZE_WHITESPACE
 ...     for b in a:
-...         print(b, end='')
+...         print(b, end=' ')
 ...     print('')
 ...
 1 3 5
 1 3 5 7
 '''
+
+from __future__ import print_function
+
 def run(args = None):
     import sys
     import doctest

test/list.py

@@ -1,7 +1,6 @@
 # Copyright David Abrahams 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)
-from __future__ import print_function
 '''
 >>> from list_ext import *
 
@@ -103,6 +102,8 @@ reverse sorted:
 ['y', 'x', 'o', 'l', 'l', 'h', 'e', '.']
 '''
 
+from __future__ import print_function
+
 def run(args = None):
     import sys
     import doctest

test/long.py

@@ -1,9 +1,6 @@
 # Copyright David Abrahams 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)
-import sys
-if (sys.version_info.major >= 3):
-    long = int
 '''
 >>> from long_ext import *
 >>> print(new_long())
@@ -20,6 +17,10 @@ if (sys.version_info.major >= 3):
 >>> x = Y(long(4294967295))
 '''
 
+import sys
+if (sys.version_info.major >= 3):
+    long = int
+
 def run(args = None):
     import sys
     import doctest

test/map_indexing_suite.py

@@ -1,7 +1,6 @@
 # Copyright Joel de Guzman 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)
-from __future__ import print_function
 '''
 
 #####################################################################
@@ -199,7 +198,7 @@ kiwi
 >>> print_xmap(tm)
 [ (joel, aaa) (kimpo, bbb) ]
 >>> for el in tm: #doctest: +NORMALIZE_WHITESPACE
-...     print(el.key(), end='')
+...     print(el.key(), end=' ')
 ...     dom = el.data()
 joel kimpo
 
@@ -221,6 +220,7 @@ joel kimpo
 
 '''
 
+from __future__ import print_function
 
 def run(args = None):
     import sys
@@ -236,8 +236,3 @@ if __name__ == '__main__':
     status = run()[0]
     if (status == 0): print("Done.")
     sys.exit(status)
-
-
-
-
-

test/object.py

@@ -1,7 +1,6 @@
 # Copyright David Abrahams 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)
-from __future__ import print_function
 '''
 >>> from object_ext import *
 
@@ -164,6 +163,8 @@ from __future__ import print_function
 death
 '''
 
+from __future__ import print_function
+
 def run(args = None):
     import sys
     import doctest

test/pickle2.py

@@ -1,7 +1,6 @@
 # Copyright David Abrahams 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)
-from __future__ import print_function
 r'''>>> import pickle2_ext
     >>> import pickle
     >>> pickle2_ext.world.__module__
@@ -35,6 +34,8 @@ r'''>>> import pickle2_ext
     Incomplete pickle support (__getstate_manages_dict__ not set)
 '''
 
+from __future__ import print_function
+
 def run(args = None):
     import sys
     import doctest

test/pickle3.py

@@ -1,7 +1,6 @@
 # Copyright David Abrahams 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)
-from __future__ import print_function
 r'''>>> import pickle3_ext
     >>> import pickle
     >>> pickle3_ext.world.__module__
@@ -30,6 +29,8 @@ r'''>>> import pickle3_ext
     Hello from California! 0 84 yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy 126.0
 '''
 
+from __future__ import print_function
+
 def run(args = None):
     import sys
     import doctest

test/str.py

@@ -1,11 +1,10 @@
 # Copyright David Abrahams 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)
-from __future__ import print_function
 """
 >>> from str_ext import *
 >>> def printer(*args):
-...     for x in args: print(x, end='')
+...     for x in args: print(x, end=' ')
 ...     print('')
 ...
 >>> work_with_string(printer) #doctest: +NORMALIZE_WHITESPACE
@@ -38,6 +37,8 @@ this is a blabla string
 aaaaaaaaaaaaaaaaaaaaa
 """
 
+from __future__ import print_function
+
 def run(args = None):
     import sys
     import doctest

test/test_builtin_converters.py

@@ -1,9 +1,7 @@
+# -*- coding: utf-8 -*-
 # Copyright David Abrahams 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)
-import sys
-if (sys.version_info.major >= 3):
-    long = int
 r"""
 >>> from builtin_converters_ext import *
 
@@ -17,7 +15,7 @@ r"""
 
 # Wrappers to simplify tests
 >>> def should_pass(method, values):
-...     result = map(method, values[0])
+...     result = list(map(method, values[0]))
 ...     if result != values[0]:
 ...         print("Got %s but expected %s" % (result, values[0]))
 >>> def test_overflow(method, values):
@@ -136,9 +134,6 @@ True
 >>> print(rewrap_value_wstring(u'yo, wassup?'))
 yo, wassup?
 
->>> print(rewrap_value_wstring(u'\U0001f4a9'))
-\U0001f4a9
-
    test that overloading on unicode works:
 
 >>> print(rewrap_value_string(u'yo, wassup?'))

test/tuple.py

@@ -1,7 +1,6 @@
 # Copyright David Abrahams 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)
-from __future__ import print_function
 """
 >>> from tuple_ext import *
 >>> def printer(*args):
@@ -22,6 +21,8 @@ from __future__ import print_function
 ('hello', 42)
 """
 
+from __future__ import print_function
+
 def run(args = None):
     import sys
     import doctest