From becadf97387c24777a1a612f786b108adc570d93 Mon Sep 17 00:00:00 2001 From: Will Boyd Date: Thu, 28 May 2015 14:25:00 -0400 Subject: [PATCH 1/2] Added try-catch statements to wrap OpenCG imports --- src/utils/openmc/opencg_compatible.py | 7 ++++++- src/utils/openmc/summary.py | 11 +++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/utils/openmc/opencg_compatible.py b/src/utils/openmc/opencg_compatible.py index 320529f68a..3e6beeaba2 100644 --- a/src/utils/openmc/opencg_compatible.py +++ b/src/utils/openmc/opencg_compatible.py @@ -1,7 +1,12 @@ import copy import numpy as np -import opencg + +try: + from openmc.opencg_compatible import get_opencg_geometry +except ImportError: + msg = 'Unable to import opencg which is needed by openmc.opencg_compatible' + raise ImportError(msg) import openmc diff --git a/src/utils/openmc/summary.py b/src/utils/openmc/summary.py index 8aa25ad90e..bf66a5c64e 100644 --- a/src/utils/openmc/summary.py +++ b/src/utils/openmc/summary.py @@ -1,12 +1,11 @@ import numpy as np import openmc -from openmc.opencg_compatible import get_opencg_geometry try: import h5py except ImportError: - msg = 'Unable to import h5py which is necessary for openmc.summary' + msg = 'Unable to import h5py which is needed by openmc.summary' raise ImportError(msg) @@ -533,6 +532,14 @@ class Summary(object): def make_opencg_geometry(self): + + try: + from openmc.opencg_compatible import get_opencg_geometry + except ImportError: + msg = 'Unable to import opencg which is needed ' \ + 'by Summary.make_opencg_geometry()' + raise ImportError(msg) + if self.opencg_geometry is None: self.opencg_geometry = get_opencg_geometry(self.openmc_geometry) From 66124d95baec013cfe5e96b3d5c185a9ca7ac4c6 Mon Sep 17 00:00:00 2001 From: Will Boyd Date: Thu, 28 May 2015 19:49:21 -0700 Subject: [PATCH 2/2] Fixed opencg import int openmc.opencg_compatible --- src/utils/openmc/opencg_compatible.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/openmc/opencg_compatible.py b/src/utils/openmc/opencg_compatible.py index 3e6beeaba2..c0e6d595d0 100644 --- a/src/utils/openmc/opencg_compatible.py +++ b/src/utils/openmc/opencg_compatible.py @@ -3,7 +3,7 @@ import copy import numpy as np try: - from openmc.opencg_compatible import get_opencg_geometry + import opencg except ImportError: msg = 'Unable to import opencg which is needed by openmc.opencg_compatible' raise ImportError(msg)