Clean up pylint errors in top-level files
Change-Id: Ida7cf1ff0cbf94ad82c7a75708c79ad7bb27f7fd
This commit is contained in:
parent
783ac027f9
commit
d73a004644
@ -24,10 +24,10 @@ SHOULD include dedicated exception logging.
|
||||
|
||||
"""
|
||||
|
||||
from functools import wraps
|
||||
import functools
|
||||
import sys
|
||||
|
||||
from novaclient import exceptions as novaclient_exceptions
|
||||
import novaclient.exceptions
|
||||
import webob.exc
|
||||
|
||||
from nova import log as logging
|
||||
@ -51,7 +51,7 @@ def novaclient_converter(f):
|
||||
try:
|
||||
ret = f(*args, **kwargs)
|
||||
return ret
|
||||
except novaclient_exceptions.ClientException, e:
|
||||
except novaclient.exceptions.ClientException, e:
|
||||
raise ConvertedException(e.code, e.message, e.details)
|
||||
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
|
||||
raise exc_info[0], exc_info[1], exc_info[2]
|
||||
|
||||
return wraps(f)(wrapped)
|
||||
return functools.wraps(f)(wrapped)
|
||||
return inner
|
||||
|
||||
|
||||
|
@ -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 log as logging
|
||||
from nova.db import base
|
||||
from nova.scheduler import api
|
||||
from nova import version
|
||||
|
||||
|
@ -19,7 +19,6 @@
|
||||
"""Quotas for instances, volumes, and floating ips."""
|
||||
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import flags
|
||||
|
||||
|
||||
|
@ -31,13 +31,11 @@ import unittest
|
||||
|
||||
import mox
|
||||
import nose.plugins.skip
|
||||
import nova.image.fake
|
||||
import shutil
|
||||
import stubout
|
||||
|
||||
from nova import flags
|
||||
import nova.image.fake
|
||||
from nova import log
|
||||
from nova import rpc
|
||||
from nova import utils
|
||||
from nova import service
|
||||
from nova.testing.fake import rabbit
|
||||
|
@ -25,7 +25,6 @@ import functools
|
||||
import inspect
|
||||
import json
|
||||
import lockfile
|
||||
import netaddr
|
||||
import os
|
||||
import random
|
||||
import re
|
||||
@ -43,11 +42,11 @@ from eventlet import event
|
||||
from eventlet import greenthread
|
||||
from eventlet import semaphore
|
||||
from eventlet.green import subprocess
|
||||
import netaddr
|
||||
|
||||
from nova import exception
|
||||
from nova import flags
|
||||
from nova import log as logging
|
||||
from nova import version
|
||||
|
||||
|
||||
LOG = logging.getLogger("nova.utils")
|
||||
|
@ -19,20 +19,16 @@
|
||||
|
||||
"""Utility methods for working with WSGI servers."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
from xml.dom import minidom
|
||||
|
||||
import eventlet
|
||||
import eventlet.wsgi
|
||||
import greenlet
|
||||
from paste import deploy
|
||||
import routes.middleware
|
||||
import webob.dec
|
||||
import webob.exc
|
||||
|
||||
from paste import deploy
|
||||
|
||||
from nova import exception
|
||||
from nova import flags
|
||||
from nova import log as logging
|
||||
|
Loading…
Reference in New Issue
Block a user