From d7e80dee2649463edae50284c4e7f1f40cb2fadf Mon Sep 17 00:00:00 2001 From: LaserEyess Date: Sun, 22 Nov 2020 19:07:46 -0500 Subject: bootstrap.py: remove all python2 support In 0.33.0 python2 support has been removed from mpv's build system. This commit removes python2 compatibility code from bootstrap.py with the following changes: - __future__ import for print_function is not needed - urllib2 is python2 only --- bootstrap.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'bootstrap.py') diff --git a/bootstrap.py b/bootstrap.py index 9949183002..2d9e8b4294 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -2,8 +2,8 @@ # This script simply downloads waf to the current directory -from __future__ import print_function import os, sys, stat, hashlib, subprocess +from urllib.request import urlopen, URLError WAFRELEASE = "waf-2.0.20" WAFURLS = ["https://waf.io/" + WAFRELEASE, @@ -20,11 +20,6 @@ if "--no-download" in sys.argv[1:]: print("Did not find {} and no download was requested.".format(WAFRELEASE)) sys.exit(1) -try: - from urllib.request import urlopen, URLError -except: - from urllib2 import urlopen, URLError - waf = None for WAFURL in WAFURLS: -- cgit v1.2.3