瀏覽代碼

Merge remote-tracking branch 'tor-github/pr/365'

Nick Mathewson 5 年之前
父節點
當前提交
63e08f56b8
共有 2 個文件被更改,包括 9 次插入2 次删除
  1. 3 0
      changes/bug27675
  2. 6 2
      src/test/test_rebind.py

+ 3 - 0
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.

+ 6 - 2
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()