diff options
author | cclauss <cclauss@me.com> | 2019-08-13 14:26:35 +0200 |
---|---|---|
committer | Sam Roberts <vieuxtech@gmail.com> | 2019-08-14 16:40:42 -0700 |
commit | 8ae79c952ba887a76b7f32d3b6974bbbeb731e59 (patch) | |
tree | e555ea50c114e5fbd4fee04eaa07bcdddb262a64 | |
parent | 6d351d4cc0a6feb644e7f81051d319b53bbc9309 (diff) | |
download | node-new-8ae79c952ba887a76b7f32d3b6974bbbeb731e59.tar.gz |
tools: make nodedownload.py Python 3 compatible
PR-URL: https://github.com/nodejs/node/pull/29104
Reviewed-By: Michaƫl Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
-rw-r--r-- | tools/configure.d/nodedownload.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/configure.d/nodedownload.py b/tools/configure.d/nodedownload.py index 53d2692ed1..515704e3de 100644 --- a/tools/configure.d/nodedownload.py +++ b/tools/configure.d/nodedownload.py @@ -2,27 +2,29 @@ # Moved some utilities here from ../../configure from __future__ import print_function -import urllib import hashlib import sys import zipfile import tarfile -import fpformat import contextlib +try: + from urllib.request import FancyURLopener, URLopener +except ImportError: + from urllib import FancyURLopener, URLopener def formatSize(amt): """Format a size as a string in MB""" - return fpformat.fix(amt / 1024000., 1) + return "%.1f" % (amt / 1024000.) def spin(c): """print out an ASCII 'spinner' based on the value of counter 'c'""" spin = ".:|'" return (spin[c % len(spin)]) -class ConfigOpener(urllib.FancyURLopener): +class ConfigOpener(FancyURLopener): """fancy opener used by retrievefile. Set a UA""" # append to existing version (UA) - version = '%s node.js/configure' % urllib.URLopener.version + version = '%s node.js/configure' % URLopener.version def reporthook(count, size, total): """internal hook used by retrievefile""" |