Clean up oslo imports
We used to put `try / except ImportError` around oslo lib imports to support both the `oslo_lib` and `oslo.lib` name patterns. It is now useless since the newer versions of these libs all support the `import oslo_lib` pattern. Tested on CentOS 7 with the OpenStack Liberty repository. Tested on Ubuntu 14.04 with OpenStack Liberty CloudArchive repository. Change-Id: I7a147586d7a933506df62e34424e5fc57b3ff503 Sem-Ver: bugfix
This commit is contained in:
parent
06f36e5e51
commit
30a67fac85
@ -1,7 +1,4 @@
|
||||
try:
|
||||
from oslo_config import cfg
|
||||
except ImportError:
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
__author__ = "Lisa Zangrando"
|
||||
__email__ = "lisa.zangrando[AT]pd.infn.it"
|
||||
|
@ -3,10 +3,7 @@ import os
|
||||
import signal
|
||||
import sys
|
||||
|
||||
try:
|
||||
from oslo_config import cfg
|
||||
except ImportError:
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
|
||||
__author__ = "Lisa Zangrando"
|
||||
|
@ -9,10 +9,7 @@ from cgi import escape
|
||||
from cgi import parse_qs
|
||||
from pkg_resources import iter_entry_points
|
||||
|
||||
try:
|
||||
from oslo_config import cfg
|
||||
except ImportError:
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from synergy.common import config
|
||||
from synergy.common.manager import Manager
|
||||
|
Loading…
Reference in New Issue
Block a user