Merge "Sync gettextutils fixes from openstack-common."
This commit is contained in:
commit
57338dd6f0
|
@ -41,6 +41,7 @@ import sys
|
|||
import traceback
|
||||
|
||||
from nova.openstack.common import cfg
|
||||
from nova.openstack.common.gettextutils import _
|
||||
from nova.openstack.common import jsonutils
|
||||
from nova.openstack.common import local
|
||||
from nova.openstack.common import notifier
|
||||
|
|
|
@ -18,6 +18,7 @@ import uuid
|
|||
|
||||
from nova.openstack.common import cfg
|
||||
from nova.openstack.common import context
|
||||
from nova.openstack.common.gettextutils import _
|
||||
from nova.openstack.common import importutils
|
||||
from nova.openstack.common import jsonutils
|
||||
from nova.openstack.common import log as logging
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
# under the License.
|
||||
|
||||
from nova.openstack.common import cfg
|
||||
from nova.openstack.common.gettextutils import _
|
||||
from nova.openstack.common import importutils
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
from nova.openstack.common import cfg
|
||||
from nova.openstack.common import context as req_context
|
||||
from nova.openstack.common.gettextutils import _
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import rpc
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@ import logging
|
|||
import urllib
|
||||
import urllib2
|
||||
|
||||
from nova.openstack.common.gettextutils import _
|
||||
from nova.openstack.common import jsonutils
|
||||
|
||||
|
||||
|
|
|
@ -36,6 +36,7 @@ from eventlet import semaphore
|
|||
|
||||
from nova.openstack.common import excutils
|
||||
from nova.openstack.common import local
|
||||
from nova.openstack.common.gettextutils import _
|
||||
from nova.openstack.common.rpc import common as rpc_common
|
||||
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@ import json
|
|||
import logging
|
||||
|
||||
from nova.openstack.common import cfg
|
||||
from nova.openstack.common.gettextutils import _
|
||||
|
||||
|
||||
matchmaker_opts = [
|
||||
|
|
Loading…
Reference in New Issue