diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-27 02:08:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-27 02:08:47 +0000 |
| commit | 5b713c009bfa783fbfcc0e693e73c9d637e677f3 (patch) | |
| tree | 74d133ecc61b5927d484880d37a23a2e079f9878 /troveclient/compat/common.py | |
| parent | 3fbb0074d1defa2336ea9934d6785342f5bb6519 (diff) | |
| parent | bbd51cfe30de41f14f15a5063c2c5208f4740e5d (diff) | |
| download | python-troveclient-1.0.4.tar.gz | |
Merge "Get rid of XML related trove client bindings"1.0.4
Diffstat (limited to 'troveclient/compat/common.py')
| -rw-r--r-- | troveclient/compat/common.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/troveclient/compat/common.py b/troveclient/compat/common.py index eea7719..3321880 100644 --- a/troveclient/compat/common.py +++ b/troveclient/compat/common.py @@ -21,7 +21,6 @@ import six import sys from troveclient.compat import client -from troveclient.compat import xml from troveclient.compat import exceptions from troveclient.openstack.common.py3kcompat import urlutils @@ -102,7 +101,6 @@ class CliOptions(object): 'verbose': False, 'debug': False, 'token': None, - 'xml': None, } def __init__(self, **kwargs): @@ -177,12 +175,11 @@ class CliOptions(object): add_option("insecure", action="store_true", help="Run in insecure mode for https endpoints.") add_option("token", help="Token from a prior login.") - add_option("xml", action="store_true", help="Changes format to XML.") - oparser.add_option("--secure", action="store_false", dest="insecure", - help="Run in insecure mode for https endpoints.") oparser.add_option("--json", action="store_false", dest="xml", help="Changes format to JSON.") + oparser.add_option("--secure", action="store_false", dest="insecure", + help="Run in insecure mode for https endpoints.") oparser.add_option("--terse", action="store_false", dest="verbose", help="Toggles verbose mode off.") oparser.add_option("--hide-debug", action="store_false", dest="debug", @@ -218,10 +215,7 @@ class CommandsBase(object): def _get_client(self): """Creates the all important client object.""" try: - if self.xml: - client_cls = xml.TroveXmlClient - else: - client_cls = client.TroveHTTPClient + client_cls = client.TroveHTTPClient if self.verbose: client.log_to_streamhandler(sys.stdout) client.RDC_PP = True |