diff --git a/README.md b/README.md index 1a9498e35c5c320ffe878a6b6919ace4ec373fd9..4d23aa005bbaed2c2b442358cd92beb93c6d1726 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ simplest way to setup and start the server, but it requires a few additional Python modules: * daemon * pyyaml + * pexpect Once all prerequisites are installed, try: diff --git a/doc/user/connectors.xml b/doc/user/connectors.xml index f2963346940ef8e22a8a35ec92bbcd54c080259d..2f455b688a4f3b1f9642ef08f4b09ce5ef9a4718 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 866bc2716f25a0f0b6d1b608c5f9e90a8da01c76..c19e752e9bf11cac499cee3294cd36149a0e1da9 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 351474a9b40d24ae694e79c1b824330164d0140b..fcedec5eddb61a5167c329ead6fdfb22fd62d20b 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 351474a9b40d24ae694e79c1b824330164d0140b..fcedec5eddb61a5167c329ead6fdfb22fd62d20b 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 f085dc32b4e1cf951c485bf7ad160f69bd1c9963..d72e5339ac544df5597254e74a6cc39880959635 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>"