micropython-stubber 1.23.2__py3-none-any.whl → 1.23.3__py3-none-any.whl

mpflash/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpflash"
-version = "1.0.2"
+version = "1.0.5"
 description = "Flash and download tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"

stubber/__init__.py

@@ -1,3 +1,3 @@
 """get the version"""
 
-__version__ = "1.23.2"
+__version__ = "1.23.3"

stubber/board/createstubs.py

@@ -24,8 +24,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.23.2"
-version_str = __version__.rsplit(".", 1)[0]
+__version__ = "v1.23.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -153,11 +152,7 @@ class Stubber:
                     order = 4
                 _result.append((name, repr(val), repr(type(val)), val, order))
             except AttributeError as e:
-                _errors.append(
-                    "Couldn't get attribute '{}' from object '{}', Err: {}".format(
-                        name, item_instance, e
-                    )
-                )
+                _errors.append("Couldn't get attribute '{}' from object '{}', Err: {}".format(name, item_instance, e))
             except MemoryError as e:
                 print("MemoryError: {}".format(e))
                 sleep(1)
@@ -223,9 +218,7 @@ class Stubber:
         try:
             new_module = __import__(module_name, None, None, ("*"))
             m1 = gc.mem_free()  # type: ignore
-            log.info(
-                "Stub module: {:<25} to file: {:<70} mem:{:>5}".format(module_name, fname, m1)
-            )
+            log.info("Stub module: {:<25} to file: {:<70} mem:{:>5}".format(module_name, fname, m1))
 
         except ImportError:
             # log.debug("Skip module: {:<25} {:<79}".format(module_name, "Module not found."))
@@ -236,7 +229,7 @@ class Stubber:
         with open(file_name, "w") as fp:
             info_ = str(self.info).replace("OrderedDict(", "").replace("})", "}")
             s = '"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(
-                module_name, self._fwid, info_, version_str
+                module_name, self._fwid, info_, __version__
             )
             fp.write(s)
             fp.write(
@@ -256,9 +249,7 @@ class Stubber:
         gc.collect()
         return True
 
-    def write_object_stub(
-        self, fp, object_expr: object, obj_name: str, indent: str, in_class: int = 0
-    ):
+    def write_object_stub(self, fp, object_expr: object, obj_name: str, indent: str, in_class: int = 0):
         "Write a module/object stub to an open file. Can be called recursive."
         gc.collect()
         if object_expr in self.problematic:
@@ -334,13 +325,11 @@ class Stubber:
                     first = "self, "
                 # class method - add function decoration
                 if "bound_method" in item_type_txt or "bound_method" in item_repr:
-                    s = "{}@classmethod\n".format(
-                        indent
-                    ) + "{}def {}(cls, *args, **kwargs) -> {}:\n".format(indent, item_name, ret)
-                else:
-                    s = "{}def {}({}*args, **kwargs) -> {}:\n".format(
-                        indent, item_name, first, ret
+                    s = "{}@classmethod\n".format(indent) + "{}def {}(cls, *args, **kwargs) -> {}:\n".format(
+                        indent, item_name, ret
                     )
+                else:
+                    s = "{}def {}({}*args, **kwargs) -> {}:\n".format(indent, item_name, first, ret)
                 s += indent + "    ...\n\n"
                 fp.write(s)
                 # log.debug("\n" + s)
@@ -369,9 +358,7 @@ class Stubber:
                         # use these types for the attribute
                         if t == "generator":
                             t = "Generator"
-                        s = "{0}{1}: {2} ## = {4}\n".format(
-                            indent, item_name, t, item_type_txt, item_repr
-                        )
+                        s = "{0}{1}: {2} ## = {4}\n".format(indent, item_name, t, item_type_txt, item_repr)
                     else:
                         # Requires Python 3.6 syntax, which is OK for the stubs/pyi
                         t = "Incomplete"
@@ -379,9 +366,7 @@ class Stubber:
                             item_repr = item_repr.split(" at ")[0] + " at ...>"
                         if " at " in item_repr:
                             item_repr = item_repr.split(" at ")[0] + " at ...>"
-                        s = "{0}{1}: {2} ## {3} = {4}\n".format(
-                            indent, item_name, t, item_type_txt, item_repr
-                        )
+                        s = "{0}{1}: {2} ## {3} = {4}\n".format(indent, item_name, t, item_type_txt, item_repr)
                 fp.write(s)
                 # log.debug("\n" + s)
             else:
@@ -444,7 +429,7 @@ class Stubber:
                 f.write("{")
                 f.write(dumps({"firmware": self.info})[1:-1])
                 f.write(",\n")
-                f.write(dumps({"stubber": {"version": version_str}, "stubtype": "firmware"})[1:-1])
+                f.write(dumps({"stubber": {"version": __version__}, "stubtype": "firmware"})[1:-1])
                 f.write(",\n")
                 f.write('"modules" :[\n')
 
@@ -464,9 +449,7 @@ class Stubber:
                     f.write(",\n")
                 else:
                     self._json_first = False
-                line = '{{"module": "{}", "file": "{}"}}'.format(
-                    module_name, stub_file.replace("\\", "/")
-                )
+                line = '{{"module": "{}", "file": "{}"}}'.format(module_name, stub_file.replace("\\", "/"))
                 f.write(line)
 
         except OSError:
@@ -505,7 +488,7 @@ def ensure_folder(path: str):
 
 def _build(s):
     # extract build from sys.version or os.uname().version if available
-    # sys.version: 'MicroPython v1.23.2-preview.6.g3d0b6276f'
+    # sys.version: 'MicroPython v1.23.3-preview.6.g3d0b6276f'
     # sys.implementation.version: 'v1.13-103-gb137d064e'
     if not s:
         return ""
@@ -612,11 +595,10 @@ def _info():  # type:() -> dict[str, str]
         if (
             info["version"]
             and info["version"].endswith(".0")
-            and info["version"]
-            >= "1.10.0"  # versions from 1.10.0 to 1.23.2 do not have a micro .0
+            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.23.3 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.23.2 do not have a micro .0
+            # versions from 1.10.0 to 1.23.3 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable
@@ -675,7 +657,7 @@ def get_root() -> str:  # sourcery skip: use-assigned-variable
         # unix port
         c = "."
     r = c
-    for r in [c, "/sd", "/flash", "/", "."]:
+    for r in ["/sd", "/flash", "/", c, "."]:
         try:
             _ = os.stat(r)
             break

stubber/board/createstubs_db.py

@@ -18,7 +18,7 @@ Create stubs for (all) modules on a MicroPython board.
     - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device 
 
 
-This variant was generated from createstubs.py by micropython-stubber v1.23.2
+This variant was generated from createstubs.py by micropython-stubber v1.23.3
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -43,8 +43,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.23.2"
-version_str = __version__.rsplit(".", 1)[0]
+__version__ = "v1.23.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -248,7 +247,7 @@ class Stubber:
         ensure_folder(file_name)
         with open(file_name, "w") as fp:
             info_ = str(self.info).replace("OrderedDict(", "").replace("})", "}")
-            s = '"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(module_name, self._fwid, info_, version_str)
+            s = '"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(module_name, self._fwid, info_, __version__)
             fp.write(s)
             fp.write("from __future__ import annotations\nfrom typing import Any, Generator\nfrom _typeshed import Incomplete\n\n")
             self.write_object_stub(fp, new_module, module_name, "")
@@ -443,7 +442,7 @@ class Stubber:
                 f.write("{")
                 f.write(dumps({"firmware": self.info})[1:-1])
                 f.write(",\n")
-                f.write(dumps({"stubber": {"version": version_str}, "stubtype": "firmware"})[1:-1])
+                f.write(dumps({"stubber": {"version": __version__}, "stubtype": "firmware"})[1:-1])
                 f.write(",\n")
                 f.write('"modules" :[\n')
 
@@ -502,7 +501,7 @@ def ensure_folder(path: str):
 
 def _build(s):
     # extract build from sys.version or os.uname().version if available
-    # sys.version: 'MicroPython v1.23.2-preview.6.g3d0b6276f'
+    # sys.version: 'MicroPython v1.23.3-preview.6.g3d0b6276f'
     # sys.implementation.version: 'v1.13-103-gb137d064e'
     if not s:
         return ""
@@ -607,10 +606,10 @@ def _info():  # type:() -> dict[str, str]
         if (
             info["version"]
             and info["version"].endswith(".0")
-            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.23.2 do not have a micro .0
+            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.23.3 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.23.2 do not have a micro .0
+            # versions from 1.10.0 to 1.23.3 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable

stubber/board/createstubs_db_min.py

@@ -1,33 +1,33 @@
-A3='No report file'
-A2='Failed to create the report.'
-A1='method'
-A0='function'
-z='bool'
-y='str'
-x='float'
-w='int'
-v='micropython'
-u='stubber'
-t=Exception
-s=KeyError
-r=sorted
-q=MemoryError
-p=NotImplementedError
-l=',\n'
-k='modules.json'
-j='{}/{}'
-i='w'
-h='dict'
-g='list'
-f='tuple'
-e=TypeError
-d=str
-c=repr
-X='-preview'
-W='-'
-V='board'
-U=IndexError
-T=print
+A2='No report file'
+A1='Failed to create the report.'
+A0='method'
+z='function'
+y='bool'
+x='str'
+w='float'
+v='int'
+u='micropython'
+t='stubber'
+s=Exception
+r=KeyError
+q=sorted
+p=MemoryError
+o=NotImplementedError
+k=',\n'
+j='modules.json'
+i='{}/{}'
+h='w'
+g='dict'
+f='list'
+e='tuple'
+d=TypeError
+c=str
+b=repr
+W='-preview'
+V='-'
+U='board'
+T=IndexError
+S=print
 R=True
 Q='family'
 P=len
@@ -49,15 +49,14 @@ try:from ujson import dumps
 except:from json import dumps
 try:from machine import reset
 except O:pass
-try:from collections import OrderedDict as m
-except O:from ucollections import OrderedDict as m
-__version__='v1.23.2'
-S=__version__.rsplit(J,1)[0]
+try:from collections import OrderedDict as l
+except O:from ucollections import OrderedDict as l
+__version__='v1.23.3'
+A3=2
 A4=2
-A5=2
-A6=['lib','/lib','/sd/lib','/flash/lib',J]
+A5=['lib','/lib','/sd/lib','/flash/lib',J]
 class L:
-	INFO=20;WARNING=30;ERROR=40;level=INFO;prnt=T
+	INFO=20;WARNING=30;ERROR=40;level=INFO;prnt=S
 	@staticmethod
 	def getLogger(name):return L()
 	@classmethod
@@ -68,24 +67,24 @@ class L:
 		if A.level<=L.WARNING:A.prnt('WARN  :',msg)
 	def error(A,msg):
 		if A.level<=L.ERROR:A.prnt('ERROR :',msg)
-A=L.getLogger(u)
+A=L.getLogger(t)
 L.basicConfig(level=L.INFO)
 class Stubber:
 	def __init__(B,path=E,firmware_id=E):
 		C=firmware_id
 		try:
-			if os.uname().release=='1.13.0'and os.uname().version<'v1.13-103':raise p('MicroPython 1.13.0 cannot be stubbed')
+			if os.uname().release=='1.13.0'and os.uname().version<'v1.13-103':raise o('MicroPython 1.13.0 cannot be stubbed')
 		except I:pass
-		B.info=_info();A.info('Port: {}'.format(B.info[K]));A.info('Board: {}'.format(B.info[V]));F.collect()
+		B.info=_info();A.info('Port: {}'.format(B.info[K]));A.info('Board: {}'.format(B.info[U]));F.collect()
 		if C:B._fwid=C.lower()
-		elif B.info[Q]==v:B._fwid='{family}-v{version}-{port}-{board}'.format(**B.info).rstrip(W)
+		elif B.info[Q]==u:B._fwid='{family}-v{version}-{port}-{board}'.format(**B.info).rstrip(V)
 		else:B._fwid='{family}-v{version}-{port}'.format(**B.info)
 		B._start_free=F.mem_free()
 		if path:
 			if path.endswith(G):path=path[:-1]
 		else:path=get_root()
 		B.path='{}/stubs/{}'.format(path,B.flat_fwid).replace('//',G)
-		try:Y(path+G)
+		try:X(path+G)
 		except D:A.error('error creating stub folder {}'.format(path))
 		B.problematic=['upip','upysh','webrepl_setup','http_client','http_client_ssl','http_server','http_server_ssl'];B.excluded=['webrepl','_webrepl','port_diag','example_sub_led.py','example_pub_button.py'];B.modules=[];B._json_name=E;B._json_first=H
 	def get_obj_attributes(L,item_instance):
@@ -94,17 +93,17 @@ class Stubber:
 			if A.startswith('__')and not A in L.modules:continue
 			try:
 				D=getattr(H,A)
-				try:E=c(type(D)).split("'")[1]
-				except U:E=B
-				if E in{w,x,y,z,f,g,h}:G=1
-				elif E in{A0,A1}:G=2
+				try:E=b(type(D)).split("'")[1]
+				except T:E=B
+				if E in{v,w,x,y,e,f,g}:G=1
+				elif E in{z,A0}:G=2
 				elif E in'class':G=3
 				else:G=4
-				C.append((A,c(D),c(type(D)),D,G))
+				C.append((A,b(D),b(type(D)),D,G))
 			except I as J:K.append("Couldn't get attribute '{}' from object '{}', Err: {}".format(A,H,J))
-			except q as J:T('MemoryError: {}'.format(J));sleep(1);reset()
-		C=r([A for A in C if not A[0].startswith('__')],key=lambda x:x[4]);F.collect();return C,K
-	def add_modules(A,modules):A.modules=r(set(A.modules)|set(modules))
+			except p as J:S('MemoryError: {}'.format(J));sleep(1);reset()
+		C=q([A for A in C if not A[0].startswith('__')],key=lambda x:x[4]);F.collect();return C,K
+	def add_modules(A,modules):A.modules=q(set(A.modules)|set(modules))
 	def create_all_stubs(B):
 		A.info('Start micropython-stubber {} on {}'.format(__version__,B._fwid));B.report_start();F.collect()
 		for C in B.modules:B.create_one_stub(C)
@@ -125,12 +124,12 @@ class Stubber:
 		N=E
 		try:N=__import__(C,E,E,'*');Q=F.mem_free();A.info('Stub module: {:<25} to file: {:<70} mem:{:>5}'.format(C,L,Q))
 		except O:return H
-		Y(I)
-		with M(I,i)as P:T=d(K.info).replace('OrderedDict(',B).replace('})','}');U='"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(C,K._fwid,T,S);P.write(U);P.write('from __future__ import annotations\nfrom typing import Any, Generator\nfrom _typeshed import Incomplete\n\n');K.write_object_stub(P,N,C,B)
+		X(I)
+		with M(I,h)as P:S=c(K.info).replace('OrderedDict(',B).replace('})','}');T='"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(C,K._fwid,S,__version__);P.write(T);P.write('from __future__ import annotations\nfrom typing import Any, Generator\nfrom _typeshed import Incomplete\n\n');K.write_object_stub(P,N,C,B)
 		K.report_add(C,I)
 		if C not in{'os','sys','logging','gc'}:
 			try:del N
-			except(D,s):A.warning('could not del new_module')
+			except(D,r):A.warning('could not del new_module')
 		F.collect();return R
 	def write_object_stub(L,fp,object_expr,obj_name,indent,in_class=0):
 		Z=' at ...>';Y='generator';X='{0}{1}: {3} = {2}\n';W='bound_method';V='Incomplete';O=in_class;N='Exception';M=object_expr;K=' at ';J=fp;D=indent;F.collect()
@@ -140,13 +139,13 @@ class Stubber:
 		for(E,H,I,b,d)in a:
 			if E in['classmethod','staticmethod','BaseException',N]:continue
 			if E[0].isdigit():A.warning('NameError: invalid name {}'.format(E));continue
-			if I=="<class 'type'>"and P(D)<=A5*4:
+			if I=="<class 'type'>"and P(D)<=A4*4:
 				R=B;S=E.endswith(N)or E.endswith('Error')or E in['KeyboardInterrupt','StopIteration','SystemExit']
 				if S:R=N
 				C='\n{}class {}({}):\n'.format(D,E,R)
 				if S:C+=D+'    ...\n';J.write(C);continue
 				J.write(C);L.write_object_stub(J,b,'{0}.{1}'.format(obj_name,E),D+'    ',O+1);C=D+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=D+'        ...\n\n';J.write(C)
-			elif any(A in I for A in[A1,A0,'closure']):
+			elif any(A in I for A in[A0,z,'closure']):
 				T=V;U=B
 				if O>0:U='self, '
 				if W in I or W in H:C='{}@classmethod\n'.format(D)+'{}def {}(cls, *args, **kwargs) -> {}:\n'.format(D,E,T)
@@ -155,8 +154,8 @@ class Stubber:
 			elif I=="<class 'module'>":0
 			elif I.startswith("<class '"):
 				G=I[8:-2];C=B
-				if G in(y,w,x,z,'bytearray','bytes'):C=X.format(D,E,H,G)
-				elif G in(h,g,f):c={h:'{}',g:'[]',f:'()'};C=X.format(D,E,c[G],G)
+				if G in(x,v,w,y,'bytearray','bytes'):C=X.format(D,E,H,G)
+				elif G in(g,f,e):c={g:'{}',f:'[]',e:'()'};C=X.format(D,E,c[G],G)
 				elif G in('object','set','frozenset','Pin',Y):
 					if G==Y:G='Generator'
 					C='{0}{1}: {2} ## = {4}\n'.format(D,E,G,I,H)
@@ -178,29 +177,29 @@ class Stubber:
 		try:os.stat(path);F=os.listdir(path)
 		except(D,I):return
 		for G in F:
-			B=j.format(path,G)
+			B=i.format(path,G)
 			try:os.remove(B)
 			except D:
 				try:C.clean(B);os.rmdir(B)
 				except D:pass
-	def report_start(B,filename=k):
-		H='firmware';B._json_name=j.format(B.path,filename);B._json_first=R;Y(B._json_name);A.info('Report file: {}'.format(B._json_name));F.collect()
+	def report_start(B,filename=j):
+		H='firmware';B._json_name=i.format(B.path,filename);B._json_first=R;X(B._json_name);A.info('Report file: {}'.format(B._json_name));F.collect()
 		try:
-			with M(B._json_name,i)as G:G.write('{');G.write(dumps({H:B.info})[1:-1]);G.write(l);G.write(dumps({u:{C:S},'stubtype':H})[1:-1]);G.write(l);G.write('"modules" :[\n')
-		except D as I:A.error(A2);B._json_name=E;raise I
+			with M(B._json_name,h)as G:G.write('{');G.write(dumps({H:B.info})[1:-1]);G.write(k);G.write(dumps({t:{C:__version__},'stubtype':H})[1:-1]);G.write(k);G.write('"modules" :[\n')
+		except D as I:A.error(A1);B._json_name=E;raise I
 	def report_add(B,module_name,stub_file):
-		if not B._json_name:raise t(A3)
+		if not B._json_name:raise s(A2)
 		try:
 			with M(B._json_name,'a')as C:
-				if not B._json_first:C.write(l)
+				if not B._json_first:C.write(k)
 				else:B._json_first=H
 				E='{{"module": "{}", "file": "{}"}}'.format(module_name,stub_file.replace('\\',G));C.write(E)
-		except D:A.error(A2)
+		except D:A.error(A1)
 	def report_end(B):
-		if not B._json_name:raise t(A3)
+		if not B._json_name:raise s(A2)
 		with M(B._json_name,'a')as C:C.write('\n]}')
 		A.info('Path: {}'.format(B.path))
-def Y(path):
+def X(path):
 	B=E=0
 	while B!=-1:
 		B=path.find(G,E)
@@ -208,57 +207,57 @@ def Y(path):
 			C=path[0]if B==0 else path[:B]
 			try:I=os.stat(C)
 			except D as F:
-				if F.args[0]==A4:
+				if F.args[0]==A3:
 					try:os.mkdir(C)
 					except D as H:A.error('failed to create folder {}'.format(C));raise H
 		E=B+1
-def Z(s):
+def Y(s):
 	C=' on '
 	if not s:return B
 	s=s.split(C,1)[0]if C in s else s
 	if s.startswith('v'):
-		if not W in s:return B
-		A=s.split(W)[1];return A
-	if not X in s:return B
-	A=s.split(X)[1].split(J)[1];return A
+		if not V in s:return B
+		A=s.split(V)[1];return A
+	if not W in s:return B
+	A=s.split(W)[1].split(J)[1];return A
 def _info():
-	b='ev3-pybricks';a='pycom';Y='pycopy';W='unix';T='win32';R='arch';P='cpu';M='ver';F='mpy';D='build'
+	a='ev3-pybricks';Z='pycom';X='pycopy';V='unix';S='win32';R='arch';P='cpu';M='ver';F='mpy';D='build'
 	try:H=sys.implementation[0]
-	except e:H=sys.implementation.name
-	A=m({Q:H,C:B,D:B,M:B,K:sys.platform,V:'UNKNOWN',P:B,F:B,R:B})
+	except d:H=sys.implementation.name
+	A=l({Q:H,C:B,D:B,M:B,K:sys.platform,U:'UNKNOWN',P:B,F:B,R:B})
 	if A[K].startswith('pyb'):A[K]='stm32'
-	elif A[K]==T:A[K]='windows'
-	elif A[K]=='linux':A[K]=W
-	try:A[C]=S(sys.implementation.version)
+	elif A[K]==S:A[K]='windows'
+	elif A[K]=='linux':A[K]=V
+	try:A[C]=A6(sys.implementation.version)
 	except I:pass
-	try:J=sys.implementation._machine if'_machine'in N(sys.implementation)else os.uname().machine;A[V]=J;A[P]=J.split('with')[-1].strip();A[F]=sys.implementation._mpy if'_mpy'in N(sys.implementation)else sys.implementation.mpy if F in N(sys.implementation)else B
-	except(I,U):pass
-	A[V]=A7()
+	try:J=sys.implementation._machine if'_machine'in N(sys.implementation)else os.uname().machine;A[U]=J;A[P]=J.split('with')[-1].strip();A[F]=sys.implementation._mpy if'_mpy'in N(sys.implementation)else sys.implementation.mpy if F in N(sys.implementation)else B
+	except(I,T):pass
+	A[U]=A7()
 	try:
 		if'uname'in N(os):
-			A[D]=Z(os.uname()[3])
-			if not A[D]:A[D]=Z(os.uname()[2])
-		elif C in N(sys):A[D]=Z(sys.version)
-	except(I,U,e):pass
-	if A[C]==B and sys.platform not in(W,T):
-		try:c=os.uname();A[C]=c.release
-		except(U,I,e):pass
-	for(d,f,g)in[(Y,Y,'const'),(a,a,'FAT'),(b,'pybricks.hubs','EV3Brick')]:
-		try:h=__import__(f,E,E,g);A[Q]=d;del h;break
-		except(O,s):pass
-	if A[Q]==b:A['release']='2.0.0'
-	if A[Q]==v:
+			A[D]=Y(os.uname()[3])
+			if not A[D]:A[D]=Y(os.uname()[2])
+		elif C in N(sys):A[D]=Y(sys.version)
+	except(I,T,d):pass
+	if A[C]==B and sys.platform not in(V,S):
+		try:b=os.uname();A[C]=b.release
+		except(T,I,d):pass
+	for(c,e,f)in[(X,X,'const'),(Z,Z,'FAT'),(a,'pybricks.hubs','EV3Brick')]:
+		try:g=__import__(e,E,E,f);A[Q]=c;del g;break
+		except(O,r):pass
+	if A[Q]==a:A['release']='2.0.0'
+	if A[Q]==u:
 		A[C]
 		if A[C]and A[C].endswith('.0')and A[C]>='1.10.0'and A[C]<='1.19.9':A[C]=A[C][:-2]
 	if F in A and A[F]:
 		G=int(A[F]);L=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][G>>10]
 		if L:A[R]=L
 		A[F]='v{}.{}'.format(G&255,G>>8&3)
-	if A[D]and not A[C].endswith(X):A[C]=A[C]+X
+	if A[D]and not A[C].endswith(W):A[C]=A[C]+W
 	A[M]=f"{A[C]}-{A[D]}"if A[D]else f"{A[C]}";return A
-def S(version):
-	A=version;B=J.join([d(A)for A in A[:3]])
-	if P(A)>3 and A[3]:B+=W+A[3]
+def A6(version):
+	A=version;B=J.join([c(A)for A in A[:3]])
+	if P(A)>3 and A[3]:B+=V+A[3]
 	return B
 def A7():
 	try:from boardname import BOARDNAME as C;A.info('Found BOARDNAME: {}'.format(C))
@@ -272,28 +271,28 @@ def get_root():
 		try:C=os.stat(B);break
 		except D:continue
 	return B
-def a(filename):
+def Z(filename):
 	try:
 		if os.stat(filename)[0]>>14:return R
 		return H
 	except D:return H
-def n():T("-p, --path   path to store the stubs in, defaults to '.'");sys.exit(1)
+def m():S("-p, --path   path to store the stubs in, defaults to '.'");sys.exit(1)
 def read_path():
 	path=B
 	if P(sys.argv)==3:
 		A=sys.argv[1].lower()
 		if A in('--path','-p'):path=sys.argv[2]
-		else:n()
-	elif P(sys.argv)==2:n()
+		else:m()
+	elif P(sys.argv)==2:m()
 	return path
-def o():
-	try:A=bytes('abc',encoding='utf8');B=o.__module__;return H
-	except(p,I):return R
-b='modulelist.done'
+def n():
+	try:A=bytes('abc',encoding='utf8');B=n.__module__;return H
+	except(o,I):return R
+a='modulelist.done'
 def A8(skip=0):
-	for E in A6:
+	for E in A5:
 		B=E+'/modulelist.txt'
-		if not a(B):continue
+		if not Z(B):continue
 		try:
 			with M(B)as F:
 				C=0
@@ -307,27 +306,27 @@ def A8(skip=0):
 				break
 		except D:pass
 def A9(done):
-	with M(b,i)as A:A.write(d(done)+'\n')
+	with M(a,h)as A:A.write(c(done)+'\n')
 def AA():
 	A=0
 	try:
-		with M(b)as B:A=int(B.readline().strip())
+		with M(a)as B:A=int(B.readline().strip())
 	except D:pass
 	return A
 def main():
-	import machine as D;C=a(b)
+	import machine as D;C=Z(a)
 	if C:A.info('Continue from last run')
 	else:A.info('Starting new run')
 	stubber=Stubber(path=read_path());B=0
-	if not C:stubber.clean();stubber.report_start(k)
-	else:B=AA();stubber._json_name=j.format(stubber.path,k)
+	if not C:stubber.clean();stubber.report_start(j)
+	else:B=AA();stubber._json_name=i.format(stubber.path,j)
 	for E in A8(B):
 		try:stubber.create_one_stub(E)
-		except q:D.reset()
+		except p:D.reset()
 		F.collect();B+=1;A9(B)
-	T('All modules have been processed, Finalizing report');stubber.report_end()
-if __name__=='__main__'or o():
-	if not a('no_auto_stubber.txt'):
+	S('All modules have been processed, Finalizing report');stubber.report_end()
+if __name__=='__main__'or n():
+	if not Z('no_auto_stubber.txt'):
 		try:F.threshold(4*1024);F.enable()
 		except BaseException:pass
 		main()