Merge "Fix import ordering in /bin scripts."

This commit is contained in:
Jenkins 2012-11-09 18:05:55 +00:00 committed by Gerrit Code Review
commit 39958a83a9
3 changed files with 3 additions and 3 deletions

View File

@ -40,9 +40,9 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
gettext.install('nova', unicode=1) gettext.install('nova', unicode=1)
from nova import config
from nova import context from nova import context
from nova import exception from nova import exception
from nova import config
from nova import flags from nova import flags
from nova.openstack.common import cfg from nova.openstack.common import cfg
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

View File

@ -31,8 +31,8 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
from nova.consoleauth import manager
from nova import config from nova import config
from nova.consoleauth import manager
from nova import flags from nova import flags
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova import service from nova import service

View File

@ -35,9 +35,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
gettext.install('nova', unicode=1) gettext.install('nova', unicode=1)
from nova import config
from nova import context from nova import context
from nova import db from nova import db
from nova import config
from nova import flags from nova import flags
from nova.network import linux_net from nova.network import linux_net
from nova.network import rpcapi as network_rpcapi from nova.network import rpcapi as network_rpcapi