Clean imports in code

In some part in the code we import objects.
In the Openstack style guidelines they recommend to import only
modules.

http://docs.openstack.org/developer/hacking/#imports

Change-Id: Ie752a6115effac5e2539f27340bd6f922e9dae58
This commit is contained in:
Nguyen Hung Phuong 2016-08-24 15:49:31 +07:00
parent a1f01ab73e
commit e09fdeddad
3 changed files with 16 additions and 15 deletions

View File

@ -11,25 +11,26 @@
# License for the specific language governing permissions and limitations
# under the License.
from bilean.api.middleware.context import ContextMiddleware
from bilean.api.middleware.fault import FaultWrapper
from bilean.api.middleware.ssl import SSLMiddleware
from bilean.api.middleware.version_negotiation import VersionNegotiationFilter
from bilean.api.middleware import context
from bilean.api.middleware import fault
from bilean.api.middleware import ssl
from bilean.api.middleware import version_negotiation
from bilean.api.openstack import versions
def version_negotiation_filter(app, conf, **local_conf):
return VersionNegotiationFilter(versions.Controller, app,
conf, **local_conf)
return version_negotiation.VersionNegotiationFilter(versions.Controller,
app,
conf, **local_conf)
def faultwrap_filter(app, conf, **local_conf):
return FaultWrapper(app)
return fault.FaultWrapper(app)
def sslmiddleware_filter(app, conf, **local_conf):
return SSLMiddleware(app)
return ssl.SSLMiddleware(app)
def contextmiddleware_filter(app, conf, **local_conf):
return ContextMiddleware(app)
return context.ContextMiddleware(app)

View File

@ -20,7 +20,7 @@ import random
import six
import string
from cryptography.fernet import Fernet
from cryptography import fernet
import requests
from requests import exceptions
from six.moves import urllib
@ -124,8 +124,8 @@ def encrypt(msg):
:param msg: message to be encrypted
:returns: encrypted msg and key to decrypt
'''
password = Fernet.generate_key()
f = Fernet(password)
password = fernet.Fernet.generate_key()
f = fernet.Fernet(password)
key = f.encrypt(encodeutils.safe_encode(msg))
return encodeutils.safe_decode(password), encodeutils.safe_decode(key)
@ -137,7 +137,7 @@ def decrypt(msg, key):
:param key: key used to decrypt
:returns: decrypted message string
'''
f = Fernet(encodeutils.safe_encode(msg))
f = fernet.Fernet(encodeutils.safe_encode(msg))
msg = f.decrypt(encodeutils.safe_encode(key))
return encodeutils.safe_decode(msg)

View File

@ -24,7 +24,7 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import timeutils
from apscheduler.schedulers.background import BackgroundScheduler
from apscheduler.schedulers import background
from datetime import timedelta
import random
import six
@ -71,7 +71,7 @@ class CronScheduler(object):
def __init__(self, **kwargs):
super(CronScheduler, self).__init__()
self._scheduler = BackgroundScheduler()
self._scheduler = background.BackgroundScheduler()
self.scheduler_id = kwargs.get('scheduler_id')
self.rpc_client = rpc_client.EngineClient()
if cfg.CONF.scheduler.store_ap_job: