diff options
| author | Steve Leon <steve.leon@hp.com> | 2013-11-14 15:44:18 -0800 |
|---|---|---|
| committer | Steve Leon <steve.leon@hp.com> | 2013-11-14 15:44:18 -0800 |
| commit | 0f9617cb55ac8c5951baf8547e354c9927324d99 (patch) | |
| tree | 1edd0b473fe2e9ecd46e68b8a046dc45dbbdaf19 /openstack_dashboard/exceptions.py | |
| parent | e543879af607aab8b3d6260358964223a0ec677c (diff) | |
| download | horizon-0f9617cb55ac8c5951baf8547e354c9927324d99.tar.gz | |
Importing from trove-client compat first
- Switched the logic so that the compat version is imported first
Fixes bug #1250237
Change-Id: I7650fc6c3ce93164ca8bee610d5fe2293df3ecc7
Diffstat (limited to 'openstack_dashboard/exceptions.py')
| -rw-r--r-- | openstack_dashboard/exceptions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack_dashboard/exceptions.py b/openstack_dashboard/exceptions.py index d44a9f816..78e677f4f 100644 --- a/openstack_dashboard/exceptions.py +++ b/openstack_dashboard/exceptions.py @@ -26,11 +26,11 @@ from neutronclient.common import exceptions as neutronclient from novaclient import exceptions as novaclient from swiftclient import client as swiftclient try: - from troveclient import exceptions as troveclient + from troveclient.compat import exceptions as troveclient with_trove = True except ImportError: try: - from troveclient.compat import exceptions as troveclient + from troveclient import exceptions as troveclient with_trove = True except ImportError: with_trove = False |