Merge pull request #1586 from raiden64/master

Fix in keyfetch for obok on MacOS
This commit is contained in:
Apprentice Harper 2021-04-11 15:07:17 +01:00 committed by GitHub
commit 86a90117e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -478,7 +478,7 @@ class KoboLibrary(object):
macaddrs.append(re.sub("-", ":", m.group(1)).upper())
elif sys.platform.startswith('darwin'):
c = re.compile('\s(' + '[0-9a-f]{2}:' * 5 + '[0-9a-f]{2})(\s|$)', re.IGNORECASE)
output = subprocess.check_output('/sbin/ifconfig -a', shell=True)
output = subprocess.check_output('/sbin/ifconfig -a', shell=True, encoding='utf-8')
matches = c.findall(output)
for m in matches:
# print "m:{0}".format(m[0])