Merge branch 'py3.OutputStreamAthenaPool-20190418' into 'master'

OutputStreamAthenaPool: Initial python3 port.

See merge request atlas/athena!22785

Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamAthenaPool.py

@@ -6,6 +6,8 @@
 ## $Id: OutputStreamAthenaPool.py,v 1.10 2009-04-27 18:19:34 gemmeren Exp $
 ###############################################################
 
+from __future__ import print_function
+
 from AthenaCommon.AppMgr import theApp
 from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 from AthenaServices.AthenaServicesConf import AthenaOutputStream
@@ -37,9 +39,8 @@ def createOutputStream( streamName, fileName = "", asAlg = False, noTag = False,
          # Tell tool to pick it up
          outputStream.WritingTool.AttributeListKey=key
          # build eventinfo attribute list
-         from OutputStreamAthenaPoolConf import EventInfoAttListTool
+         from .OutputStreamAthenaPoolConf import EventInfoAttListTool, EventInfoTagBuilder
          svcMgr.ToolSvc += EventInfoAttListTool()
-         from OutputStreamAthenaPoolConf import EventInfoTagBuilder
          EventInfoTagBuilder   = EventInfoTagBuilder(AttributeList=key, EventInfoKey=eventInfoKey)
          topSequence += EventInfoTagBuilder
 
@@ -51,7 +52,7 @@ def createOutputStream( streamName, fileName = "", asAlg = False, noTag = False,
 
    if fileName != "":
       outputStream.OutputFile = fileName
-      from OutputStreamAthenaPoolConf import MakeEventStreamInfo 
+      from .OutputStreamAthenaPoolConf import MakeEventStreamInfo 
       streamInfoTool = MakeEventStreamInfo( streamName + "_MakeEventStreamInfo" )
       streamInfoTool.Key = streamName
       outputStream.HelperTools = [ streamInfoTool ]