aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2019-05-30 20:42:56 -0400
committerJack Lloyd <[email protected]>2019-05-30 20:42:56 -0400
commitec75c127e6f97b5fff82549c180510e5f6dfd3d3 (patch)
tree82d12d3e5319d84785003f2965c93ed9deeec282
parentf6d6942a3e5f3883f419433d8701edf1397c652c (diff)
Python...
-rwxr-xr-xsrc/scripts/ci_build.py8
-rwxr-xr-xsrc/scripts/test_cli.py4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
index 7086ed1c7..91d9d39a3 100755
--- a/src/scripts/ci_build.py
+++ b/src/scripts/ci_build.py
@@ -354,16 +354,16 @@ def main(args=None):
target = args[1]
- py_interp = 'python'
-
use_python2 = have_prog('python2')
if options.use_python3 is None:
use_python3 = have_prog('python3')
else:
use_python3 = options.use_python3
- if use_python3:
- py_interp = 'python3'
+
+ py_interp = 'python'
+ if use_python3:
+ py_interp = 'python3'
if options.cc_bin is None:
if options.cc == 'gcc':
diff --git a/src/scripts/test_cli.py b/src/scripts/test_cli.py
index baeb1d542..bb9bb8c0a 100755
--- a/src/scripts/test_cli.py
+++ b/src/scripts/test_cli.py
@@ -13,7 +13,7 @@ import random
import json
import binascii
-# pylint: disable=global-statement
+# pylint: disable=global-statement,unused-argument
CLI_PATH = None
TESTS_RUN = 0
@@ -681,7 +681,7 @@ def cli_tls_proxy_tests(tmp_dir):
return
try:
- from httpx.server import HTTPServer, BaseHTTPRequestHandler
+ from http.server import HTTPServer, BaseHTTPRequestHandler
except ImportError:
try:
from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler