From c233dd1ff03d12a6db9042e656b2de7c8ebce39a Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Sat, 1 Aug 2020 11:22:28 +0200 Subject: [PATCH 1/3] contrib/generate-asinfo.py: Correcting syntax errors alarig@jeunet ~ % (echo begin; echo verbose; for i in `seq 1 65535`; do echo "AS$i"; done; echo end) | nc whois.cymru.com 43 | ./generate-asinfo.py > asinfo.txt File "./generate-asinfo.py", line 30 if name.startswith('- '): ^ TabError: inconsistent use of tabs and spaces in indentation zsh: done ( echo begin; echo verbose; for i in `seq 1 65535`; do; echo "AS$i"; done; ; | nc whois.cymru.com 43 | zsh: exit 1 ./generate-asinfo.py > asinfo.txt alarig@jeunet ~ % (echo begin; echo verbose; for i in `seq 1 65535`; do echo "AS$i"; done; echo end) | nc whois.cymru.com 43 | ./generate-asinfo.py > asinfo.txt File "./generate-asinfo.py", line 33 print "%s\t%s\t%s\t%s" % (asn,macro,name,country) ^ SyntaxError: invalid syntax zsh: done ( echo begin; echo verbose; for i in `seq 1 65535`; do; echo "AS$i"; done; ; | nc whois.cymru.com 43 | zsh: exit 1 ./generate-asinfo.py > asinfo.txt --- contrib/generate-asinfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/generate-asinfo.py b/contrib/generate-asinfo.py index 4da11af..5948f11 100755 --- a/contrib/generate-asinfo.py +++ b/contrib/generate-asinfo.py @@ -27,7 +27,7 @@ for line in sys.stdin: macro = 'UNSPECIFIED' name = data - if name.startswith('- '): + if name.startswith('- '): name = name[2:] - print "%s\t%s\t%s\t%s" % (asn,macro,name,country) + print("%s\t%s\t%s\t%s" % (asn,macro,name,country)) From f29a39dd49962bbe8c119c656f0c1e1979241cc2 Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Sat, 1 Aug 2020 12:43:14 +0200 Subject: [PATCH 2/3] generate-asinfo.py: Removing leading on the country --- contrib/generate-asinfo.py | 43 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/contrib/generate-asinfo.py b/contrib/generate-asinfo.py index 5948f11..bdc5081 100755 --- a/contrib/generate-asinfo.py +++ b/contrib/generate-asinfo.py @@ -4,30 +4,31 @@ import sys for line in sys.stdin: - try: - asn,country,_,_,data = [_.strip() for _ in line.split('|')] - except ValueError: - continue + try: + asn,country,_,_,data = [_.strip() for _ in line.split('|')] + except ValueError: + continue - try: - data,country = data.rsplit(',',1) - except: - data = data + try: + data,country = data.rsplit(',',1) + country = country.strip() + except: + data = data - if data == '-Private Use AS-': - data = 'Private Use AS' + if data == '-Private Use AS-': + data = 'Private Use AS' - try: - macro,name = data.split(' ',1) - except: - macro = data - name = data + try: + macro,name = data.split(' ',1) + except: + macro = data + name = data - if not (macro.count('-') or macro.upper() == macro or name.startswith('- ')) or macro == 'UK': - macro = 'UNSPECIFIED' - name = data + if not (macro.count('-') or macro.upper() == macro or name.startswith('- ')) or macro == 'UK': + macro = 'UNSPECIFIED' + name = data - if name.startswith('- '): - name = name[2:] + if name.startswith('- '): + name = name[2:] - print("%s\t%s\t%s\t%s" % (asn,macro,name,country)) + print("%s\t%s\t%s\t%s" % (asn,macro,name,country)) From 4de34d5f11539365251a3220b0c34975da1c0dd9 Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Sat, 1 Aug 2020 12:50:08 +0200 Subject: [PATCH 3/3] generate-asinfo.py: Putting ",country" at the end of the name to respect the shipped asinfo.txt format --- contrib/generate-asinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/generate-asinfo.py b/contrib/generate-asinfo.py index bdc5081..79748be 100755 --- a/contrib/generate-asinfo.py +++ b/contrib/generate-asinfo.py @@ -31,4 +31,4 @@ for line in sys.stdin: if name.startswith('- '): name = name[2:] - print("%s\t%s\t%s\t%s" % (asn,macro,name,country)) + print("%s\t%s\t%s,%s\t%s" % (asn,macro,name,country,country))