Commit 31c50e5
tools: make nodedownload.py Python 3 compatible
PR-URL: #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>1 parent 9057814 commit 31c50e5
1 file changed
Lines changed: 7 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,27 +2,29 @@ | |||
| 2 | 2 | # Moved some utilities here from ../../configure | |
| 3 | 3 | ||
| 4 | 4 | from __future__ import print_function | |
| 5 | - import urllib | ||
| 6 | 5 | import hashlib | |
| 7 | 6 | import sys | |
| 8 | 7 | import zipfile | |
| 9 | 8 | import tarfile | |
| 10 | - import fpformat | ||
| 11 | 9 | import contextlib | |
| 10 | + try: | ||
| 11 | + from urllib.request import FancyURLopener, URLopener | ||
| 12 | + except ImportError: | ||
| 13 | + from urllib import FancyURLopener, URLopener | ||
| 12 | 14 | ||
| 13 | 15 | def formatSize(amt): | |
| 14 | 16 | """Format a size as a string in MB""" | |
| 15 | - return fpformat.fix(amt / 1024000., 1) | ||
| 17 | + return "%.1f" % (amt / 1024000.) | ||
| 16 | 18 | ||
| 17 | 19 | def spin(c): | |
| 18 | 20 | """print out an ASCII 'spinner' based on the value of counter 'c'""" | |
| 19 | 21 | spin = ".:|'" | |
| 20 | 22 | return (spin[c % len(spin)]) | |
| 21 | 23 | ||
| 22 | - class ConfigOpener(urllib.FancyURLopener): | ||
| 24 | + class ConfigOpener(FancyURLopener): | ||
| 23 | 25 | """fancy opener used by retrievefile. Set a UA""" | |
| 24 | 26 | # append to existing version (UA) | |
| 25 | - version = '%s node.js/configure' % urllib.URLopener.version | ||
| 27 | + version = '%s node.js/configure' % URLopener.version | ||
| 26 | 28 | ||
| 27 | 29 | def reporthook(count, size, total): | |
| 28 | 30 | """internal hook used by retrievefile""" | |
0 commit comments