Merge branch 'v1_18_bosco' into sw2929_fix_mem_parsing

Author: brianhlin

src/scripts/blah.py

@@ -1,8 +1,8 @@
 """Common functions for BLAH python scripts"""
 
-import os
 from ConfigParser import RawConfigParser
-from io import StringIO
+# TODO: io.StringIO is preferred in Python3 since it handles unicode-encoded files
+from StringIO import StringIO
 
 class BlahConfigParser(RawConfigParser, object):
 
@@ -12,7 +12,7 @@ def __init__(self, path='/etc/blah.config', defaults=None):
         self.header = 'blahp'
         with open(path) as f:
             config = f.read()
-        vfile = StringIO(u'[%s]\n%s' % (self.header, config))
+        vfile = StringIO('[%s]\n%s' % (self.header, config))
 
         super(BlahConfigParser, self).__init__(defaults=defaults)
         # TODO: readfp() is replaced by read_file() in Python 3.2+

src/scripts/pbs_status.py

@@ -40,6 +40,7 @@
 import subprocess
 import signal
 import tempfile
+import traceback
 import pickle
 import csv
 
@@ -587,5 +588,6 @@ def main():
     except SystemExit:
         raise
     except Exception, e:
+        log(traceback.format_exc())
         print "1ERROR: %s" % str(e).replace("\n", "\\n")
         sys.exit(0)

src/scripts/slurm_status.py

@@ -40,6 +40,7 @@
 import subprocess
 import signal
 import tempfile
+import traceback
 import pickle
 import csv
 
@@ -555,5 +556,6 @@ def main():
     except SystemExit:
         raise
     except Exception, e:
+        log(traceback.format_exc())
         print "1ERROR: %s" % str(e).replace("\n", "\\n")
         sys.exit(0)