From bf7c4d11e888b08c2f08fb309aa98219674996ec Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Thu, 6 Aug 2020 08:11:51 +0200 Subject: bin/report-vuln: adapt urllib import for py3 --- bin/report-vuln | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/report-vuln b/bin/report-vuln index 5cd6f261c9..986534159f 100755 --- a/bin/report-vuln +++ b/bin/report-vuln @@ -16,7 +16,11 @@ from tempfile import NamedTemporaryFile import os import re import sys -import urllib +try: + from urllib import urlencode, urlopen +except ImportError: + from urllib.parse import urlencode + from urllib.request import urlopen from textwrap import wrap temp_id = re.compile('(?:CVE|cve)\-[0-9]{4}-XXXX') @@ -60,10 +64,10 @@ def gen_index(ids): return ret def http_get(id): - param = urllib.urlencode({'name' : id}) + param = urlencode({'name' : id}) resp = '' try: - f = urllib.urlopen('https://cve.mitre.org/cgi-bin/cvename.cgi?%s' % param) + f = urlopen('https://cve.mitre.org/cgi-bin/cvename.cgi?%s' % param) resp = f.read() except Exception as e: error('on doing HTTP request' + str(e)) -- cgit v1.2.3