openstack/heat
Code Issues Proposed changes

Merge "Remove conditional import"

Browse Source
This commit is contained in:
Jenkins 2016-04-16 21:03:38 +00:00 committed by Gerrit Code Review
commit a2fbb93a20
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/clients/os/magnum.py
View File

@ -11,18 +11,13 @@
# License for the specific language governing permissions and limitations
# under the License.
from magnumclient.common.apiclient import exceptions as mc_exc
from magnumclient.v1 import client as magnum_client
from heat.common import exception
from heat.engine.clients import client_plugin
from heat.engine import constraints
try:
from magnumclient.common.apiclient import exceptions as mc_exc
except ImportError:
# NOTE (duvarenkov): For magnumclient versions before 2.0.0.
from magnumclient.openstack.common.apiclient import exceptions as mc_exc
CLIENT_NAME = 'magnum'

7
heat/tests/openstack/magnum/test_bay.py
View File

@ -12,6 +12,7 @@
# under the License.
import copy
from magnumclient.common.apiclient import exceptions as mc_exc
import mock
from oslo_config import cfg
import six
@ -26,12 +27,6 @@ from heat.engine import template
from heat.tests import common
from heat.tests import utils
try:
from magnumclient.common.apiclient import exceptions as mc_exc
except ImportError:
# NOTE (duvarenkov): For magnumclient versions before 2.0.0.
from magnumclient.openstack.common.apiclient import exceptions as mc_exc
magnum_template = '''
heat_template_version: 2015-04-30