[PyROOT] Don't import libcppyy directly in PyROOT

Just in case the `libcppyy` gets moved out of the base `site-packages`
directory to meet the requirements of Linux distributions like Gentoo.

See also #14917.

Author: guitargeek

bindings/pyroot/pythonizations/python/ROOT/_facade.py

@@ -4,19 +4,16 @@
 import os
 from functools import partial
 
-import libcppyy as cppyy_backend
-from cppyy import gbl as gbl_namespace
-from cppyy import cppdef, include
-from ROOT.libROOTPythonizations import gROOT
-from cppyy.gbl import gSystem
+import cppyy
 import cppyy.ll
 
+from ROOT.libROOTPythonizations import gROOT
+
 from ._application import PyROOTApplication
 from ._numbadeclare import _NumbaDeclareDecorator
 
 from ._pythonization import pythonization
 
-
 class PyROOTConfiguration(object):
     """Class for configuring PyROOT"""
 
@@ -107,7 +104,7 @@ def __init__(self, module, is_ipython):
             "SetOwnership",
         ]
         for name in self._cppyy_exports:
-            setattr(self, name, getattr(cppyy_backend, name))
+            setattr(self, name, getattr(cppyy._backend, name))
         # For backwards compatibility
         self.MakeNullPointer = partial(self.bind_object, 0)
         self.BindObject = self.bind_object
@@ -154,10 +151,10 @@ def _fallback_getattr(self, name):
         # e.g. ROOT.ROOT.Math as ROOT.Math
 
         # Note that hasattr caches the lookup for getattr
-        if hasattr(gbl_namespace, name):
-            return getattr(gbl_namespace, name)
-        elif hasattr(gbl_namespace.ROOT, name):
-            return getattr(gbl_namespace.ROOT, name)
+        if hasattr(cppyy.gbl, name):
+            return getattr(cppyy.gbl, name)
+        elif hasattr(cppyy.gbl.ROOT, name):
+            return getattr(cppyy.gbl.ROOT, name)
         else:
             res = gROOT.FindObject(name)
             if res:
@@ -180,7 +177,7 @@ def _finalSetup(self):
 
         # Redirect lookups to cppyy's global namespace
         self.__class__.__getattr__ = self._fallback_getattr
-        self.__class__.__setattr__ = lambda self, name, val: setattr(gbl_namespace, name, val)
+        self.__class__.__setattr__ = lambda self, name, val: setattr(cppyy.gbl, name, val)
 
         # Run rootlogon if exists
         self._run_rootlogon()
@@ -359,7 +356,7 @@ def TMVA(self):
     # Create and overload Numba namespace
     @property
     def Numba(self):
-        cppdef("namespace Numba {}")
+        cppyy.cppdef("namespace Numba {}")
         ns = self._fallback_getattr("Numba")
         ns.Declare = staticmethod(_NumbaDeclareDecorator)
         del type(self).Numba
@@ -380,7 +377,7 @@ def NumbaExt(self):
     # Get TPyDispatcher for programming GUI callbacks
     @property
     def TPyDispatcher(self):
-        include("ROOT/TPyDispatcher.h")
-        tpd = gbl_namespace.TPyDispatcher
+        cppyy.include("ROOT/TPyDispatcher.h")
+        tpd = cppyy.gbl.TPyDispatcher
         type(self).TPyDispatcher = tpd
         return tpd

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

@@ -8,11 +8,11 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.                    #
 ################################################################################
 
-import libcppyy
-from ROOT.libROOTPythonizations import AddCPPInstancePickling
-
 def pythonize_cppinstance():
-    klass = libcppyy.CPPInstance
+    import cppyy
+    from ROOT.libROOTPythonizations import AddCPPInstancePickling
+
+    klass = cppyy._backend.CPPInstance
 
     AddCPPInstancePickling(klass)
 

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

@@ -10,10 +10,12 @@
 
 from . import pythonization
 from cppyy.gbl import kCanDelete
-from libcppyy import SetOwnership
 
 
 def _Draw(self, *args):
+
+    import ROOT
+
     # Parameters:
     # self: Object being drawn
     # args: arguments for Draw
@@ -31,11 +33,14 @@ def _Draw(self, *args):
     # their constructors. Later, when being drawn, they are appended to
     # the list of primitives of gPad.
     if self.TestBit(kCanDelete):
-        SetOwnership(self, False)
+        ROOT.SetOwnership(self, False)
 
     self.Draw = self._OriginalDraw
 
 def _init(self, *args):
+
+    import ROOT
+
     # Parameters:
     # self: Object being initialized
     # args: arguments for __init__
@@ -47,7 +52,7 @@ def _init(self, *args):
     # Therefore, we need to set the ownership here and not in Draw
     # (TSlider does not need to be drawn). This is ROOT-10095.
     if self.TestBit(kCanDelete):
-        SetOwnership(self, False)
+        ROOT.SetOwnership(self, False)
         # We have already set the ownership while initializing,
         # so we do not need the custom Draw inherited from TPad to
         # do it again in case it is executed.

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

@@ -11,8 +11,6 @@
 import typing
 from .._numbadeclare import _NumbaDeclareDecorator
 
-import libcppyy
-
 class FunctionJitter:
     """
     This class allows to jit a python callable with Numba, being able to infer the signature of the function from the types of the RDF columns.
@@ -275,8 +273,10 @@ def _handle_cpp_callables(func, original_template, *args):
     three cases above, None otherwise
     """
 
-    is_cpp_functor  = lambda : isinstance(getattr(func, '__call__', None), libcppyy.CPPOverload)
-    is_std_function = lambda : isinstance(getattr(func, 'target_type', None), libcppyy.CPPOverload)
+    import cppyy
+
+    is_cpp_functor  = lambda : isinstance(getattr(func, '__call__', None), cppyy._backend.CPPOverload)
+    is_std_function = lambda : isinstance(getattr(func, 'target_type', None), cppyy._backend.CPPOverload)
 
     if is_cpp_functor() or is_std_function():
         return original_template[type(func)](*args)

bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/_rooabscollection.py

@@ -12,7 +12,6 @@
 
 
 from ._utils import _kwargs_to_roocmdargs, cpp_signature
-from libcppyy import SetOwnership
 
 
 class RooAbsCollection(object):
@@ -28,6 +27,9 @@ class RooAbsCollection(object):
     """
 
     def addClone(self, arg, silent=False):
+
+        import ROOT
+
         clonedArg = self._addClone(arg, silent)
         # There are two overloads of RooAbsCollection::addClone():
         #
@@ -42,11 +44,14 @@ def addClone(self, arg, silent=False):
         # need to change any ownership flags (in fact, calling
         # SetOwnership(None, False) would cause a crash).
         if clonedArg is not None:
-            SetOwnership(clonedArg, False)
+            ROOT.SetOwnership(clonedArg, False)
 
     def addOwned(self, arg, silent=False):
+
+        import ROOT
+
         self._addOwned(arg, silent)
-        SetOwnership(arg, False)
+        ROOT.SetOwnership(arg, False)
 
     @cpp_signature(
         "RooAbsCollection::printLatex(const RooCmdArg& arg1={}, const RooCmdArg& arg2={},"

bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/_utils.py

@@ -23,11 +23,11 @@ def getter(k, v):
 
         # We have to use ROOT here and not cppy.gbl, because the RooFit namespace is pythonized itself.
         import ROOT
-        import libcppyy
+        import cppyy
 
         func = getattr(ROOT.RooFit, k)
 
-        if isinstance(func, libcppyy.CPPOverload):
+        if isinstance(func, cppyy._backend.CPPOverload):
             # Pythonization for functions that don't pass any RooCmdArgs like ShiftToZero() and MoveToBack(). For Eg,
             # Default bindings: pdf.plotOn(frame, ROOT.RooFit.MoveToBack())
             # With pythonizations: pdf.plotOn(frame, MoveToBack=True)

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

@@ -73,7 +73,6 @@
 '''
 
 from . import pythonization
-from libcppyy import bind_object
 
 
 def _TFileConstructor(self, *args):
@@ -90,14 +89,17 @@ def _TFileConstructor(self, *args):
 
 
 def _TFileOpen(klass, *args):
+
+    import ROOT
+
     # Redefinition of ROOT.TFile.Open(str, ...):
     # check if the instance of TFile is a C++ nullptr and raise a
     # OSError if this is the case.
     # Parameters:
     # klass: TFile class
     # *args: arguments passed to the constructor
     f = klass._OriginalOpen(*args)
-    if f == bind_object(0, klass):
+    if f == ROOT.bind_object(0, klass):
         # args[0] can be either a string or a TFileOpenHandle
         raise OSError('Failed to open file {}'.format(str(args[0])))
     return f

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

@@ -9,7 +9,6 @@
 ################################################################################
 
 from . import pythonization
-from libcppyy import SetOwnership
 
 import sys
 
@@ -75,6 +74,9 @@ def _remove_at(self, idx):
     return self.Remove(lnk)
 
 def _setitem_pyz(self, idx, val):
+
+    import ROOT
+
     # Parameters:
     # - self: collection where to set item/s
     # - idx: index/slice of the item/s
@@ -94,7 +96,7 @@ def _setitem_pyz(self, idx, val):
             # Prevent this new Python proxy from owning the C++ object
             # Otherwise we get an 'already deleted' error in
             # TList::Clear when the application ends
-            SetOwnership(elem, False)
+            ROOT.SetOwnership(elem, False)
             try:
                 i = next(it)
                 self[i] = elem

bindings/pyroot/pythonizations/src/PyROOTModule.cxx

@@ -98,9 +98,6 @@ extern "C" PyObject* PyInit_libROOTPythonizations()
    // keep gRootModule, but do not increase its reference count even as it is borrowed,
    // or a self-referencing cycle would be created
 
-   // Make sure libcppyy has been imported
-   PyImport_ImportModule("libcppyy");
-
    // setup PyROOT
    PyROOT::Init();
 

bindings/pyroot/pythonizations/test/tcollection_iterable.py

@@ -1,7 +1,6 @@
 import unittest
 
 import ROOT
-from libcppyy import SetOwnership
 
 
 class TCollectionIterable(unittest.TestCase):
@@ -21,7 +20,7 @@ def create_tcollection(self):
         for _ in range(self.num_elems):
             o = ROOT.TObject()
             # Prevent immediate deletion of C++ TObjects
-            SetOwnership(o, False)
+            ROOT.SetOwnership(o, False)
             c.Add(o)
 
         return c