From f63dedee3dc99132f2f01644353f75537b07e639 Mon Sep 17 00:00:00 2001 From: cclauss Date: Sat, 15 Jun 2019 09:32:51 +0200 Subject: [PATCH] Use print() function in both Python 2 and Python 3 (#64852) --- developer/cgi/check_url_filename.py | 12 ++++++++---- developer/cgi/check_url_redirect.py | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/developer/cgi/check_url_filename.py b/developer/cgi/check_url_filename.py index eee68bd8f4..3c40ca517f 100755 --- a/developer/cgi/check_url_filename.py +++ b/developer/cgi/check_url_filename.py @@ -1,7 +1,11 @@ #!/usr/bin/python +from __future__ import print_function import sys import cgi -import urllib2 +try: # Python 3 + from urllib.request import Request, urlopen +except NameError: # Python 2 + from urllib2 import Request, urlopen url = sys.argv[1] @@ -12,8 +16,8 @@ if len(sys.argv) > 2: try: - req = urllib2.Request(url, None, headers) - response = urllib2.urlopen(req) + req = Request(url, None, headers) + response = urlopen(req) _, params = cgi.parse_header( response.headers.get('Content-Disposition', '')) filename = params['filename'] @@ -21,4 +25,4 @@ except Exception: import traceback filename = 'generic exception: ' + traceback.format_exc() -print filename +print(filename) diff --git a/developer/cgi/check_url_redirect.py b/developer/cgi/check_url_redirect.py index c9a545b755..6d1a179bc8 100644 --- a/developer/cgi/check_url_redirect.py +++ b/developer/cgi/check_url_redirect.py @@ -1,7 +1,11 @@ #!/usr/bin/python +from __future__ import print_function import sys import cgi -import urllib2 +try: # Python 3 + from urllib.request import Request, urlopen +except NameError: # Python 2 + from urllib2 import Request, urlopen url = sys.argv[1] @@ -11,11 +15,11 @@ if len(sys.argv) > 2: headers = {'User-Agent': ua} try: - req = urllib2.Request(url, None, headers) - response = urllib2.urlopen(req) + req = Request(url, None, headers) + response = urlopen(req) redir = response.geturl() except Exception: import traceback redir = 'generic exception: ' + traceback.format_exc() -print redir +print(redir)