summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2018-05-03 10:04:37 -0700
committerGitHub <noreply@github.com>2018-05-03 10:04:37 -0700
commit2fe552694b6f87fabf3a2fad01e476370a25ce39 (patch)
tree5b76e9e13ee72aaafeda39c9c75309b4505c67e4
parent37bf61f6ac9e36aab849b284912cc696aea214e4 (diff)
parentad1b16a3ecd497286b8bc05faaad3fcd8f6b9b9b (diff)
Merge pull request #796 from larsks/bug/795
try both binascii and ubinascii in inisetup.py
-rw-r--r--ports/esp8266/modules/inisetup.py8
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():