From e2384a1f5cd3075f4138989e6c70331a264fdbc9 Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Mon, 24 Aug 2020 00:45:03 +0800 Subject: [PATCH] typos --- common/resolve.py | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/common/resolve.py b/common/resolve.py index b17b983..d5f42b1 100644 --- a/common/resolve.py +++ b/common/resolve.py @@ -79,12 +79,12 @@ def gen_infos(data, qname, info, infos): cname = list() ips = list() public = list() - ttls = list() - cidrs = list() - asns = list() - orgs = list() - addrs = list() - isps = list() + ttl = list() + cidr = list() + asn = list() + org = list() + addr = list() + isp = list() answers = data.get('answers') for answer in answers: if answer.get('type') == 'A': @@ -92,29 +92,26 @@ def gen_infos(data, qname, info, infos): cname.append(answer.get('name')[:-1]) # 去除最右边的`.`点号 ip = answer.get('data') ips.append(ip) - ttl = answer.get('ttl') - ttls.append(str(ttl)) - is_public = utils.ip_is_public(ip) - public.append(str(is_public)) + ttl.append(str(answer.get('ttl'))) + public.append(str(utils.ip_is_public(ip))) asn_info = ip_asn.find(ip) - cidrs.append(asn_info.get('cidr')) - asns.append(asn_info.get('asn')) - orgs.append(asn_info.get('org')) - addr = ip_reg.query(ip).get('addr') - addrs.append(addr) - isp = ip_reg.query(ip).get('isp') - isps.append(isp) + cidr.append(asn_info.get('cidr')) + asn.append(asn_info.get('asn')) + org.append(asn_info.get('org')) + ip_info = ip_reg.query(ip) + addr.append(ip_info.get('addr')) + isp.append(ip_info.get('isp')) info['resolve'] = 1 info['reason'] = 'OK' info['cname'] = ','.join(cname) info['content'] = ','.join(ips) info['public'] = ','.join(public) - info['ttl'] = ','.join(ttls) - info['cidr'] = ','.join(cidrs) - info['asn'] = ','.join(asns) - info['org'] = ','.join(orgs) - info['addr'] = ','.join(addrs) - info['isp'] = ','.join(isps) + info['ttl'] = ','.join(ttl) + info['cidr'] = ','.join(cidr) + info['asn'] = ','.join(asn) + info['org'] = ','.join(org) + info['addr'] = ','.join(addr) + info['isp'] = ','.join(isp) infos[qname] = info if not flag: info['alive'] = 0