summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2011-12-28 18:11:59 -0800
committerJoe Gordon <jogo@cloudscaling.com>2011-12-28 18:11:59 -0800
commit4ea63c4021b09b74997bf252aa656b7144dc54e4 (patch)
tree83ce6f844595304079da181e5181cde8b3e32882
parent599760a1f8da32f4d689249550d23b3ffc119d0b (diff)
Brings some more files up to HACKING standards
Change-Id: I738fb70d49dade90d31e8c848fa841497083e9b4
-rw-r--r--bin/nova-logspool4
-rwxr-xr-xbin/nova-manage8
-rwxr-xr-xbin/nova-spoolsentry4
3 files changed, 8 insertions, 8 deletions
diff --git a/bin/nova-logspool b/bin/nova-logspool
index a876f4c71..ccb7effc1 100644
--- a/bin/nova-logspool
+++ b/bin/nova-logspool
@@ -123,7 +123,7 @@ class LogReader(object):
mkdir = False
try:
os.stat(d)
- except:
+ except Exception:
mkdir = True
if mkdir:
os.mkdir(d)
@@ -133,7 +133,7 @@ class LogReader(object):
try:
os.stat("%s/%s" % (processed_dir, rid))
rv = True
- except:
+ except Exception:
pass
return rv
diff --git a/bin/nova-manage b/bin/nova-manage
index d82d67ea4..51b5597d2 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1391,7 +1391,7 @@ class VsaCommands(object):
if storage is not None:
try:
storage_list = ast.literal_eval(storage)
- except:
+ except Exception:
print _("Invalid string format %s") % storage
raise
@@ -1580,7 +1580,7 @@ class VsaDriveTypeCommands(object):
except exception.DBError, e:
print "DB Error: %s" % e
sys.exit(2)
- except:
+ except Exception:
sys.exit(3)
else:
print "%s %s" % (name, verb)
@@ -1740,7 +1740,7 @@ class InstanceTypeCommands(object):
print "Currently defined instance_type names and flavorids:"
self.list("--all")
sys.exit(2)
- except:
+ except Exception:
print "Unknown error"
sys.exit(3)
else:
@@ -1765,7 +1765,7 @@ class InstanceTypeCommands(object):
except exception.DBError, e:
print "DB Error: %s" % e
sys.exit(2)
- except:
+ except Exception:
sys.exit(3)
else:
print "%s %s" % (name, verb)
diff --git a/bin/nova-spoolsentry b/bin/nova-spoolsentry
index c53482852..8f54b0929 100755
--- a/bin/nova-spoolsentry
+++ b/bin/nova-spoolsentry
@@ -28,7 +28,7 @@ import urllib
import urllib2
try:
import cPickle as pickle
-except:
+except Exception:
import pickle
@@ -51,7 +51,7 @@ class SpoolSentry(object):
self.send_data(data)
destfile = "%s/processed/%s" % (self.spool_dir, fname)
shutil.move(sourcefile, destfile)
- except:
+ except Exception:
logging.exception("Unable to upload record %s", fname)
raise