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 /packaging/language/composer.py | |
| 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 'packaging/language/composer.py')
| -rw-r--r-- | packaging/language/composer.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packaging/language/composer.py b/packaging/language/composer.py index 95b0eb3a..5d1ec7b1 100644 --- a/packaging/language/composer.py +++ b/packaging/language/composer.py @@ -128,7 +128,12 @@ import re try: import json except ImportError: - import simplejson as json + try: + import simplejson as json + except ImportError: + # Let snippet from module_utils/basic.py return a proper error in this case + pass + def parse_out(string): return re.sub("\s+", " ", string).strip() |