diff options
| author | LaserEyess <lasereyess@users.noreply.github.com> | 2020-11-22 19:07:46 -0500 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2020-11-27 11:17:29 +0100 |
| commit | d7e80dee2649463edae50284c4e7f1f40cb2fadf (patch) | |
| tree | 683ffb50aed26c99fbae835141dc65f72e87275d /bootstrap.py | |
| parent | 62fb374349e0b13707e12ada5a3410a395c58efa (diff) | |
| download | mpv-d7e80dee2649463edae50284c4e7f1f40cb2fadf.tar.bz2 mpv-d7e80dee2649463edae50284c4e7f1f40cb2fadf.tar.xz | |
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
Diffstat (limited to 'bootstrap.py')
| -rwxr-xr-x | bootstrap.py | 7 |
1 files changed, 1 insertions, 6 deletions
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: |