Commit 2773234c by Christopher Johnston

python 2.5 does not include json so lets try to use simplejson

parent ab266472
...@@ -17,9 +17,13 @@ ...@@ -17,9 +17,13 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
try:
import json
except ImportError:
import simplejson as json
from optparse import OptionParser from optparse import OptionParser
import sys import sys
import json
import os import os
import getpass import getpass
import shlex import shlex
......
...@@ -16,11 +16,15 @@ ...@@ -16,11 +16,15 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# #
try:
import json
except ImportError:
import simplejson as json
import fnmatch import fnmatch
import multiprocessing import multiprocessing
import signal import signal
import os import os
import json
import traceback import traceback
import paramiko # non-core dependency import paramiko # non-core dependency
import ansible.constants as C import ansible.constants as C
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment