From 2773234c3fd8745e78ae8a8578e128cf9040d599 Mon Sep 17 00:00:00 2001
From: Christopher Johnston <chjohnst@gmail.com>
Date: Wed, 29 Feb 2012 09:30:02 -0800
Subject: [PATCH] python 2.5 does not include json so lets try to use
 simplejson

---
 bin/ansible           | 6 +++++-
 lib/ansible/runner.py | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/ansible b/bin/ansible
index 1591e28b63..909e62b40b 100755
--- a/bin/ansible
+++ b/bin/ansible
@@ -17,9 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
 from optparse import OptionParser
 import sys
-import json
 import os
 import getpass
 import shlex
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