From 1e748818b07945c8d55288e8e1e48dcc2417a180 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 4 Feb 2020 15:58:15 +0100
Subject: [PATCH] Herwig7_i: python 3 fixes

 - Relative package imports
 - decoding of characters from subprocess
 - long
 - print function
---
 Generators/Herwig7_i/python/Herwig7Config.py          |  2 +-
 Generators/Herwig7_i/python/Herwig7ConfigBuiltinME.py |  6 +++---
 Generators/Herwig7_i/python/Herwig7Control.py         |  7 ++++---
 Generators/Herwig7_i/python/Herwig7Utils.py           | 10 +++++-----
 Generators/Herwig7_i/python/config.py                 |  6 ++++--
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Generators/Herwig7_i/python/Herwig7Config.py b/Generators/Herwig7_i/python/Herwig7Config.py
index 58905a9246f..71723c4d65d 100644
--- a/Generators/Herwig7_i/python/Herwig7Config.py
+++ b/Generators/Herwig7_i/python/Herwig7Config.py
@@ -3,7 +3,7 @@
 ## \file Herwig7Config.py
 ## \brief Python convenience snippets providing re-usable bits of settings for use in the jobOptions
 
-import Herwig7Utils as hw7Utils
+from . import Herwig7Utils as hw7Utils
 
 ## Configuration base class for %Herwig7
 class Hw7Config(object):
diff --git a/Generators/Herwig7_i/python/Herwig7ConfigBuiltinME.py b/Generators/Herwig7_i/python/Herwig7ConfigBuiltinME.py
index eb0942b173c..329d00e36c2 100644
--- a/Generators/Herwig7_i/python/Herwig7ConfigBuiltinME.py
+++ b/Generators/Herwig7_i/python/Herwig7ConfigBuiltinME.py
@@ -4,9 +4,9 @@
 ## \brief Configuration class for built-in / "old-style" matrix elements
 ## \author Daniel Rauch (daniel.rauch@desy.de)
 
-import Herwig7Config as hw7Config
-import Herwig7Control as hw7Control
-import Herwig7Utils as hw7Utils
+from . import Herwig7Config as hw7Config
+from . import Herwig7Control as hw7Control
+from . import Herwig7Utils as hw7Utils
 
 
 ## Configuration class for built-in / "old-style" matrix elements
diff --git a/Generators/Herwig7_i/python/Herwig7Control.py b/Generators/Herwig7_i/python/Herwig7Control.py
index c736c8e131e..d03f2f44891 100644
--- a/Generators/Herwig7_i/python/Herwig7Control.py
+++ b/Generators/Herwig7_i/python/Herwig7Control.py
@@ -11,9 +11,10 @@
 ## in Herwig7_i/Herwig7.h and src/Herwig7.cxx.
 
 import datetime, os, shutil, subprocess, sys, time
+import six
 
-import Herwig7Config as hw7Config
-import Herwig7Utils as hw7Utils
+from . import Herwig7Config as hw7Config
+from . import Herwig7Utils as hw7Utils
 # import Herwig7Defaults as HwDefaults
 
 from AthenaCommon import Logging
@@ -355,7 +356,7 @@ def start_banner():
 
 def get_software_versions():
 
-  return(subprocess.check_output([herwig7_binary,'--version']).splitlines())
+  return(six.ensure_str(subprocess.check_output([herwig7_binary,'--version'])).splitlines())
   
 
 def get_infile_name(run_name="Herwig-Matchbox"):
diff --git a/Generators/Herwig7_i/python/Herwig7Utils.py b/Generators/Herwig7_i/python/Herwig7Utils.py
index 71a7b979cf1..1f021fbe2f4 100644
--- a/Generators/Herwig7_i/python/Herwig7Utils.py
+++ b/Generators/Herwig7_i/python/Herwig7Utils.py
@@ -184,11 +184,11 @@ def humanize_bytes(bytes, precision=2):
   # http://code.activestate.com/recipes/577081-humanized-representation-of-a-number-of-bytes/
 
   abbrevs = (
-      (1<<50L, 'PiB'),
-      (1<<40L, 'TiB'),
-      (1<<30L, 'GiB'),
-      (1<<20L, 'MiB'),
-      (1<<10L, 'KiB'),
+      (1<<50, 'PiB'),
+      (1<<40, 'TiB'),
+      (1<<30, 'GiB'),
+      (1<<20, 'MiB'),
+      (1<<10, 'KiB'),
       (1, 'byte(s)')
   )
   if bytes == 1:
diff --git a/Generators/Herwig7_i/python/config.py b/Generators/Herwig7_i/python/config.py
index 3e6a31008f7..68540425574 100644
--- a/Generators/Herwig7_i/python/config.py
+++ b/Generators/Herwig7_i/python/config.py
@@ -1,10 +1,12 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 ## \file Herwig7_i/python/config.py
 ## \brief Python functions that are usable in the Herwig 7 jobOptions
 ## \author Daniel Rauch (daniel.rauch@desy.de)
 ##
 
+from __future__ import print_function
+
 ## Choose symmetric collider energy
 def energy_cmds(sqrts):
     "Set sqrts(s) in GeV"
@@ -486,4 +488,4 @@ if __name__ == "__main__":
     sqrts = 14000
     if len(sys.argv) > 1:
         sqrts = float(sys.argv[1])
-    print energy_cmds(sqrts)
+    print (energy_cmds(sqrts))
-- 
GitLab