From 6c78527415b71fce4bad4b3540e0906f5e3750af Mon Sep 17 00:00:00 2001
From: Anatol Pomozov <anatol.pomozov@gmail.com>
Date: Thu, 5 Dec 2013 10:14:41 -0800
Subject: [PATCH] Use versioned python binaries
Because of v2->v3 migration mess different systems have different python
set by default. It is recommended to use versioned binaries.
Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
---
doc/user/connectors.xml | 2 +-
scripts/static.py | 2 +-
test/run | 2 +-
test/run.sh | 2 +-
test/test-run.py | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/user/connectors.xml b/doc/user/connectors.xml
index f296334694..2f455b688a 100644
--- a/doc/user/connectors.xml
+++ b/doc/user/connectors.xml
@@ -246,7 +246,7 @@ int main()
If the row already exists, the program will print <quote>Duplicate key exists in unique index 0</quote>.
</para>
<programlisting language="python">
-#!/usr/bin/python
+#!/usr/bin/python2
from box_connection import BoxConnection
c = BoxConnection("127.0.0.1", 33013)
diff --git a/scripts/static.py b/scripts/static.py
index 866bc2716f..c19e752e9b 100755
--- a/scripts/static.py
+++ b/scripts/static.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
#
# This script is used to build www.tarantool.org
#
diff --git a/test/run b/test/run
index 351474a9b4..fcedec5edd 100755
--- a/test/run
+++ b/test/run
@@ -1,6 +1,6 @@
#!/bin/sh
-/usr/bin/env python <<__EOB__
+/usr/bin/env python2 <<__EOB__
import sys
if sys.hexversion < 0x02060000 or sys.hexversion >= 0x03000000:
sys.stderr.write("ERROR: test harness must use python >= 2.6 but not 3.x\n")
diff --git a/test/run.sh b/test/run.sh
index 351474a9b4..fcedec5edd 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-/usr/bin/env python <<__EOB__
+/usr/bin/env python2 <<__EOB__
import sys
if sys.hexversion < 0x02060000 or sys.hexversion >= 0x03000000:
sys.stderr.write("ERROR: test harness must use python >= 2.6 but not 3.x\n")
diff --git a/test/test-run.py b/test/test-run.py
index f085dc32b4..d72e5339ac 100755
--- a/test/test-run.py
+++ b/test/test-run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
"""Tarantool regression test suite front-end."""
__author__ = "Konstantin Osipov <kostja.osipov@gmail.com>"
--
GitLab