openstack
/
heat-dashboard
Code Issues Proposed changes

Merge "Importing from trove-client compat first"

This commit is contained in:
Jenkins 2013-11-18 02:47:30 +00:00 committed by Gerrit Code Review
parent 3649ac7d23 7a75fda949
commit 0c5ae34a10
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