Merge branch 'sg.PyKernel-20201028' into 'master'

PyKernel+AthenaPython: Remove reference to StoreGate.h.

See merge request atlas/athena!37715

Control/AthenaPython/python/Bindings.py

@@ -250,12 +250,6 @@ def _py_init_StoreGateSvc():
 
     return StoreGateSvc
 
-@memoize
-def _py_init_StoreGate():
-    _py_init_StoreGateSvc()
-    from StoreGateBindings.Bindings import StoreGate
-    return StoreGate
-
 ### pythonizations for IIncidentSvc
 @memoize
 def _py_init_IIncidentSvc():
@@ -820,7 +814,6 @@ def _std_map_pythonize(cls, key_type, value_type):
 def _setup():
     _register = _PyAthenaBindingsCatalog.register
     _register('StoreGateSvc', _py_init_StoreGateSvc)
-    _register('StoreGate',    _py_init_StoreGate   )
 
     _register( 'IncidentSvc', _py_init_IIncidentSvc)
     _register('IIncidentSvc', _py_init_IIncidentSvc)

Control/PyKernel/python/PyKernel.py

@@ -131,8 +131,8 @@ def retrieve (aClass, aKey=None):
         return rootStream
     global storeGate
     if storeGate == None:
-        import StoreGateBindings.Bindings
-        storeGate = StoreGateBindings.Bindings.StoreGate.pointer()
+        import AthenaPython.PyAthena as PyAthena
+        storeGate = PyAthena.py_svc('StoreGateSvc/StoreGateSvc')
     if aKey:
         ret = storeGate.retrieve(aClass,aKey)
     else:
@@ -158,8 +158,8 @@ def retrieveDet (aClass, aKey=None):
     #import workaround    
     global detStore
     if detStore == None:
-        import StoreGateBindings.Bindings
-        detStore = StoreGateBindings.Bindings.StoreGate.pointer("DetectorStore")
+        import AthenaPython.PyAthena as PyAthena
+        storeGate = PyAthena.py_svc('StoreGateSvc/DetectorStore')
     if aKey:
         ret = detStore.retrieve(aClass,aKey)
     else: