diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-01-11 12:47:21 -0800 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-01-11 13:06:22 -0800 |
| commit | d6af6f8477d3d1600f3907d4ec1b216c94e67d52 (patch) | |
| tree | f0fe4574d56af1193c4a2c835bf4ac7caad2375d /clustering | |
| parent | 39c3004337b688cd44e711f6eeeb9bc161f0d318 (diff) | |
| download | ansible-modules-extras-json-imports-fallback.tar.gz | |
Update for modules which import json.json-imports-fallback
Some do not use the json module directly so don't need import json.
Some needed to fallback to simplejson with no traceback if neither was installed
Fixes #1298
Diffstat (limited to 'clustering')
| -rw-r--r-- | clustering/consul.py | 5 | ||||
| -rw-r--r-- | clustering/consul_kv.py | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/clustering/consul.py b/clustering/consul.py index 609dce89..627f7fb6 100644 --- a/clustering/consul.py +++ b/clustering/consul.py @@ -191,11 +191,6 @@ EXAMPLES = ''' import sys try: - import json -except ImportError: - import simplejson as json - -try: import consul from requests.exceptions import ConnectionError python_consul_installed = True diff --git a/clustering/consul_kv.py b/clustering/consul_kv.py index bb7dea3a..b61c0ee1 100644 --- a/clustering/consul_kv.py +++ b/clustering/consul_kv.py @@ -123,11 +123,6 @@ EXAMPLES = ''' import sys try: - import json -except ImportError: - import simplejson as json - -try: import consul from requests.exceptions import ConnectionError python_consul_installed = True |