openstack
/
heat-dashboard
Code Issues Proposed changes

Importing from trove-client compat first 

- Switched the logic so that the compat version is imported first

Fixes bug #1250237

Change-Id: I7650fc6c3ce93164ca8bee610d5fe2293df3ecc7
This commit is contained in:
Steve Leon 2013-11-14 15:44:18 -08:00
parent 3649ac7d23
commit 7a75fda949
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/test/helpers.py
View File

@ -39,11 +39,11 @@ from neutronclient.v2_0 import client as neutron_client
from novaclient.v1_1 import client as nova_client
from swiftclient import client as swift_client
try:
from troveclient import client as trove_client
from troveclient.compat import client as trove_client
with_trove = True
except ImportError:
try:
from troveclient.compat import client as trove_client
from troveclient import client as trove_client
with_trove = True
except ImportError:
with_trove = False