vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

parse comment

Browse source 
var 'rows' not init before return
This commit is contained in:
破娃酱 2017-05-04 10:56:14 +08:00
parent 03b1a53b9a
commit d968f01245
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
db_transfer.py
View file

@ -550,8 +550,8 @@ class Dbv3Transfer(DbTransfer):
cur = conn.cursor() cur = conn.cursor()
try: try:
cur.execute("SELECT " + ','.join(keys) + " FROM user")
rows = [] rows = []
cur.execute("SELECT " + ','.join(keys) + " FROM user")
for r in cur.fetchall(): for r in cur.fetchall():
d = {} d = {}
for column in range(len(keys)): for column in range(len(keys)):

2
shadowsocks/asyncdns.py
View file

@ -331,6 +331,8 @@ class DNSResolver(object):
with open(etc_path, 'rb') as f: with open(etc_path, 'rb') as f:
for line in f.readlines(): for line in f.readlines():
line = line.strip() line = line.strip()
if "#" in line:
line = line[:line.find('#')]
parts = line.split() parts = line.split()
if len(parts) >= 2: if len(parts) >= 2:
ip = parts[0] ip = parts[0]