diff options
| author | Lars Kellogg-Stedman <lars@oddbit.com> | 2018-05-03 09:14:57 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@oddbit.com> | 2018-05-03 09:23:54 -0400 |
| commit | ad1b16a3ecd497286b8bc05faaad3fcd8f6b9b9b (patch) | |
| tree | 29b5bbb66884fb8949d15b0af69571d120c51ac3 | |
| parent | 9d484c4935fb6948069ccfd0a344d39b456fc8d1 (diff) | |
ports/esp8266: try both binascii and ubinascii in inisetup.py
in recent circuitpython builds, `ubinascii` is available as
`binascii`. This modifies `modules/inisetup.py` to use the same
import semantics as `modules/websocket_helper.py`: first try importing
`ubinascii`, and if that fails, fall back to importing `binascii`.
Closes adafruit/circuitpython#795
| -rw-r--r-- | ports/esp8266/modules/inisetup.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py index 192ff5ea8..46f089248 100644 --- a/ports/esp8266/modules/inisetup.py +++ b/ports/esp8266/modules/inisetup.py @@ -3,9 +3,13 @@ import network import storage def wifi(): - import ubinascii + try: + import ubinascii as binascii + except ImportError: + import binascii + ap_if = network.WLAN(network.AP_IF) - essid = b"MicroPython-%s" % ubinascii.hexlify(ap_if.config("mac")[-3:]) + essid = b"MicroPython-%s" % binascii.hexlify(ap_if.config("mac")[-3:]) ap_if.config(essid=essid, authmode=network.AUTH_WPA_WPA2_PSK, password=b"micropythoN") def check_bootsec(): |