Merge pull request #1 from katzj/centos5-simplejson

Fall back to standalone simplejson module

Merge pull request #1 from katzj/centos5-simplejson
Fall back to standalone simplejson module
6bebedd7 · Michael DeHaan · 7be8d134 · ef8ea134 · 6bebedd7 · 6bebedd7
Commit 6bebedd7 authored Feb 23, 2012 by Michael DeHaan
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

library/command
+4 -1

library/ping
+4 -1

No files found.
--- a/library/command
+++ b/library/command
 #!/usr/bin/python

-import json
+try:
+	import json
+except ImportError:
+	import simplejson as json
 import subprocess
 import sys
 import datetime

--- a/library/ping
+++ b/library/ping
 #!/usr/bin/python

-import json
+try:
+	import json
+except ImportError:
+	import simplejson as json

 print json.dumps(1)