From 7a75fda949114f40cb74470274a2011a16298204 Mon Sep 17 00:00:00 2001 From: Steve Leon Date: Thu, 14 Nov 2013 15:44:18 -0800 Subject: [PATCH] Importing from trove-client compat first - Switched the logic so that the compat version is imported first Fixes bug #1250237 Change-Id: I7650fc6c3ce93164ca8bee610d5fe2293df3ecc7 --- openstack_dashboard/test/helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack_dashboard/test/helpers.py b/openstack_dashboard/test/helpers.py index 5cfcbaee..d73e346b 100644 --- a/openstack_dashboard/test/helpers.py +++ b/openstack_dashboard/test/helpers.py @@ -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