diff options
author | 2019-11-14 17:36:44 +0100 | |
---|---|---|
committer | 2020-02-14 17:34:04 +0100 | |
commit | 9b7e81e78c70514aa123482610e274869b6ba137 (patch) | |
tree | e2e44b515d518825db9240a5e4a8fe2efe0b3126 /dmaap/consulif/consulif.py | |
parent | 4daa9d9a30306cfa6d25999cdc992d886fa405a8 (diff) |
Support python3 in all plugins
Unify tox/requirements/setup.py requirement specifications.
Use cloudify-common 5.0.5 release.
For helm, use a dev cloudify-common build with better python3 code.
Use PEP 508 URLs in requirements for the non-PyPI (github) release.
Fix mixed indentation and trailing whitespace.
Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech>
Issue-ID: CCSDK-1931
Change-Id: I607957d9e2c299121785f3f02420c6038966a200
Diffstat (limited to 'dmaap/consulif/consulif.py')
-rw-r--r-- | dmaap/consulif/consulif.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dmaap/consulif/consulif.py b/dmaap/consulif/consulif.py index 8033603..5c78b89 100644 --- a/dmaap/consulif/consulif.py +++ b/dmaap/consulif/consulif.py @@ -2,6 +2,7 @@ # org.onap.ccsdk # ============================================================================= # Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2020 Pantheon.tech. All rights reserved. # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +19,11 @@ import consul import json -from urlparse import urlparse +try: + from urllib.parse import urlparse +except ImportError: + from urlparse import urlparse + class ConsulHandle(object): ''' |