x/gantt
Code Issues Proposed changes

Clean up pylint errors in top-level files

Browse Source 
Change-Id: Ida7cf1ff0cbf94ad82c7a75708c79ad7bb27f7fd
This commit is contained in:
Brian Waldon
2011-12-29 10:55:42 -05:00
parent bc4162e10d
commit e659b80a27
6 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/exception.py
View File

@@ -24,10 +24,10 @@ SHOULD include dedicated exception logging.
""" """
from functools import wraps import functools
import sys import sys
from novaclient import exceptions as novaclient_exceptions import novaclient.exceptions
import webob.exc import webob.exc
from nova import log as logging from nova import log as logging
@@ -51,7 +51,7 @@ def novaclient_converter(f):
try: try:
ret = f(*args, **kwargs) ret = f(*args, **kwargs)
return ret return ret
except novaclient_exceptions.ClientException, e: except novaclient.exceptions.ClientException, e:
raise ConvertedException(e.code, e.message, e.details) raise ConvertedException(e.code, e.message, e.details)
return new_f return new_f
@@ -156,7 +156,7 @@ def wrap_exception(notifier=None, publisher_id=None, event_type=None,
# re-raise original exception since it may have been clobbered # re-raise original exception since it may have been clobbered
raise exc_info[0], exc_info[1], exc_info[2] raise exc_info[0], exc_info[1], exc_info[2]
return wraps(f)(wrapped) return functools.wraps(f)(wrapped)
return inner return inner

2
nova/manager.py
View File

@@ -53,9 +53,9 @@ This module provides Manager, a base class for managers.
""" """
from nova.db import base
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
from nova.db import base
from nova.scheduler import api from nova.scheduler import api
from nova import version from nova import version

1
nova/quota.py
View File

@@ -19,7 +19,6 @@
"""Quotas for instances, volumes, and floating ips.""" """Quotas for instances, volumes, and floating ips."""
from nova import db from nova import db
from nova import exception
from nova import flags from nova import flags

4
nova/test.py
View File

@@ -31,13 +31,11 @@ import unittest
import mox import mox
import nose.plugins.skip import nose.plugins.skip
import nova.image.fake
import shutil
import stubout import stubout
from nova import flags from nova import flags
import nova.image.fake
from nova import log from nova import log
from nova import rpc
from nova import utils from nova import utils
from nova import service from nova import service
from nova.testing.fake import rabbit from nova.testing.fake import rabbit

3
nova/utils.py
View File

@@ -25,7 +25,6 @@ import functools
import inspect import inspect
import json import json
import lockfile import lockfile
import netaddr
import os import os
import random import random
import re import re
@@ -43,11 +42,11 @@ from eventlet import event
from eventlet import greenthread from eventlet import greenthread
from eventlet import semaphore from eventlet import semaphore
from eventlet.green import subprocess from eventlet.green import subprocess
import netaddr
from nova import exception from nova import exception
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
from nova import version
LOG = logging.getLogger("nova.utils") LOG = logging.getLogger("nova.utils")

6
nova/wsgi.py
View File

@@ -19,20 +19,16 @@
"""Utility methods for working with WSGI servers.""" """Utility methods for working with WSGI servers."""
import os
import sys import sys
from xml.dom import minidom
import eventlet import eventlet
import eventlet.wsgi import eventlet.wsgi
import greenlet import greenlet
from paste import deploy
import routes.middleware import routes.middleware
import webob.dec import webob.dec
import webob.exc import webob.exc
from paste import deploy
from nova import exception from nova import exception
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging