efbfbf: upgrade to Bugs Everywhere Directory v1.5

[sawsim.git] / pysawsim / manager / pbs.py

diff --git a/pysawsim/manager/pbs.py b/pysawsim/manager/pbs.py
index f98a0aaf9897bf9eb6800636a7fbd75c3d03e214..ca237b0f25e4b23e670552ca6033ce1c626967d4 100644 (file)
--- a/pysawsim/manager/pbs.py
+++ b/pysawsim/manager/pbs.py
@@ -40,9 +40,11 @@ import types
 
 try:
     import pbs
+    _ENABLED = True
+    _DISABLING_ERROR = None
     _SKIP = ''
-except ImportError, pbs_error:
-    pbs = None
+except ImportError, _DISABLING_ERROR:
+    _ENABLED = False
     _SKIP = '  # doctest: +SKIP'
 
 from .. import invoke
@@ -100,8 +102,8 @@ class PBSManager (JobManager):
             'dequeuing from (.*), state (.*)')
 
     def _setup_pbs(self):
-        if pbs == None:
-            raise pbs_error
+        if _ENABLED == False:
+            raise _DISABLING_ERROR
         self._pbs_server = pbs.pbs_default()
         if not self._pbs_server:
             raise Exception('No default server: %s' % pbs.error())