Brings some more files up to HACKING standards

Change-Id: I738fb70d49dade90d31e8c848fa841497083e9b4
This commit is contained in:
Joe Gordon
2011-12-28 18:11:59 -08:00
parent c9b125631d
commit c4462da2e0
3 changed files with 8 additions and 8 deletions

View File

@@ -123,7 +123,7 @@ class LogReader(object):
mkdir = False mkdir = False
try: try:
os.stat(d) os.stat(d)
except: except Exception:
mkdir = True mkdir = True
if mkdir: if mkdir:
os.mkdir(d) os.mkdir(d)
@@ -133,7 +133,7 @@ class LogReader(object):
try: try:
os.stat("%s/%s" % (processed_dir, rid)) os.stat("%s/%s" % (processed_dir, rid))
rv = True rv = True
except: except Exception:
pass pass
return rv return rv

View File

@@ -1391,7 +1391,7 @@ class VsaCommands(object):
if storage is not None: if storage is not None:
try: try:
storage_list = ast.literal_eval(storage) storage_list = ast.literal_eval(storage)
except: except Exception:
print _("Invalid string format %s") % storage print _("Invalid string format %s") % storage
raise raise
@@ -1580,7 +1580,7 @@ class VsaDriveTypeCommands(object):
except exception.DBError, e: except exception.DBError, e:
print "DB Error: %s" % e print "DB Error: %s" % e
sys.exit(2) sys.exit(2)
except: except Exception:
sys.exit(3) sys.exit(3)
else: else:
print "%s %s" % (name, verb) print "%s %s" % (name, verb)
@@ -1740,7 +1740,7 @@ class InstanceTypeCommands(object):
print "Currently defined instance_type names and flavorids:" print "Currently defined instance_type names and flavorids:"
self.list("--all") self.list("--all")
sys.exit(2) sys.exit(2)
except: except Exception:
print "Unknown error" print "Unknown error"
sys.exit(3) sys.exit(3)
else: else:
@@ -1765,7 +1765,7 @@ class InstanceTypeCommands(object):
except exception.DBError, e: except exception.DBError, e:
print "DB Error: %s" % e print "DB Error: %s" % e
sys.exit(2) sys.exit(2)
except: except Exception:
sys.exit(3) sys.exit(3)
else: else:
print "%s %s" % (name, verb) print "%s %s" % (name, verb)

View File

@@ -28,7 +28,7 @@ import urllib
import urllib2 import urllib2
try: try:
import cPickle as pickle import cPickle as pickle
except: except Exception:
import pickle import pickle
@@ -51,7 +51,7 @@ class SpoolSentry(object):
self.send_data(data) self.send_data(data)
destfile = "%s/processed/%s" % (self.spool_dir, fname) destfile = "%s/processed/%s" % (self.spool_dir, fname)
shutil.move(sourcefile, destfile) shutil.move(sourcefile, destfile)
except: except Exception:
logging.exception("Unable to upload record %s", fname) logging.exception("Unable to upload record %s", fname)
raise raise