Skip to content

Commit ad1b16a

Browse files
larskslarsks
committed
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#795
1 parent 9d484c4 commit ad1b16a

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

‎ports/esp8266/modules/inisetup.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
import storage
44

55
def wifi():
6-
import ubinascii
6+
try:
7+
import ubinascii as binascii
8+
except ImportError:
9+
import binascii
10+
711
ap_if = network.WLAN(network.AP_IF)
8-
essid = b"MicroPython-%s" % ubinascii.hexlify(ap_if.config("mac")[-3:])
12+
essid = b"MicroPython-%s" % binascii.hexlify(ap_if.config("mac")[-3:])
913
ap_if.config(essid=essid, authmode=network.AUTH_WPA_WPA2_PSK, password=b"micropythoN")
1014

1115
def check_bootsec():

0 commit comments

Comments
 (0)