Merge lp:~justin-fathomdb/nova/fix-pylint-servers into lp:~hudson-openstack/nova/trunk

[justinsb]

Fix some errors that pylint found in nova/api/openstack/servers.py

This was meant more as a test that pylint is actually being helpful now (it is), but these are real errors.

[Matt Dietz (cerberus)]

lgtm.

review: Approve

[Josh Kearney (jk0)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

Attempt to merge into lp:nova failed due to conflicts:

text conflict in nova/api/openstack/servers.py

[justinsb (justin-fathomdb)]

Merged with trunk. Interm changes have made that file a bit of a pylint disaster zone again :-(

=== modified file 'nova/api/openstack/servers.py'
--- nova/api/openstack/servers.py	2011-03-24 05:08:17 +0000
+++ nova/api/openstack/servers.py	2011-03-24 17:57:21 +0000
@@ -15,19 +15,19 @@
 
 import base64
 import hashlib
-import json
 import traceback
+
+from webob import exc
 from xml.dom import minidom
 
-from webob import exc
-
 from nova import compute
 from nova import context
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova import quota
+from nova import utils
 from nova import wsgi
-from nova import utils
 from nova.api.openstack import common
 from nova.api.openstack import faults
 import nova.api.openstack.views.addresses
@@ -36,7 +36,6 @@
 from nova.auth import manager as auth_manager
 from nova.compute import instance_types
 from nova.compute import power_state
-from nova.quota import QuotaError
 import nova.api.openstack
 
 
@@ -156,8 +155,8 @@
                 key_data=key_data,
                 metadata=metadata,
                 injected_files=injected_files)
-        except QuotaError as error:
-            self._handle_quota_errors(error)
+        except quota.QuotaError as error:
+            self._handle_quota_error(error)
 
         inst['instance_type'] = flavor_id
         inst['image_id'] = requested_image_id
@@ -211,7 +210,7 @@
             injected_files.append((path, contents))
         return injected_files
 
-    def _handle_quota_errors(self, error):
+    def _handle_quota_error(self, error):
         """
         Reraise quota errors as api-specific http exceptions
         """
@@ -242,7 +241,7 @@
             update_dict['admin_pass'] = inst_dict['server']['adminPass']
             try:
                 self.compute_api.set_admin_password(ctxt, id)
-            except exception.TimeoutException, e:
+            except exception.TimeoutException:
                 return exc.HTTPRequestTimeout()
         if 'name' in inst_dict['server']:
             update_dict['display_name'] = inst_dict['server']['name']