Merge "Importing from trove-client compat"

This commit is contained in:
Jenkins 2013-11-13 17:02:13 +00:00 committed by Gerrit Code Review
commit 3649ac7d23
1 changed files with 5 additions and 1 deletions

View File

@ -42,7 +42,11 @@ try:
from troveclient import client as trove_client
with_trove = True
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 mox