changes with updates printing policy

Author: Vipul-Cariappa

python/cppyy/_typemap.py

@@ -104,4 +104,4 @@ def voidp_init(self, arg=0):
         import cppyy, ctypes
         if arg == cppyy.nullptr: arg = 0
         ctypes.c_void_p.__init__(self, arg)
-    tm['void*'] = _create_mapper(ctypes.c_void_p, {'__init__' : voidp_init})
+    tm['void *'] = _create_mapper(ctypes.c_void_p, {'__init__' : voidp_init})

test/test_doc_features.py

@@ -131,7 +131,7 @@ class Abstract2 {
 
 template<class A, class B, class C = A>
 C multiply(A a, B b) {
-    return C{a*b};
+    return static_cast<C>(a * b);
 }
 
 //-----
@@ -253,8 +253,8 @@ def test_keyword_arguments(self):
     def test_doc_strings(self):
         import cppyy
         from cppyy.gbl import Concrete
-        assert 'void Concrete::array_method(int* ad, int size)' in Concrete.array_method.__doc__
-        assert 'void Concrete::array_method(double* ad, int size)' in Concrete.array_method.__doc__
+        assert 'void Concrete::array_method(int * ad, int size)'.replace(" ", "") in Concrete.array_method.__doc__.replace(" ", "")
+        assert 'void Concrete::array_method(double * ad, int size)'.replace(" ", "") in Concrete.array_method.__doc__.replace(" ", "")
 
     def test_enums(self):
         import cppyy
@@ -682,7 +682,7 @@ def test08_shared_ptr(self):
         assert type(Zoo.free_lion).__name__ == 'Lion'
 
         smart_lion = Zoo.free_lion.__smartptr__()
-        assert type(smart_lion).__name__ in ['shared_ptr<Zoo::Lion>', 'std::shared_ptr<Zoo::Lion>']
+        assert type(smart_lion).__name__ in ['shared_ptr<Zoo::Lion>', 'std::shared_ptr<Zoo::Lion>', 'shared_ptr<Lion>', 'std::shared_ptr<Lion>']
 
         assert Zoo.identify_animal(Zoo.free_lion) == "the animal is a lion"
         assert Zoo.identify_animal_smart(Zoo.free_lion) == "the animal is a lion"
@@ -698,14 +698,14 @@ def test09_templated_function(self):
         assert 'multiply' in cppyy.gbl.__dict__
 
         assert mul(1,  2) == 2
-        assert 'multiply<int,int,int>' in cppyy.gbl.__dict__
+        assert 'multiply<int,int,int>' in map(lambda x: x.replace(" ", ""), cppyy.gbl.__dict__)
         assert mul(1., 5) == 5.
-        assert 'multiply<double,int,double>' in cppyy.gbl.__dict__
+        assert 'multiply<double,int,double>' in map(lambda x: x.replace(" ", ""), cppyy.gbl.__dict__)
 
         assert mul[int]     (1, 1) == 1
-        assert 'multiply<int>' in cppyy.gbl.__dict__
+        assert 'multiply<int>' in map(lambda x: x.replace(" ", ""), cppyy.gbl.__dict__)
         assert mul[int, int](1, 1) == 1
-        assert 'multiply<int,int>' in cppyy.gbl.__dict__
+        assert 'multiply<int,int>' in map(lambda x: x.replace(" ", ""), cppyy.gbl.__dict__)
 
       # make sure cached values are actually looked up
         old = getattr(cppyy.gbl, 'multiply<int,int>')

test/test_fragile.py

@@ -191,13 +191,14 @@ def test10_documentation(self):
         except TypeError as e:
             # TODO: pypy-c does not indicate which argument failed to convert, CPython does
             # likewise there are still minor differences in descriptiveness of messages
-            assert "fragile::D::overload()" in str(e)
+            err_msg = str(e).replace(" ", "")
+            assert "fragile::D::overload()" in err_msg
             assert "TypeError: takes at most 0 arguments (1 given)" in str(e)
-            assert "fragile::D::overload(fragile::no_such_class*)" in str(e)
+            assert "fragile::D::overload(fragile::no_such_class*)" in err_msg
             #assert "no converter available for 'fragile::no_such_class*'" in str(e)
-            assert "void fragile::D::overload(char, int i = 0)" in str(e)
+            assert "void fragile::D::overload(char, int i = 0)".replace(" ", "") in err_msg
             #assert "char or small int type expected" in str(e)
-            assert "void fragile::D::overload(int, fragile::no_such_class* p = 0)" in str(e)
+            assert "void fragile::D::overload(int, fragile::no_such_class * p = 0)".replace(" ", "") in err_msg
             #assert "int/long conversion expects an integer object" in str(e)
 
         j = fragile.J()
@@ -243,9 +244,9 @@ def test11_dir(self):
 
         namespace Cppyy {
 
-        typedef size_t TCppScope_t;
+        typedef void* TCppScope_t;
 
-        CPPYY_IMPORT TCppScope_t GetScope(const std::string& scope_name);
+        CPPYY_IMPORT TCppScope_t GetScope(const std::string& scope_name, TCppScope_t parent_scope = nullptr);
         CPPYY_IMPORT void GetAllCppNames(TCppScope_t scope, std::set<std::string>& cppnames);
 
         }""")

test/test_pythonization.py

@@ -55,13 +55,24 @@ def pythonizor(klass, name):
 
         assert cppyy.gbl.pyzables.SomeDummy2.test == 3
 
+        cppyy.cppdef("""
+            namespace pyzables {
+                class TObjString {
+                public:
+                    std::string s;
+                    TObjString(std::string ss) : s(ss) {}
+                    size_t Sizeof() { return s.size() + 1; }
+                };
+            }
+        """)
+
         def root_pythonizor(klass, name):
-            if name == 'CppyyLegacy::TObjString':
+            if name == 'pyzables::TObjString':
                 klass.__len__ = klass.Sizeof
 
         cppyy.py.add_pythonization(root_pythonizor)
 
-        assert len(cppyy.gbl.CppyyLegacy.TObjString("aap")) == 4     # include '\0'
+        assert len(cppyy.gbl.pyzables.TObjString("aap")) == 4     # include '\0'
 
     def test01_size_mapping(self):
         """Use composites to map GetSize() onto buffer returns"""

test/test_regression.py

@@ -54,15 +54,24 @@ def test02_dir(self):
 
         import cppyy, pydoc
 
-        assert not '__abstractmethods__' in dir(cppyy.gbl.cling.runtime.gCling)
-        assert '__class__' in dir(cppyy.gbl.cling.runtime.gCling)
+        cppyy.cppdef("""
+            namespace docs {
+            struct MyDocs {
+                void fn() {}
+            } s;
+            MyDocs *ptrDocs = &s;
+            }
+        """)
+
+        assert not '__abstractmethods__' in dir(cppyy.gbl.docs.ptrDocs)
+        assert '__class__' in dir(cppyy.gbl.docs.ptrDocs)
 
         self.__class__.helpout = []
-        pydoc.doc(cppyy.gbl.cling.runtime.gCling)
+        pydoc.doc(cppyy.gbl.docs.ptrDocs)
         helptext = ''.join(self.__class__.helpout)
-        assert 'TInterpreter' in helptext
+        assert 'MyDocs' in helptext
         assert 'CPPInstance' in helptext
-        assert 'AddIncludePath' in helptext
+        assert 'fn' in helptext
 
         cppyy.cppdef("namespace cppyy_regression_test { void iii() {}; }")
 

test/test_templates.py

@@ -1190,13 +1190,13 @@ def test01_using(self):
         assert 'in_type' in dir(tct[int, dum, 4])
 
         assert in_type.__name__ == 'in_type'
-        assert in_type.__cpp_name__ == 'TemplatedTypedefs::DerivedWithUsing<int,TemplatedTypedefs::SomeDummy,4>::in_type'
+        assert in_type.__cpp_name__ == 'TemplatedTypedefs::DerivedWithUsing<int, TemplatedTypedefs::SomeDummy, 4>::in_type'
 
         in_type_tt = tct[int, dum, 4].in_type_tt
         assert 'in_type_tt' in dir(tct[int, dum, 4])
 
         assert in_type_tt.__name__ == 'in_type_tt'
-        assert in_type_tt.__cpp_name__ == 'TemplatedTypedefs::DerivedWithUsing<int,TemplatedTypedefs::SomeDummy,4>::in_type_tt'
+        assert in_type_tt.__cpp_name__ == 'TemplatedTypedefs::DerivedWithUsing<int, TemplatedTypedefs::SomeDummy, 4>::in_type_tt'
 
     @mark.xfail
     def test02_mapped_type_as_internal(self):