From a83b4879f38d11634d405d0efe977d482abdc344 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 10 Mar 2011 05:02:24 +0000
Subject: minor fixes from review

---
 nova/image/glance.py |  2 +-
 nova/image/s3.py     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nova/image/glance.py b/nova/image/glance.py
index fb383f5e6..15fca69b8 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -74,7 +74,7 @@ class GlanceImageService(service.BaseImageService):
             if name == cantidate.get('name'):
                 image = cantidate
                 break
-        if image == None:
+        if image is None:
             raise exception.NotFound
         return image
 
diff --git a/nova/image/s3.py b/nova/image/s3.py
index bf104c29a..bbc54c263 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -77,17 +77,17 @@ class S3ImageService(service.BaseImageService):
         # FIXME(vish): detail doesn't filter so we do it manually
         return self._filter(context, images)
 
-    @staticmethod
-    def _is_visible(context, image):
+    @classmethod
+    def _is_visible(cls, context, image):
         return (context.is_admin
                 or context.project_id == image['properties']['owner_id']
                 or image['properties']['is_public'] == 'True')
 
-    @staticmethod
-    def _filter(context, images):
+    @classmethod
+    def _filter(cls, context, images):
         filtered = []
         for image in images:
-            if not S3ImageService._is_visible(context, image):
+            if not cls._is_visible(context, image):
                 continue
             filtered.append(image)
         return filtered
@@ -148,7 +148,7 @@ class S3ImageService(service.BaseImageService):
                 image_format = 'aki'
                 image_type = 'kernel'
                 kernel_id = None
-        except:
+        except Exception:
             kernel_id = None
 
         try:
@@ -157,12 +157,12 @@ class S3ImageService(service.BaseImageService):
                 image_format = 'ari'
                 image_type = 'ramdisk'
                 ramdisk_id = None
-        except:
+        except Exception:
             ramdisk_id = None
 
         try:
             arch = manifest.find("machine_configuration/architecture").text
-        except:
+        except Exception:
             arch = 'x86_64'
 
         properties = metadata['properties']
@@ -235,7 +235,7 @@ class S3ImageService(service.BaseImageService):
 
     @staticmethod
     def _decrypt_image(encrypted_filename, encrypted_key, encrypted_iv,
-                      cloud_private_key, decrypted_filename):
+                       cloud_private_key, decrypted_filename):
         key, err = utils.execute(
                 'openssl rsautl -decrypt -inkey %s' % cloud_private_key,
                 process_input=encrypted_key,
-- 
cgit