diff options
| author | Christopher Johnston <chjohnst@gmail.com> | 2012-02-29 18:30:02 +0100 |
|---|---|---|
| committer | Christopher Johnston <chjohnst@gmail.com> | 2012-02-29 18:30:02 +0100 |
| commit | 2773234c3fd8745e78ae8a8578e128cf9040d599 (patch) | |
| tree | a4b27d8402f4358e9986dfbde907e938ce5510a8 /lib | |
| parent | Trim errors on connection refused messages (diff) | |
| download | ansible-2773234c3fd8745e78ae8a8578e128cf9040d599.tar.xz ansible-2773234c3fd8745e78ae8a8578e128cf9040d599.zip | |
python 2.5 does not include json so lets try to use simplejson
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/ansible/runner.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py index aad7553259..8a343a37d6 100755 --- a/lib/ansible/runner.py +++ b/lib/ansible/runner.py @@ -16,11 +16,15 @@ # along with Ansible. If not, see <http://www.gnu.org/licenses/>. # +try: + import json +except ImportError: + import simplejson as json + import fnmatch import multiprocessing import signal import os -import json import traceback import paramiko # non-core dependency import ansible.constants as C |