Merge "Importing from trove-client compat"
This commit is contained in:
commit
3649ac7d23
|
@ -42,7 +42,11 @@ try:
|
||||||
from troveclient import client as trove_client
|
from troveclient import client as trove_client
|
||||||
with_trove = True
|
with_trove = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
with_trove = False
|
try:
|
||||||
|
from troveclient.compat import client as trove_client
|
||||||
|
with_trove = True
|
||||||
|
except ImportError:
|
||||||
|
with_trove = False
|
||||||
|
|
||||||
import httplib2
|
import httplib2
|
||||||
import mox
|
import mox
|
||||||
|
|
Loading…
Reference in New Issue