From bf52a118f3ea6572443e353d16888990fb964fb9 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 4 May 2020 16:32:41 +0800 Subject: [PATCH] luci-app-ssrserver-python: fully convert to python3 --- .../root/etc/init.d/ssrs | 6 +-- .../root/usr/share/ssr/asyncmgr.py | 2 +- .../root/usr/share/ssr/configloader.py | 2 +- .../root/usr/share/ssr/db_transfer.py | 2 +- .../root/usr/share/ssr/importloader.py | 2 +- .../root/usr/share/ssr/initmudbjson.sh | 6 +-- .../root/usr/share/ssr/mujson_mgr.py | 4 +- .../root/usr/share/ssr/server.py | 2 +- .../root/usr/share/ssr/server_pool.py | 2 +- .../usr/share/ssr/shadowsocks/__init__.py | 2 +- .../usr/share/ssr/shadowsocks/asyncdns.py | 2 +- .../root/usr/share/ssr/shadowsocks/common.py | 2 +- .../share/ssr/shadowsocks/crypto/__init__.py | 2 +- .../shadowsocks/crypto/ctypes_libsodium.py | 2 +- .../ssr/shadowsocks/crypto/ctypes_openssl.py | 2 +- .../share/ssr/shadowsocks/crypto/openssl.py | 2 +- .../share/ssr/shadowsocks/crypto/rc4_md5.py | 2 +- .../share/ssr/shadowsocks/crypto/sodium.py | 2 +- .../usr/share/ssr/shadowsocks/crypto/util.py | 2 +- .../root/usr/share/ssr/shadowsocks/daemon.py | 2 +- .../root/usr/share/ssr/shadowsocks/encrypt.py | 2 +- .../usr/share/ssr/shadowsocks/eventloop.py | 2 +- .../root/usr/share/ssr/shadowsocks/local.py | 2 +- .../usr/share/ssr/shadowsocks/lru_cache.py | 2 +- .../root/usr/share/ssr/shadowsocks/manager.py | 2 +- .../root/usr/share/ssr/shadowsocks/obfs.py | 2 +- .../ssr/shadowsocks/obfsplugin/__init__.py | 2 +- .../share/ssr/shadowsocks/obfsplugin/auth.py | 2 +- .../ssr/shadowsocks/obfsplugin/auth_chain.py | 2 +- .../ssr/shadowsocks/obfsplugin/http_simple.py | 2 +- .../ssr/shadowsocks/obfsplugin/obfs_tls.py | 2 +- .../share/ssr/shadowsocks/obfsplugin/plain.py | 2 +- .../ssr/shadowsocks/obfsplugin/verify.py | 2 +- .../root/usr/share/ssr/shadowsocks/server.py | 2 +- .../root/usr/share/ssr/shadowsocks/shell.py | 2 +- .../usr/share/ssr/shadowsocks/tcprelay.py | 2 +- .../usr/share/ssr/shadowsocks/udprelay.py | 2 +- .../root/usr/share/ssr/shadowsocks/version.py | 2 +- .../usr/share/ssr/tests/coverage_server.py | 2 +- .../root/usr/share/ssr/tests/jenkins.sh | 46 +++++++++---------- .../root/usr/share/ssr/tests/nose_plugin.py | 2 +- .../root/usr/share/ssr/tests/test.py | 4 +- .../root/usr/share/ssr/tests/test_udp_src.py | 2 +- .../root/usr/share/ssr/tests/test_udp_src.sh | 2 +- .../root/usr/share/ssr/utils/autoban.py | 2 +- 45 files changed, 73 insertions(+), 73 deletions(-) diff --git a/package/lean/luci-app-ssrserver-python/root/etc/init.d/ssrs b/package/lean/luci-app-ssrserver-python/root/etc/init.d/ssrs index 63a473b3f3..a6506e3954 100755 --- a/package/lean/luci-app-ssrserver-python/root/etc/init.d/ssrs +++ b/package/lean/luci-app-ssrserver-python/root/etc/init.d/ssrs @@ -36,7 +36,7 @@ load_config() { start_server() { mkdir -p /var/etc - /usr/bin/python \ + /usr/bin/python3 \ /usr/share/ssr/shadowsocks/server.py \ -c $CONFIG_FILE \ --pid-file $PID_FILE \ @@ -84,7 +84,7 @@ start() { stop() { del_rule - /usr/bin/python \ + /usr/bin/python3 \ /usr/share/ssr/shadowsocks/server.py \ -c $CONFIG_FILE \ --pid-file $PID_FILE \ @@ -92,4 +92,4 @@ stop() { -d stop \ >/dev/null 2>&1 & rm -f $LOG_FILE -} \ No newline at end of file +} diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/asyncmgr.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/asyncmgr.py index 9bf4d09360..87f1c1bc28 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/asyncmgr.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/asyncmgr.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Copyright (c) 2014 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/configloader.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/configloader.py index cf9d61961b..cb0065e655 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/configloader.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/configloader.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: UTF-8 -*- import importloader diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/db_transfer.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/db_transfer.py index 67bda60834..42098d738f 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/db_transfer.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/db_transfer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: UTF-8 -*- import logging diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/importloader.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/importloader.py index c917cb7d95..b26e180ed6 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/importloader.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/importloader.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: UTF-8 -*- def load(name): diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/initmudbjson.sh b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/initmudbjson.sh index 09b07f3322..6c1851b457 100755 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/initmudbjson.sh +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/initmudbjson.sh @@ -13,10 +13,10 @@ fi if [[ $ip_count == 1 ]]; then echo "server IP is "${ip_addr} sed -i "s/SERVER_PUB_ADDR = .\+/SERVER_PUB_ADDR = \'"${ip_addr}"\'/g" userapiconfig.py - user_count=`python mujson_mgr.py -l|grep -c -e "[0-9]"` + user_count=`python3 mujson_mgr.py -l|grep -c -e "[0-9]"` if [[ $user_count == 0 ]]; then - port=`python -c 'import random;print(random.randint(10000, 65536))'` - python mujson_mgr.py -a -p ${port} + port=`python3 -c 'import random;print(random.randint(10000, 65536))'` + python3 mujson_mgr.py -a -p ${port} fi else echo "unable to detect server IP" diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/mujson_mgr.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/mujson_mgr.py index 2eb05d59d1..356eb93b78 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/mujson_mgr.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/mujson_mgr.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: UTF-8 -*- import traceback @@ -211,7 +211,7 @@ class MuMgr(object): def print_server_help(): - print('''usage: python mujson_manage.py -a|-d|-e|-c|-l [OPTION]... + print('''usage: python3 mujson_manage.py -a|-d|-e|-c|-l [OPTION]... Actions: -a add/edit a user diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/server.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/server.py index ba863b6840..6aaaadf731 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/server.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/server.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2015 breakwall diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/server_pool.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/server_pool.py index d159817a3f..08f526d951 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/server_pool.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/server_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Copyright (c) 2014 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/__init__.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/__init__.py index dc3abd4b58..5b1811b196 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/__init__.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Copyright 2012-2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/asyncdns.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/asyncdns.py index 868ea61407..481cde7bcf 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/asyncdns.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/asyncdns.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Copyright 2014-2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/common.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/common.py index c4484c0467..6686c31602 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/common.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/common.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2013-2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/__init__.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/__init__.py index 401c7b726e..2bc532d629 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/__init__.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/ctypes_libsodium.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/ctypes_libsodium.py index efecfd415d..826bc93c8b 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/ctypes_libsodium.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/ctypes_libsodium.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2014 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/ctypes_openssl.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/ctypes_openssl.py index 0ef8ce0f8c..486ba01b15 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/ctypes_openssl.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/ctypes_openssl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2014 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/openssl.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/openssl.py index 0a8ca53fb8..238db10c59 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/openssl.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/openssl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/rc4_md5.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/rc4_md5.py index b0105ec29c..397b2fffda 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/rc4_md5.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/rc4_md5.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/sodium.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/sodium.py index 51d476bedc..f1422da869 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/sodium.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/sodium.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/util.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/util.py index 212df86045..1f1a559199 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/util.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/crypto/util.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/daemon.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/daemon.py index 8dc5608d11..8ab68abd3e 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/daemon.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/daemon.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2014-2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/encrypt.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/encrypt.py index 44f9052506..d6593d22f4 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/encrypt.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/encrypt.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2012-2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/eventloop.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/eventloop.py index 341620efd1..767a5f3f0f 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/eventloop.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/eventloop.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2013-2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/local.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/local.py index 9f54d93066..e21f778c22 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/local.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/local.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Copyright 2012-2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/lru_cache.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/lru_cache.py index ab0d210861..4f2f03bea1 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/lru_cache.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/lru_cache.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/manager.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/manager.py index 80d0a320bb..ac2a666469 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/manager.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/manager.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfs.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfs.py index 3dfdb141f1..dcc305f367 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfs.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015-2015 breakwa11 # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/__init__.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/__init__.py index 401c7b726e..2bc532d629 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/__init__.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/auth.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/auth.py index a745e098fc..d3d4743e29 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/auth.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/auth.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015-2015 breakwa11 # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/auth_chain.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/auth_chain.py index b11d545b36..a9dad5f99f 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/auth_chain.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/auth_chain.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Copyright 2015-2015 breakwa11 diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/http_simple.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/http_simple.py index ff3c5fdfbc..16a98a5780 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/http_simple.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/http_simple.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015-2015 breakwa11 # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/obfs_tls.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/obfs_tls.py index 7f1f2336f9..5c894fb5be 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/obfs_tls.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/obfs_tls.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015-2015 breakwa11 # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/plain.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/plain.py index 8c6355c38f..5aa44cf35a 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/plain.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/plain.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015-2015 breakwa11 # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/verify.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/verify.py index 0dc0ca6d10..73257e2eb2 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/verify.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/obfsplugin/verify.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015-2015 breakwa11 # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/server.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/server.py index 081538933b..b49b660694 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/server.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/server.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Copyright 2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/shell.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/shell.py index a1547d0821..691c7ab1b9 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/shell.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/shell.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/tcprelay.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/tcprelay.py index 595e2be73f..a7711ae942 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/tcprelay.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/tcprelay.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/udprelay.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/udprelay.py index b9606cd818..5f2bcc2124 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/udprelay.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/udprelay.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2015 clowwindy diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/version.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/version.py index f3e1ef796d..e7648f4a3f 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/version.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/shadowsocks/version.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2017 breakwa11 diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/coverage_server.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/coverage_server.py index 23cc8cd71d..4f6e753072 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/coverage_server.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/coverage_server.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/jenkins.sh b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/jenkins.sh index ea5c1630b8..65a00004d5 100755 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/jenkins.sh +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/jenkins.sh @@ -24,47 +24,47 @@ function run_test { return 0 } -python --version +python3 --version coverage erase mkdir tmp run_test pep8 --ignore=E402 . run_test pyflakes . run_test coverage run tests/nose_plugin.py -v -run_test python setup.py sdist +run_test python3 setup.py sdist run_test tests/test_daemon.sh -run_test python tests/test.py --with-coverage -c tests/aes.json -run_test python tests/test.py --with-coverage -c tests/aes-ctr.json -run_test python tests/test.py --with-coverage -c tests/aes-cfb1.json -run_test python tests/test.py --with-coverage -c tests/aes-cfb8.json -run_test python tests/test.py --with-coverage -c tests/rc4-md5.json -run_test python tests/test.py --with-coverage -c tests/salsa20.json -run_test python tests/test.py --with-coverage -c tests/chacha20.json -run_test python tests/test.py --with-coverage -c tests/table.json -run_test python tests/test.py --with-coverage -c tests/server-multi-ports.json -run_test python tests/test.py --with-coverage -s tests/aes.json -c tests/client-multi-server-ip.json -run_test python tests/test.py --with-coverage -s tests/server-multi-passwd.json -c tests/server-multi-passwd-client-side.json -run_test python tests/test.py --with-coverage -c tests/workers.json -run_test python tests/test.py --with-coverage -s tests/ipv6.json -c tests/ipv6-client-side.json -run_test python tests/test.py --with-coverage -b "-m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -q" -a "-m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -vv" -run_test python tests/test.py --with-coverage -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 --workers 1" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -qq -b 127.0.0.1" -run_test python tests/test.py --with-coverage --should-fail --url="http://127.0.0.1/" -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 --forbidden-ip=127.0.0.1,::1,8.8.8.8" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -b 127.0.0.1" +run_test python3 tests/test.py --with-coverage -c tests/aes.json +run_test python3 tests/test.py --with-coverage -c tests/aes-ctr.json +run_test python3 tests/test.py --with-coverage -c tests/aes-cfb1.json +run_test python3 tests/test.py --with-coverage -c tests/aes-cfb8.json +run_test python3 tests/test.py --with-coverage -c tests/rc4-md5.json +run_test python3 tests/test.py --with-coverage -c tests/salsa20.json +run_test python3 tests/test.py --with-coverage -c tests/chacha20.json +run_test python3 tests/test.py --with-coverage -c tests/table.json +run_test python3 tests/test.py --with-coverage -c tests/server-multi-ports.json +run_test python3 tests/test.py --with-coverage -s tests/aes.json -c tests/client-multi-server-ip.json +run_test python3 tests/test.py --with-coverage -s tests/server-multi-passwd.json -c tests/server-multi-passwd-client-side.json +run_test python3 tests/test.py --with-coverage -c tests/workers.json +run_test python3 tests/test.py --with-coverage -s tests/ipv6.json -c tests/ipv6-client-side.json +run_test python3 tests/test.py --with-coverage -b "-m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -q" -a "-m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -vv" +run_test python3 tests/test.py --with-coverage -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 --workers 1" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -qq -b 127.0.0.1" +run_test python3 tests/test.py --with-coverage --should-fail --url="http://127.0.0.1/" -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 --forbidden-ip=127.0.0.1,::1,8.8.8.8" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -b 127.0.0.1" # test if DNS works -run_test python tests/test.py --with-coverage -c tests/aes.json --url="https://clients1.google.com/generate_204" +run_test python3 tests/test.py --with-coverage -c tests/aes.json --url="https://clients1.google.com/generate_204" # test localhost is in the forbidden list by default -run_test python tests/test.py --with-coverage --should-fail --tcp-only --url="http://127.0.0.1/" -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -b 127.0.0.1" +run_test python3 tests/test.py --with-coverage --should-fail --tcp-only --url="http://127.0.0.1/" -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -b 127.0.0.1" # test localhost is available when forbidden list is empty -run_test python tests/test.py --with-coverage --tcp-only --url="http://127.0.0.1/" -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 --forbidden-ip=" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -b 127.0.0.1" +run_test python3 tests/test.py --with-coverage --tcp-only --url="http://127.0.0.1/" -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 --forbidden-ip=" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -b 127.0.0.1" if [ -f /proc/sys/net/ipv4/tcp_fastopen ] ; then if [ 3 -eq `cat /proc/sys/net/ipv4/tcp_fastopen` ] ; then # we have to run it twice: # the first time there's no syn cookie # the second time there is syn cookie - run_test python tests/test.py --with-coverage -c tests/fastopen.json - run_test python tests/test.py --with-coverage -c tests/fastopen.json + run_test python3 tests/test.py --with-coverage -c tests/fastopen.json + run_test python3 tests/test.py --with-coverage -c tests/fastopen.json fi fi diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/nose_plugin.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/nose_plugin.py index 86b1a86537..3d01ec0e3f 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/nose_plugin.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/nose_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright 2015 clowwindy # diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test.py index 408340134e..be076a8ca9 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright 2015 clowwindy @@ -26,7 +26,7 @@ import time import argparse from subprocess import Popen, PIPE -python = ['python'] +python = ['python3'] default_url = 'http://localhost/' diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test_udp_src.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test_udp_src.py index e8fa5057eb..e09d7eb249 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test_udp_src.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test_udp_src.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import socket import socks diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test_udp_src.sh b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test_udp_src.sh index 6a778abc10..12ec0217c9 100755 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test_udp_src.sh +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/tests/test_udp_src.sh @@ -12,7 +12,7 @@ SERVER=$! sleep 3 -python tests/test_udp_src.py +python3 tests/test_udp_src.py r=$? kill -s SIGINT $LOCAL diff --git a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/utils/autoban.py b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/utils/autoban.py index 1bbb65c9b7..148a00bd9f 100644 --- a/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/utils/autoban.py +++ b/package/lean/luci-app-ssrserver-python/root/usr/share/ssr/utils/autoban.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # Copyright (c) 2015 clowwindy