summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-09 13:35:54 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-09 13:35:54 -0400
commitc37deb3723afa23da8235dd0964ba3f3fef3ad6c (patch)
treeec28957fb1d39033811ad3971b0473adf34c85f4
parenta7d3c9b09694bf120652805f1a7b62b1ae20260e (diff)
parentc589981c50ff68d95ffd5287c3dccb8e28822a47 (diff)
downloadopenshift-c37deb3723afa23da8235dd0964ba3f3fef3ad6c.tar.gz
openshift-c37deb3723afa23da8235dd0964ba3f3fef3ad6c.tar.bz2
openshift-c37deb3723afa23da8235dd0964ba3f3fef3ad6c.tar.xz
openshift-c37deb3723afa23da8235dd0964ba3f3fef3ad6c.zip
Merge pull request #66 from lhuard1A/explicit_python2
Explicitely use python2
-rwxr-xr-xbin/oscp2
-rwxr-xr-xbin/ossh2
-rwxr-xr-xinventory/aws/ec2.py2
-rwxr-xr-xinventory/gce/gce.py2
-rwxr-xr-xinventory/multi_ec2.py2
-rwxr-xr-xtest/units/mutli_ec2_test.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/bin/oscp b/bin/oscp
index a139ef38e..1cc336a6a 100755
--- a/bin/oscp
+++ b/bin/oscp
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# vim: expandtab:tabstop=4:shiftwidth=4
import argparse
diff --git a/bin/ossh b/bin/ossh
index 6b04cb46e..d409e120a 100755
--- a/bin/ossh
+++ b/bin/ossh
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# vim: expandtab:tabstop=4:shiftwidth=4
import argparse
diff --git a/inventory/aws/ec2.py b/inventory/aws/ec2.py
index 1a863d8a8..f231ff4c2 100755
--- a/inventory/aws/ec2.py
+++ b/inventory/aws/ec2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
'''
EC2 external inventory script
diff --git a/inventory/gce/gce.py b/inventory/gce/gce.py
index e77178c16..3403f735e 100755
--- a/inventory/gce/gce.py
+++ b/inventory/gce/gce.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# Copyright 2013 Google Inc.
#
# This file is part of Ansible
diff --git a/inventory/multi_ec2.py b/inventory/multi_ec2.py
index 499264267..5dee7972b 100755
--- a/inventory/multi_ec2.py
+++ b/inventory/multi_ec2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# vim: expandtab:tabstop=4:shiftwidth=4
from time import time
diff --git a/test/units/mutli_ec2_test.py b/test/units/mutli_ec2_test.py
index ab76629b1..95df93cd2 100755
--- a/test/units/mutli_ec2_test.py
+++ b/test/units/mutli_ec2_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
import unittest
import sys