cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #55 from chjohnst/master

Browse source 
python 2.5 dep
This commit is contained in:
Michael DeHaan 2012-02-29 09:36:39 -08:00
commit f2a0346080
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/ansible
View file

@ -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

6
lib/ansible/runner.py
View file

@ -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