Merge branch 'root-project:master' into master

Author: pamputt

bindings/pyroot/pythonizations/python/ROOT/_pythonization/_stl_vector.py

@@ -1,4 +1,4 @@
-# Author: Stefan Wunsch CERN  08/2018
+# Author: Stefan Wunsch, Enric Tejedor CERN  08/2018
 
 ################################################################################
 # Copyright (C) 1995-2018, Rene Brun and Fons Rademakers.                      #
@@ -11,6 +11,17 @@
 from . import pythonization
 from ._rvec import add_array_interface_property
 
+def _data_vec_char(self):
+    # vector<char>::data() returns char*.
+    # Cppyy attemps to convert char* into Python string, but if the
+    # character sequence is not null-terminated the conversion fails.
+    # This is likely to happen with the result of vector<char>::data().
+    # For the conversion char* -> str to succeed when calling data(),
+    # temporarily append a null character to the vector<char>.
+    self.push_back('\0')
+    d = self._original_data()
+    self.pop_back()
+    return d
 
 @pythonization("vector<", ns="std", is_prefix=True)
 def pythonize_stl_vector(klass, name):
@@ -21,3 +32,8 @@ def pythonize_stl_vector(klass, name):
     # Add numpy array interface
     # NOTE: The pythonization is reused from ROOT::VecOps::RVec
     add_array_interface_property(klass, name)
+
+    # Inject custom vector<char>::data()
+    if klass.value_type == 'char':
+        klass._original_data = klass.data
+        klass.data = _data_vec_char

bindings/pyroot/pythonizations/test/CMakeLists.txt

@@ -26,6 +26,9 @@ ROOT_ADD_PYUNITTEST(pyroot_pyz_decorator pythonization_decorator.py)
 ROOT_ADD_PYUNITTEST(pyroot_pyz_pretty_printing pretty_printing.py)
 ROOT_ADD_PYUNITTEST(pyroot_pyz_array_interface array_interface.py PYTHON_DEPS numpy)
 
+# STL vector pythonizations
+ROOT_ADD_PYUNITTEST(pyroot_pyz_stl_vector stl_vector.py)
+
 # TObject and subclasses pythonisations
 ROOT_ADD_PYUNITTEST(pyroot_pyz_tobject_contains tobject_contains.py)
 ROOT_ADD_PYUNITTEST(pyroot_pyz_tobject_comparisonops tobject_comparisonops.py)

bindings/pyroot/pythonizations/test/stl_vector.py

@@ -0,0 +1,25 @@
+import unittest
+import ROOT
+
+
+class STL_vector(unittest.TestCase):
+    """
+    Tests for the pythonizations of std::vector. 
+    """
+
+    def test_vec_char_data(self):
+        '''
+        Test that calling std::vector<char>::data() returns a Python string
+        that contains the characters of the vector and no exception is raised.
+        Check also that the iteration over the vector runs normally (#9632).
+        '''
+
+        elems = ['a','b','c']
+        v = ROOT.std.vector['char'](elems)
+        self.assertEqual(v.data(), ''.join(elems))
+
+        for elem in v:
+            self.assertEqual(elem, elems.pop(0))
+
+if __name__ == '__main__':
+    unittest.main()