diff options
| author | Damien George <damien.p.george@gmail.com> | 2018-04-23 16:11:27 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2018-04-23 16:11:27 +1000 |
| commit | f7be5f9bfa61a07a8256aaae8f22d151f6b8ad81 (patch) | |
| tree | 4145da5ffa3bfe490f55395ec572517d6dba907c /tools/upip.py | |
| parent | b5ee3b2f21611b5a420e2ffb4cf2a239806dc763 (diff) | |
tools/upip: Upgrade upip to 1.2.4.
Uses new pypi.org URL, and now creates a socket with the address parameters
returned by getaddrinfo().
Diffstat (limited to 'tools/upip.py')
| -rw-r--r-- | tools/upip.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tools/upip.py b/tools/upip.py index 411da49e8..a400c3174 100644 --- a/tools/upip.py +++ b/tools/upip.py @@ -1,3 +1,10 @@ +# +# upip - Package manager for MicroPython +# +# Copyright (c) 2015-2018 Paul Sokolovsky +# +# Licensed under the MIT license. +# import sys import gc import uos as os @@ -110,16 +117,16 @@ def url_open(url): proto, _, host, urlpath = url.split('/', 3) try: - ai = usocket.getaddrinfo(host, 443) + ai = usocket.getaddrinfo(host, 443, 0, usocket.SOCK_STREAM) except OSError as e: fatal("Unable to resolve %s (no Internet?)" % host, e) #print("Address infos:", ai) - addr = ai[0][4] + ai = ai[0] - s = usocket.socket(ai[0][0]) + s = usocket.socket(ai[0], ai[1], ai[2]) try: #print("Connect address:", addr) - s.connect(addr) + s.connect(ai[-1]) if proto == "https:": s = ussl.wrap_socket(s, server_hostname=host) @@ -149,7 +156,7 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://pypi.python.org/pypi/%s/json" % name) + f = url_open("https://pypi.org/pypi/%s/json" % name) try: return json.load(f) finally: |