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 | |
| 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')
| -rw-r--r-- | packaging/language/composer.py | 7 | ||||
| -rw-r--r-- | packaging/language/npm.py | 7 | ||||
| -rw-r--r-- | packaging/os/pacman.py | 1 | ||||
| -rw-r--r-- | packaging/os/pkgin.py | 1 | ||||
| -rw-r--r-- | packaging/os/pkgng.py | 1 | ||||
| -rw-r--r-- | packaging/os/portinstall.py | 1 | ||||
| -rw-r--r-- | packaging/os/urpmi.py | 1 |
7 files changed, 12 insertions, 7 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() diff --git a/packaging/language/npm.py b/packaging/language/npm.py index a52b7599..43fa1f32 100644 --- a/packaging/language/npm.py +++ b/packaging/language/npm.py @@ -107,7 +107,12 @@ import os 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 + class Npm(object): def __init__(self, module, **kwargs): diff --git a/packaging/os/pacman.py b/packaging/os/pacman.py index 1f955fa2..7aa5bf45 100644 --- a/packaging/os/pacman.py +++ b/packaging/os/pacman.py @@ -109,7 +109,6 @@ EXAMPLES = ''' - pacman: name=baz state=absent force=yes ''' -import json import shlex import os import re diff --git a/packaging/os/pkgin.py b/packaging/os/pkgin.py index 0f2714b6..cdba6a92 100644 --- a/packaging/os/pkgin.py +++ b/packaging/os/pkgin.py @@ -63,7 +63,6 @@ EXAMPLES = ''' ''' -import json import shlex import os import sys diff --git a/packaging/os/pkgng.py b/packaging/os/pkgng.py index 0eafcb6d..ad097aae 100644 --- a/packaging/os/pkgng.py +++ b/packaging/os/pkgng.py @@ -85,7 +85,6 @@ EXAMPLES = ''' ''' -import json import shlex import os import re diff --git a/packaging/os/portinstall.py b/packaging/os/portinstall.py index b4e30441..a5d0e510 100644 --- a/packaging/os/portinstall.py +++ b/packaging/os/portinstall.py @@ -58,7 +58,6 @@ EXAMPLES = ''' ''' -import json import shlex import os import sys diff --git a/packaging/os/urpmi.py b/packaging/os/urpmi.py index d344f2e7..0b9ec929 100644 --- a/packaging/os/urpmi.py +++ b/packaging/os/urpmi.py @@ -73,7 +73,6 @@ EXAMPLES = ''' ''' -import json import shlex import os import sys |