From 710fe1419099d89b9d46002d2ea01608ebc1e4e5 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Wed, 5 Nov 2014 18:32:01 +0800 Subject: [PATCH] rename test_cipher as it will break unit tests --- shadowsocks/encrypt.py | 2 +- shadowsocks/local.py | 2 +- shadowsocks/server.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shadowsocks/encrypt.py b/shadowsocks/encrypt.py index 9733bbb..2043001 100644 --- a/shadowsocks/encrypt.py +++ b/shadowsocks/encrypt.py @@ -51,7 +51,7 @@ def random_string(length): cached_keys = {} -def test_cipher(key, method=None): +def try_cipher(key, method=None): Encryptor(key, method) diff --git a/shadowsocks/local.py b/shadowsocks/local.py index 794d929..e778ea7 100755 --- a/shadowsocks/local.py +++ b/shadowsocks/local.py @@ -46,7 +46,7 @@ def main(): utils.print_shadowsocks() - encrypt.test_cipher(config['password'], config['method']) + encrypt.try_cipher(config['password'], config['method']) try: logging.info("starting local at %s:%d" % diff --git a/shadowsocks/server.py b/shadowsocks/server.py index ce36944..64b656b 100755 --- a/shadowsocks/server.py +++ b/shadowsocks/server.py @@ -54,7 +54,7 @@ def main(): else: config['port_password'][str(server_port)] = config['password'] - encrypt.test_cipher(config['password'], config['method']) + encrypt.try_cipher(config['password'], config['method']) tcp_servers = [] udp_servers = [] dns_resolver = asyncdns.DNSResolver()