[PATCH] D73234: [gn] Paper over Py3 urllib2 incompatibility in gn/get.py
Reid Kleckner via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 11 11:46:58 PST 2020
This revision was automatically updated to reflect the committed changes.
Closed by commit rG2040831d0566: [gn] Paper over Py3 urllib2 incompatibility in gn/get.py (authored by rnk).
Changed prior to commit:
https://reviews.llvm.org/D73234?vs=239706&id=243940#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D73234/new/
https://reviews.llvm.org/D73234
Files:
llvm/utils/gn/get.py
Index: llvm/utils/gn/get.py
===================================================================
--- llvm/utils/gn/get.py
+++ llvm/utils/gn/get.py
@@ -5,7 +5,12 @@
import io
import os
-import urllib2
+try:
+ # In Python 3, we need the module urllib.reqest. In Python 2, this
+ # functionality was in the urllib2 module.
+ from urllib import request as urllib_request
+except ImportError:
+ import urllib2 as urllib_request
import sys
import zipfile
@@ -14,7 +19,7 @@
"""Download an archive from url and extract gn from it into output_dir."""
print('downloading %s ...' % url, end='')
sys.stdout.flush()
- data = urllib2.urlopen(url).read()
+ data = urllib_request.urlopen(url).read()
print(' done')
zipfile.ZipFile(io.BytesIO(data)).extract(gn, path=output_dir)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D73234.243940.patch
Type: text/x-patch
Size: 814 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200211/8de2e797/attachment.bin>
More information about the llvm-commits
mailing list