commit 63e08f56b889eb56ae555b5e8505187331017ff5 parent b7bd162af70ced68d3ea9d738c8cacb5bea75a1c Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 21 Sep 2018 16:13:59 -0400 Merge remote-tracking branch 'tor-github/pr/365' Diffstat:
| A | changes/bug27675 | | | 3 | +++ |
| M | src/test/test_rebind.py | | | 8 | ++++++-- |
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/changes/bug27675 b/changes/bug27675 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - In test_rebind.py check if Python version is in supported + ranges. Fixes bug 27675; bugfix on 0.3.5.1-alpha. diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py @@ -1,5 +1,3 @@ -#!/usr/bin/python3 - from __future__ import print_function import sys @@ -37,6 +35,12 @@ def pick_random_port(): return port +if sys.hexversion < 0x02070000: + sys.exit("ERROR: unsupported Python version (should be >= 2.7)") + +if sys.hexversion > 0x03000000 and sys.hexversion < 0x03010000: + sys.exit("ERROR: unsupported Python3 version (should be >= 3.1)") + control_port = pick_random_port() socks_port = pick_random_port()