diff --git a/Longbow/corelibs/applications.py b/Longbow/corelibs/applications.py index 6c3379b..f3cf13f 100755 --- a/Longbow/corelibs/applications.py +++ b/Longbow/corelibs/applications.py @@ -39,19 +39,9 @@ import logging import os -# Depending on how longbow is installed/utilised the import will be slightly -# different, this should handle both cases. -try: - - import corelibs.exceptions as exceptions - import corelibs.shellwrappers as shellwrappers - import plugins.apps as apps - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions - import Longbow.corelibs.shellwrappers as shellwrappers - import Longbow.plugins.apps as apps +import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.shellwrappers as shellwrappers +import Longbow.plugins.apps as apps LOG = logging.getLogger("Longbow.corelibs.applications") diff --git a/Longbow/corelibs/configuration.py b/Longbow/corelibs/configuration.py index fa10a17..c03da36 100755 --- a/Longbow/corelibs/configuration.py +++ b/Longbow/corelibs/configuration.py @@ -61,17 +61,8 @@ import os from random import randint -# Depending on how Longbow is installed/utilised the import will be slightly -# different, this should handle both cases. -try: - - import corelibs.exceptions as exceptions - import plugins.apps as apps - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions - import Longbow.plugins.apps as apps +import Longbow.corelibs.exceptions as exceptions +import Longbow.plugins.apps as apps LOG = logging.getLogger("Longbow.corelibs.configuration") diff --git a/Longbow/corelibs/scheduling.py b/Longbow/corelibs/scheduling.py index 674abc8..6c66f4a 100755 --- a/Longbow/corelibs/scheduling.py +++ b/Longbow/corelibs/scheduling.py @@ -52,23 +52,11 @@ import time import os -# Depending on how longbow is installed/utilised the import will be slightly -# different, this should handle both cases. -try: - - import corelibs.configuration as configuration - import corelibs.exceptions as exceptions - import corelibs.shellwrappers as shellwrappers - import corelibs.staging as staging - import plugins.schedulers as schedulers - -except ImportError: - - import Longbow.corelibs.configuration as configuration - import Longbow.corelibs.exceptions as exceptions - import Longbow.corelibs.shellwrappers as shellwrappers - import Longbow.corelibs.staging as staging - import Longbow.plugins.schedulers as schedulers +import Longbow.corelibs.configuration as configuration +import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.shellwrappers as shellwrappers +import Longbow.corelibs.staging as staging +import Longbow.plugins.schedulers as schedulers LOG = logging.getLogger("Longbow.corelibs.scheduling") diff --git a/Longbow/corelibs/shellwrappers.py b/Longbow/corelibs/shellwrappers.py index c1bfb04..de04127 100755 --- a/Longbow/corelibs/shellwrappers.py +++ b/Longbow/corelibs/shellwrappers.py @@ -83,13 +83,7 @@ import logging import time -try: - - import corelibs.exceptions as exceptions - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.exceptions as exceptions LOG = logging.getLogger("Longbow.corelibs.shellwrappers") diff --git a/Longbow/corelibs/staging.py b/Longbow/corelibs/staging.py index 7754b7d..ed89459 100755 --- a/Longbow/corelibs/staging.py +++ b/Longbow/corelibs/staging.py @@ -46,15 +46,8 @@ import logging -try: - - import corelibs.exceptions as exceptions - import corelibs.shellwrappers as shellwrappers - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions - import Longbow.corelibs.shellwrappers as shellwrappers +import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.shellwrappers as shellwrappers LOG = logging.getLogger("Longbow.corelibs.staging") diff --git a/Longbow/longbow b/Longbow/longbow index 3fc2c0d..23cc88b 100755 --- a/Longbow/longbow +++ b/Longbow/longbow @@ -50,27 +50,13 @@ import sys import logging import subprocess -# Depending on how longbow is installed/utilised the import will be slightly -# different, this should handle most common cases. -try: - - import corelibs.applications as applications - import plugins.apps as apps - import corelibs.configuration as configuration - import corelibs.exceptions as exceptions - import corelibs.scheduling as scheduling - import corelibs.shellwrappers as shellwrappers - import corelibs.staging as staging - -except ImportError: - - import Longbow.corelibs.applications as applications - import Longbow.plugins.apps as apps - import Longbow.corelibs.configuration as configuration - import Longbow.corelibs.exceptions as exceptions - import Longbow.corelibs.scheduling as scheduling - import Longbow.corelibs.shellwrappers as shellwrappers - import Longbow.corelibs.staging as staging +import Longbow.corelibs.applications as applications +import Longbow.plugins.apps as apps +import Longbow.corelibs.configuration as configuration +import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.scheduling as scheduling +import Longbow.corelibs.shellwrappers as shellwrappers +import Longbow.corelibs.staging as staging PYTHONVERSION = "{0}.{1}".format(sys.version_info[0], sys.version_info[1]) LONGBOWVERSION = "1.3.2" diff --git a/Longbow/plugins/apps/__init__.py b/Longbow/plugins/apps/__init__.py index 8b9ee34..57317d8 100644 --- a/Longbow/plugins/apps/__init__.py +++ b/Longbow/plugins/apps/__init__.py @@ -49,15 +49,8 @@ except ImportError: - # Else try to import from a directory installed path. - try: - mod = __import__("plugins.apps." + modulename, - fromlist=[""]) - - except ImportError: - - # Otherwise we've had it! Raise exception. - raise + # Otherwise we've had it! Raise exception. + raise # Now try and pull in attributes. try: diff --git a/Longbow/plugins/apps/charmm.py b/Longbow/plugins/apps/charmm.py index c7db15c..fcd52f7 100644 --- a/Longbow/plugins/apps/charmm.py +++ b/Longbow/plugins/apps/charmm.py @@ -23,13 +23,7 @@ import os import re -try: - - import corelibs.exceptions as exceptions - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.exceptions as exceptions EXECDATA = { diff --git a/Longbow/plugins/apps/lammps.py b/Longbow/plugins/apps/lammps.py index 2f1da29..549af43 100644 --- a/Longbow/plugins/apps/lammps.py +++ b/Longbow/plugins/apps/lammps.py @@ -23,13 +23,7 @@ import os import re -try: - - import corelibs.exceptions as exceptions - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.exceptions as exceptions EXECDATA = { diff --git a/Longbow/plugins/apps/namd.py b/Longbow/plugins/apps/namd.py index 250b7dd..8e78247 100644 --- a/Longbow/plugins/apps/namd.py +++ b/Longbow/plugins/apps/namd.py @@ -23,13 +23,7 @@ import os import re -try: - - import corelibs.exceptions as exceptions - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.exceptions as exceptions EXECDATA = { diff --git a/Longbow/plugins/schedulers/__init__.py b/Longbow/plugins/schedulers/__init__.py index b6910e2..422b3c7 100755 --- a/Longbow/plugins/schedulers/__init__.py +++ b/Longbow/plugins/schedulers/__init__.py @@ -40,14 +40,7 @@ except ImportError: - try: - - mod = __import__("plugins.schedulers." + modulename, - fromlist=[""]) - - except ImportError: - - raise + raise try: diff --git a/Longbow/plugins/schedulers/lsf.py b/Longbow/plugins/schedulers/lsf.py index 7d8ee67..7aa5124 100755 --- a/Longbow/plugins/schedulers/lsf.py +++ b/Longbow/plugins/schedulers/lsf.py @@ -37,15 +37,8 @@ import os import re -try: - - import corelibs.exceptions as exceptions - import corelibs.shellwrappers as shellwrappers - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions - import Longbow.corelibs.shellwrappers as shellwrappers +import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.shellwrappers as shellwrappers QUERY_STRING = "env | grep -i 'lsf'" diff --git a/Longbow/plugins/schedulers/pbs.py b/Longbow/plugins/schedulers/pbs.py index 20b81dd..8b7a4d8 100755 --- a/Longbow/plugins/schedulers/pbs.py +++ b/Longbow/plugins/schedulers/pbs.py @@ -39,16 +39,8 @@ import os import re - -try: - - import corelibs.exceptions as exceptions - import corelibs.shellwrappers as shellwrappers - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions - import Longbow.corelibs.shellwrappers as shellwrappers +import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.shellwrappers as shellwrappers QUERY_STRING = "env | grep -i 'pbs'" diff --git a/Longbow/plugins/schedulers/sge.py b/Longbow/plugins/schedulers/sge.py index 2061aa7..d372333 100755 --- a/Longbow/plugins/schedulers/sge.py +++ b/Longbow/plugins/schedulers/sge.py @@ -37,15 +37,8 @@ import os import re -try: - - import corelibs.exceptions as exceptions - import corelibs.shellwrappers as shellwrappers - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions - import Longbow.corelibs.shellwrappers as shellwrappers +import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.shellwrappers as shellwrappers QUERY_STRING = "env | grep -i 'sge'" diff --git a/Longbow/plugins/schedulers/slurm.py b/Longbow/plugins/schedulers/slurm.py index e45fbb8..542f175 100755 --- a/Longbow/plugins/schedulers/slurm.py +++ b/Longbow/plugins/schedulers/slurm.py @@ -38,15 +38,8 @@ import os import re -try: - - import corelibs.exceptions as exceptions - import corelibs.shellwrappers as shellwrappers - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions - import Longbow.corelibs.shellwrappers as shellwrappers +import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.shellwrappers as shellwrappers QUERY_STRING = "which sbatch" diff --git a/Longbow/plugins/schedulers/soge.py b/Longbow/plugins/schedulers/soge.py index b393372..9ac12c9 100755 --- a/Longbow/plugins/schedulers/soge.py +++ b/Longbow/plugins/schedulers/soge.py @@ -39,15 +39,8 @@ import os import re -try: - - import corelibs.exceptions as exceptions - import corelibs.shellwrappers as shellwrappers - -except ImportError: - - import Longbow.corelibs.exceptions as exceptions - import Longbow.corelibs.shellwrappers as shellwrappers +import Longbow.corelibs.exceptions as exceptions +import Longbow.corelibs.shellwrappers as shellwrappers QUERY_STRING = "env | grep -i 'sge'"