Skip to content

Commit 30f4f78

Browse files
author
clowwindy
committed
fix travis
1 parent dd14081 commit 30f4f78

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cache:
99
- dante-1.4.0
1010
before_install:
1111
- sudo apt-get update -qq
12-
- sudo apt-get install -qq build-essential libssl-dev swig python-m2crypto python-numpy dnsutils iproute nginx
12+
- sudo apt-get install -qq build-essential libssl-dev swig python-m2crypto python-numpy dnsutils iproute nginx bc
1313
- sudo dd if=/dev/urandom of=/usr/share/nginx/www/file bs=1M count=10
1414
- sudo service nginx restart
1515
- pip install m2crypto salsa20 pep8 pyflakes nose coverage

shadowsocks/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import sys
3030
import getopt
3131
import logging
32-
from shadowsocks.common import to_bytes
32+
from shadowsocks.common import to_bytes, to_str
3333

3434

3535
VERBOSE_LEVEL = 5
@@ -73,7 +73,7 @@ def check_config(config):
7373
logging.warn('warning: local set to listen on 0.0.0.0, it\'s not safe')
7474
if config.get('server', '') in [b'127.0.0.1', b'localhost']:
7575
logging.warn('warning: server set to listen on %s:%s, are you sure?' %
76-
(config['server'], config['server_port']))
76+
(to_str(config['server']), config['server_port']))
7777
if (config.get('method', '') or '').lower() == b'table':
7878
logging.warn('warning: table is not safe; please use a safer cipher, '
7979
'like AES-256-CFB')

0 commit comments

Comments
 (0)