micropython-stubber 1.17.5__py3-none-any.whl → 1.19.0__py3-none-any.whl

stubber/board/createstubs_mem_min.py

@@ -8,16 +8,16 @@ r='str'
 q='float'
 p='int'
 o='stubber'
-n=TypeError
-m=Exception
-l=KeyError
-k=sorted
-j=NotImplementedError
-e=',\n'
-d='dict'
-c='list'
-b='tuple'
-a='micropython'
+n=Exception
+m=KeyError
+l=sorted
+k=NotImplementedError
+f=',\n'
+e='dict'
+d='list'
+c='tuple'
+b='micropython'
+a=TypeError
 Z=repr
 W='-preview'
 V='-'
@@ -45,9 +45,9 @@ try:from ujson import dumps
 except:from json import dumps
 try:from machine import reset
 except N:pass
-try:from collections import OrderedDict as f
-except N:from ucollections import OrderedDict as f
-__version__='v1.17.5'
+try:from collections import OrderedDict as g
+except N:from ucollections import OrderedDict as g
+__version__='v1.19.0'
 y=2
 z=2
 A0=['lib','/lib','/sd/lib','/flash/lib',J]
@@ -69,11 +69,11 @@ 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 j('MicroPython 1.13.0 cannot be stubbed')
+			if os.uname().release=='1.13.0'and os.uname().version<'v1.13-103':raise k('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[U]));D.collect()
 		if C:B._fwid=C.lower()
-		elif B.info[Q]==a:B._fwid='{family}-v{version}-{port}-{board}'.format(**B.info).rstrip(V)
+		elif B.info[Q]==b: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=D.mem_free()
 		if path:
@@ -91,15 +91,15 @@ class Stubber:
 				E=getattr(H,A)
 				try:F=Z(type(E)).split("'")[1]
 				except T:F=B
-				if F in{p,q,r,s,b,c,d}:G=1
+				if F in{p,q,r,s,c,d,e}:G=1
 				elif F in{t,u}:G=2
 				elif F in'class':G=3
 				else:G=4
 				C.append((A,Z(E),Z(type(E)),E,G))
 			except I as J:K.append("Couldn't get attribute '{}' from object '{}', Err: {}".format(A,H,J))
 			except MemoryError as J:S('MemoryError: {}'.format(J));sleep(1);reset()
-		C=k([A for A in C if not A[0].startswith('__')],key=lambda x:x[4]);D.collect();return C,K
-	def add_modules(A,modules):A.modules=k(set(A.modules)|set(modules))
+		C=l([A for A in C if not A[0].startswith('__')],key=lambda x:x[4]);D.collect();return C,K
+	def add_modules(A,modules):A.modules=l(set(A.modules)|set(modules))
 	def create_all_stubs(B):
 		A.info('Start micropython-stubber {} on {}'.format(__version__,B._fwid));B.report_start();D.collect()
 		for C in B.modules:B.create_one_stub(C)
@@ -125,14 +125,14 @@ class Stubber:
 		K.report_add(C,I)
 		if C not in{'os','sys','logging','gc'}:
 			try:del M
-			except(F,l):A.warning('could not del new_module')
+			except(F,m):A.warning('could not del new_module')
 		D.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;E=indent;D.collect()
 		if M in L.problematic:A.warning('SKIPPING problematic module:{}'.format(M));return
 		a,Q=L.get_obj_attributes(M)
 		if Q:A.error(Q)
-		for(F,H,I,e,g)in a:
+		for(F,H,I,b,g)in a:
 			if F in['classmethod','staticmethod','BaseException',N]:continue
 			if F[0].isdigit():A.warning('NameError: invalid name {}'.format(F));continue
 			if I=="<class 'type'>"and P(E)<=z*4:
@@ -140,7 +140,7 @@ class Stubber:
 				if S:R=N
 				C='\n{}class {}({}):\n'.format(E,F,R)
 				if S:C+=E+'    ...\n';J.write(C);continue
-				J.write(C);L.write_object_stub(J,e,'{0}.{1}'.format(obj_name,F),E+'    ',O+1);C=E+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=E+'        ...\n\n';J.write(C)
+				J.write(C);L.write_object_stub(J,b,'{0}.{1}'.format(obj_name,F),E+'    ',O+1);C=E+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=E+'        ...\n\n';J.write(C)
 			elif any(A in I for A in[u,t,'closure']):
 				T=V;U=B
 				if O>0:U='self, '
@@ -151,7 +151,7 @@ class Stubber:
 			elif I.startswith("<class '"):
 				G=I[8:-2];C=B
 				if G in(r,p,q,s,'bytearray','bytes'):C=X.format(E,F,H,G)
-				elif G in(d,c,b):f={d:'{}',c:'[]',b:'()'};C=X.format(E,F,f[G],G)
+				elif G in(e,d,c):f={e:'{}',d:'[]',c:'()'};C=X.format(E,F,f[G],G)
 				elif G in('object','set','frozenset','Pin',Y):
 					if G==Y:G='Generator'
 					C='{0}{1}: {2} ## = {4}\n'.format(E,F,G,I,H)
@@ -181,18 +181,18 @@ class Stubber:
 	def report_start(B,filename='modules.json'):
 		H='firmware';B._json_name=v.format(B.path,filename);B._json_first=R;X(B._json_name);A.info('Report file: {}'.format(B._json_name));D.collect()
 		try:
-			with O(B._json_name,'w')as G:G.write('{');G.write(dumps({H:B.info})[1:-1]);G.write(e);G.write(dumps({o:{C:__version__},'stubtype':H})[1:-1]);G.write(e);G.write('"modules" :[\n')
+			with O(B._json_name,'w')as G:G.write('{');G.write(dumps({H:B.info})[1:-1]);G.write(f);G.write(dumps({o:{C:__version__},'stubtype':H})[1:-1]);G.write(f);G.write('"modules" :[\n')
 		except F as I:A.error(w);B._json_name=E;raise I
 	def report_add(B,module_name,stub_file):
-		if not B._json_name:raise m(x)
+		if not B._json_name:raise n(x)
 		try:
 			with O(B._json_name,'a')as C:
-				if not B._json_first:C.write(e)
+				if not B._json_first:C.write(f)
 				else:B._json_first=H
 				D='{{"module": "{}", "file": "{}"}}'.format(module_name,stub_file.replace('\\',G));C.write(D)
 		except F:A.error(w)
 	def report_end(B):
-		if not B._json_name:raise m(x)
+		if not B._json_name:raise n(x)
 		with O(B._json_name,'a')as C:C.write('\n]}')
 		A.info('Path: {}'.format(B.path))
 def X(path):
@@ -217,13 +217,16 @@ def Y(s):
 	if not W in s:return B
 	A=s.split(W)[1].split(J)[1];return A
 def _info():
-	Z='ev3-pybricks';X='pycom';V='pycopy';S='unix';R='win32';P='arch';O='cpu';L='ver';F='mpy';D='build';A=f({Q:sys.implementation[0],C:B,D:B,L:B,K:sys.platform,U:'UNKNOWN',O:B,F:B,P:B})
+	c='ev3-pybricks';Z='pycom';X='pycopy';V='unix';S='win32';R='arch';P='cpu';O='ver';F='mpy';D='build'
+	try:H=sys.implementation[0]
+	except a:H=sys.implementation.name
+	A=g({Q:H,C:B,D:B,O:B,K:sys.platform,U:'UNKNOWN',P:B,F:B,R:B})
 	if A[K].startswith('pyb'):A[K]='stm32'
-	elif A[K]==R:A[K]='windows'
-	elif A[K]=='linux':A[K]=S
+	elif A[K]==S:A[K]='windows'
+	elif A[K]=='linux':A[K]=V
 	try:A[C]=A1(sys.implementation.version)
 	except I:pass
-	try:H=sys.implementation._machine if'_machine'in M(sys.implementation)else os.uname().machine;A[U]=H;A[O]=H.split('with')[-1].strip();A[F]=sys.implementation._mpy if'_mpy'in M(sys.implementation)else sys.implementation.mpy if F in M(sys.implementation)else B
+	try:J=sys.implementation._machine if'_machine'in M(sys.implementation)else os.uname().machine;A[U]=J;A[P]=J.split('with')[-1].strip();A[F]=sys.implementation._mpy if'_mpy'in M(sys.implementation)else sys.implementation.mpy if F in M(sys.implementation)else B
 	except(I,T):pass
 	A[U]=A2()
 	try:
@@ -231,23 +234,23 @@ def _info():
 			A[D]=Y(os.uname()[3])
 			if not A[D]:A[D]=Y(os.uname()[2])
 		elif C in M(sys):A[D]=Y(sys.version)
-	except(I,T,n):pass
-	if A[C]==B and sys.platform not in(S,R):
-		try:b=os.uname();A[C]=b.release
-		except(T,I,n):pass
-	for(c,d,e)in[(V,V,'const'),(X,X,'FAT'),(Z,'pybricks.hubs','EV3Brick')]:
-		try:g=__import__(d,E,E,e);A[Q]=c;del g;break
-		except(N,l):pass
-	if A[Q]==Z:A['release']='2.0.0'
-	if A[Q]==a:
+	except(I,T,a):pass
+	if A[C]==B and sys.platform not in(V,S):
+		try:d=os.uname();A[C]=d.release
+		except(T,I,a):pass
+	for(e,f,h)in[(X,X,'const'),(Z,Z,'FAT'),(c,'pybricks.hubs','EV3Brick')]:
+		try:i=__import__(f,E,E,h);A[Q]=e;del i;break
+		except(N,m):pass
+	if A[Q]==c:A['release']='2.0.0'
+	if A[Q]==b:
 		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]);J=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][G>>10]
-		if J:A[P]=J
+		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(W):A[C]=A[C]+W
-	A[L]=f"{A[C]}-{A[D]}"if A[D]else f"{A[C]}";return A
+	A[O]=f"{A[C]}-{A[D]}"if A[D]else f"{A[C]}";return A
 def A1(version):
 	A=version;B=J.join([str(A)for A in A[:3]])
 	if P(A)>3 and A[3]:B+=V+A[3]
@@ -264,41 +267,41 @@ def get_root():
 		try:C=os.stat(B);break
 		except F:continue
 	return B
-def g(filename):
+def h(filename):
 	try:
 		if os.stat(filename)[0]>>14:return R
 		return H
 	except F:return H
-def h():S("-p, --path   path to store the stubs in, defaults to '.'");sys.exit(1)
+def i():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:h()
-	elif P(sys.argv)==2:h()
+		else:i()
+	elif P(sys.argv)==2:i()
 	return path
-def i():
-	try:A=bytes('abc',encoding='utf8');B=i.__module__;return H
-	except(j,I):return R
+def j():
+	try:A=bytes('abc',encoding='utf8');B=j.__module__;return H
+	except(k,I):return R
 def main():
 	stubber=Stubber(path=read_path());stubber.clean()
 	def A(stubber):
 		D.collect();stubber.modules=[]
 		for C in A0:
 			B=C+'/modulelist.txt'
-			if not g(B):continue
+			if not h(B):continue
 			with O(B)as E:
 				while R:
 					A=E.readline().strip()
 					if not A:break
 					if P(A)>0 and A[0]!='#':stubber.modules.append(A)
 				D.collect();S('BREAK');break
-		if not stubber.modules:stubber.modules=[a]
+		if not stubber.modules:stubber.modules=[b]
 		D.collect()
 	stubber.modules=[];A(stubber);D.collect();stubber.create_all_stubs()
-if __name__=='__main__'or i():
-	if not g('no_auto_stubber.txt'):
+if __name__=='__main__'or j():
+	if not h('no_auto_stubber.txt'):
 		try:D.threshold(4*1024);D.enable()
 		except BaseException:pass
 		main()

stubber/board/createstubs_min.py

@@ -10,17 +10,17 @@ r='str'
 q='float'
 p='int'
 o='stubber'
-n=TypeError
-m=Exception
-l=KeyError
-k=sorted
-j=NotImplementedError
-f='pycom'
-e=',\n'
-d='dict'
-c='list'
-b='tuple'
-a='micropython'
+n=Exception
+m=KeyError
+l=sorted
+k=NotImplementedError
+g='pycom'
+f=',\n'
+e='dict'
+d='list'
+c='tuple'
+b='micropython'
+a=TypeError
 Z=repr
 Y=print
 V='-preview'
@@ -48,9 +48,9 @@ try:from ujson import dumps
 except:from json import dumps
 try:from machine import reset
 except N:pass
-try:from collections import OrderedDict as g
-except N:from ucollections import OrderedDict as g
-__version__='v1.17.5'
+try:from collections import OrderedDict as h
+except N:from ucollections import OrderedDict as h
+__version__='v1.19.0'
 A0=2
 A1=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]
@@ -72,11 +72,11 @@ class Stubber:
 	def __init__(B,path=D,firmware_id=D):
 		C=firmware_id
 		try:
-			if os.uname().release=='1.13.0'and os.uname().version<'v1.13-103':raise j('MicroPython 1.13.0 cannot be stubbed')
+			if os.uname().release=='1.13.0'and os.uname().version<'v1.13-103':raise k('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[S]));F.collect()
 		if C:B._fwid=C.lower()
-		elif B.info[O]==a:B._fwid='{family}-v{version}-{port}-{board}'.format(**B.info).rstrip(T)
+		elif B.info[O]==b:B._fwid='{family}-v{version}-{port}-{board}'.format(**B.info).rstrip(T)
 		else:B._fwid='{family}-v{version}-{port}'.format(**B.info)
 		B._start_free=F.mem_free()
 		if path:
@@ -94,15 +94,15 @@ class Stubber:
 				D=getattr(H,A)
 				try:E=Z(type(D)).split("'")[1]
 				except P:E=B
-				if E in{p,q,r,s,b,c,d}:G=1
+				if E in{p,q,r,s,c,d,e}:G=1
 				elif E in{t,u}:G=2
 				elif E in'class':G=3
 				else:G=4
 				C.append((A,Z(D),Z(type(D)),D,G))
 			except I as J:K.append("Couldn't get attribute '{}' from object '{}', Err: {}".format(A,H,J))
 			except MemoryError as J:Y('MemoryError: {}'.format(J));sleep(1);reset()
-		C=k([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=k(set(A.modules)|set(modules))
+		C=l([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=l(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)
@@ -128,14 +128,14 @@ class Stubber:
 		K.report_add(C,I)
 		if C not in{'os',v,w,'gc'}:
 			try:del M
-			except(E,l):A.warning('could not del new_module')
+			except(E,m):A.warning('could not del new_module')
 		F.collect();return U
 	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()
 		if M in L.problematic:A.warning('SKIPPING problematic module:{}'.format(M));return
 		a,P=L.get_obj_attributes(M)
 		if P:A.error(P)
-		for(E,H,I,e,g)in a:
+		for(E,H,I,b,g)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 R(D)<=A1*4:
@@ -143,7 +143,7 @@ class Stubber:
 				if S:Q=N
 				C='\n{}class {}({}):\n'.format(D,E,Q)
 				if S:C+=D+'    ...\n';J.write(C);continue
-				J.write(C);L.write_object_stub(J,e,'{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)
+				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[u,t,'closure']):
 				T=V;U=B
 				if O>0:U='self, '
@@ -154,7 +154,7 @@ class Stubber:
 			elif I.startswith("<class '"):
 				G=I[8:-2];C=B
 				if G in(r,p,q,s,'bytearray','bytes'):C=X.format(D,E,H,G)
-				elif G in(d,c,b):f={d:'{}',c:'[]',b:'()'};C=X.format(D,E,f[G],G)
+				elif G in(e,d,c):f={e:'{}',d:'[]',c:'()'};C=X.format(D,E,f[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)
@@ -184,18 +184,18 @@ class Stubber:
 	def report_start(B,filename='modules.json'):
 		H='firmware';B._json_name=x.format(B.path,filename);B._json_first=U;W(B._json_name);A.info('Report file: {}'.format(B._json_name));F.collect()
 		try:
-			with Q(B._json_name,'w')as G:G.write('{');G.write(dumps({H:B.info})[1:-1]);G.write(e);G.write(dumps({o:{C:__version__},'stubtype':H})[1:-1]);G.write(e);G.write('"modules" :[\n')
+			with Q(B._json_name,'w')as G:G.write('{');G.write(dumps({H:B.info})[1:-1]);G.write(f);G.write(dumps({o:{C:__version__},'stubtype':H})[1:-1]);G.write(f);G.write('"modules" :[\n')
 		except E as I:A.error(y);B._json_name=D;raise I
 	def report_add(B,module_name,stub_file):
-		if not B._json_name:raise m(z)
+		if not B._json_name:raise n(z)
 		try:
 			with Q(B._json_name,'a')as C:
-				if not B._json_first:C.write(e)
+				if not B._json_first:C.write(f)
 				else:B._json_first=H
 				D='{{"module": "{}", "file": "{}"}}'.format(module_name,stub_file.replace('\\',G));C.write(D)
 		except E:A.error(y)
 	def report_end(B):
-		if not B._json_name:raise m(z)
+		if not B._json_name:raise n(z)
 		with Q(B._json_name,'a')as C:C.write('\n]}')
 		A.info('Path: {}'.format(B.path))
 def W(path):
@@ -220,13 +220,16 @@ def X(s):
 	if not V in s:return B
 	A=s.split(V)[1].split(J)[1];return A
 def _info():
-	Y='ev3-pybricks';W='pycopy';U='unix';T='win32';R='arch';Q='cpu';L='ver';F='mpy';E='build';A=g({O:sys.implementation[0],C:B,E:B,L:B,K:sys.platform,S:'UNKNOWN',Q:B,F:B,R:B})
+	Z='ev3-pybricks';Y='pycopy';W='unix';U='win32';T='arch';R='cpu';Q='ver';F='mpy';E='build'
+	try:H=sys.implementation[0]
+	except a:H=sys.implementation.name
+	A=h({O:H,C:B,E:B,Q:B,K:sys.platform,S:'UNKNOWN',R:B,F:B,T:B})
 	if A[K].startswith('pyb'):A[K]='stm32'
-	elif A[K]==T:A[K]='windows'
-	elif A[K]=='linux':A[K]=U
+	elif A[K]==U:A[K]='windows'
+	elif A[K]=='linux':A[K]=W
 	try:A[C]=A2(sys.implementation.version)
 	except I:pass
-	try:H=sys.implementation._machine if'_machine'in M(sys.implementation)else os.uname().machine;A[S]=H;A[Q]=H.split('with')[-1].strip();A[F]=sys.implementation._mpy if'_mpy'in M(sys.implementation)else sys.implementation.mpy if F in M(sys.implementation)else B
+	try:J=sys.implementation._machine if'_machine'in M(sys.implementation)else os.uname().machine;A[S]=J;A[R]=J.split('with')[-1].strip();A[F]=sys.implementation._mpy if'_mpy'in M(sys.implementation)else sys.implementation.mpy if F in M(sys.implementation)else B
 	except(I,P):pass
 	A[S]=A3()
 	try:
@@ -234,23 +237,23 @@ def _info():
 			A[E]=X(os.uname()[3])
 			if not A[E]:A[E]=X(os.uname()[2])
 		elif C in M(sys):A[E]=X(sys.version)
-	except(I,P,n):pass
-	if A[C]==B and sys.platform not in(U,T):
-		try:Z=os.uname();A[C]=Z.release
-		except(P,I,n):pass
-	for(b,c,d)in[(W,W,'const'),(f,f,'FAT'),(Y,'pybricks.hubs','EV3Brick')]:
-		try:e=__import__(c,D,D,d);A[O]=b;del e;break
-		except(N,l):pass
-	if A[O]==Y:A['release']='2.0.0'
-	if A[O]==a:
+	except(I,P,a):pass
+	if A[C]==B and sys.platform not in(W,U):
+		try:c=os.uname();A[C]=c.release
+		except(P,I,a):pass
+	for(d,e,f)in[(Y,Y,'const'),(g,g,'FAT'),(Z,'pybricks.hubs','EV3Brick')]:
+		try:i=__import__(e,D,D,f);A[O]=d;del i;break
+		except(N,m):pass
+	if A[O]==Z:A['release']='2.0.0'
+	if A[O]==b:
 		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]);J=[D,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][G>>10]
-		if J:A[R]=J
+		G=int(A[F]);L=[D,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][G>>10]
+		if L:A[T]=L
 		A[F]='v{}.{}'.format(G&255,G>>8&3)
 	if A[E]and not A[C].endswith(V):A[C]=A[C]+V
-	A[L]=f"{A[C]}-{A[E]}"if A[E]else f"{A[C]}";return A
+	A[Q]=f"{A[C]}-{A[E]}"if A[E]else f"{A[C]}";return A
 def A2(version):
 	A=version;B=J.join([str(A)for A in A[:3]])
 	if R(A)>3 and A[3]:B+=T+A[3]
@@ -272,20 +275,20 @@ def A4(filename):
 		if os.stat(filename)[0]>>14:return U
 		return H
 	except E:return H
-def h():Y("-p, --path   path to store the stubs in, defaults to '.'");sys.exit(1)
+def i():Y("-p, --path   path to store the stubs in, defaults to '.'");sys.exit(1)
 def read_path():
 	path=B
 	if R(sys.argv)==3:
 		A=sys.argv[1].lower()
 		if A in('--path','-p'):path=sys.argv[2]
-		else:h()
-	elif R(sys.argv)==2:h()
+		else:i()
+	elif R(sys.argv)==2:i()
 	return path
-def i():
-	try:A=bytes('abc',encoding='utf8');B=i.__module__;return H
-	except(j,I):return U
-def main():stubber=Stubber(path=read_path());stubber.clean();stubber.modules=['WM8960','_OTA','_asyncio','_boot_fat','_coap','_espnow','_flash_control_OTA','_main_pybytes','_mqtt','_mqtt_core','_msg_handl','_onewire','_periodical_pin','_pybytes','_pybytes_ca','_pybytes_config','_pybytes_config_reader','_pybytes_connection','_pybytes_constants','_pybytes_debug','_pybytes_library','_pybytes_machine_learning','_pybytes_main','_pybytes_protocol','_pybytes_pyconfig','_pybytes_pymesh_config','_rp2','_terminal','_thread','_uasyncio','_urequest','adcfft','aioble/__init__','aioble/central','aioble/client','aioble/core','aioble/device','aioble/l2cap','aioble/peripheral','aioble/security','aioble/server','aioespnow','ak8963','apa102','apa106','argparse','array','asyncio/__init__','asyncio/core','asyncio/event','asyncio/funcs','asyncio/lock','asyncio/stream','binascii','bluetooth','breakout_as7262','breakout_bh1745','breakout_bme280','breakout_bme68x','breakout_bmp280','breakout_dotmatrix','breakout_encoder','breakout_icp10125','breakout_ioexpander','breakout_ltr559','breakout_matrix11x7','breakout_mics6814','breakout_msa301','breakout_paa5100','breakout_pmw3901','breakout_potentiometer','breakout_rgbmatrix5x5','breakout_rtc','breakout_scd41','breakout_sgp30','breakout_trackball','breakout_vl53l5cx','btree','cmath','collections','crypto','cryptolib','curl','deflate','dht','display','display_driver_utils','ds18x20','encoder','errno','esp','esp32','espidf','espnow','ffi','flashbdev','framebuf','freesans20','fs_driver','functools','galactic','gc','gfx_pack','gsm','hashlib','heapq','hub75','ili9341','ili9XXX','imagetools','inisetup','interstate75','io','jpegdec','json','lcd160cr','lodepng',w,'lsm6dsox','lv_colors','lv_utils','lvgl','lwip','machine','math','microWebSocket','microWebSrv','microWebTemplate',a,'mip','mip/__init__','mip/__main__','motor','mpu6500','mpu9250','neopixel','network','ntptime','onewire','os','pcf85063a','picoexplorer','picographics','picokeypad','picoscroll','picounicorn','picowireless','pimoroni','pimoroni_bus','pimoroni_i2c','plasma','platform','pyb',f,'pye','qrcode','queue','random','requests','requests/__init__','rp2','rtch','samd','select','servo','socket','ssd1306','ssh','ssl','stm','struct',v,'termios','time','tpcalib','uarray','uasyncio/__init__','uasyncio/core','uasyncio/event','uasyncio/funcs','uasyncio/lock','uasyncio/stream','uasyncio/tasks','ubinascii','ubluetooth','ucollections','ucrypto','ucryptolib','uctypes','uerrno','uftpd','uhashlib','uheapq','uio','ujson','ulab','ulab/approx','ulab/compare','ulab/fft','ulab/filter','ulab/linalg','ulab/numerical','ulab/poly','ulab/user','ulab/vector','umachine','umqtt/__init__','umqtt/robust','umqtt/simple','uos','uplatform','uqueue','urandom','ure','urequests','urllib/urequest','uselect','usocket','ussl','ustruct','usys','utelnetserver','utime','utimeq','uwebsocket','uzlib',C,'websocket','websocket_helper','wipy','writer','xpt2046','ymodem','zephyr','zlib'];F.collect();stubber.create_all_stubs()
-if __name__=='__main__'or i():
+def j():
+	try:A=bytes('abc',encoding='utf8');B=j.__module__;return H
+	except(k,I):return U
+def main():stubber=Stubber(path=read_path());stubber.clean();stubber.modules=['WM8960','_OTA','_asyncio','_boot_fat','_coap','_espnow','_flash_control_OTA','_main_pybytes','_mqtt','_mqtt_core','_msg_handl','_onewire','_periodical_pin','_pybytes','_pybytes_ca','_pybytes_config','_pybytes_config_reader','_pybytes_connection','_pybytes_constants','_pybytes_debug','_pybytes_library','_pybytes_machine_learning','_pybytes_main','_pybytes_protocol','_pybytes_pyconfig','_pybytes_pymesh_config','_rp2','_terminal','_thread','_uasyncio','_urequest','adcfft','aioble/__init__','aioble/central','aioble/client','aioble/core','aioble/device','aioble/l2cap','aioble/peripheral','aioble/security','aioble/server','aioespnow','ak8963','apa102','apa106','argparse','array','asyncio/__init__','asyncio/core','asyncio/event','asyncio/funcs','asyncio/lock','asyncio/stream','binascii','bluetooth','breakout_as7262','breakout_bh1745','breakout_bme280','breakout_bme68x','breakout_bmp280','breakout_dotmatrix','breakout_encoder','breakout_icp10125','breakout_ioexpander','breakout_ltr559','breakout_matrix11x7','breakout_mics6814','breakout_msa301','breakout_paa5100','breakout_pmw3901','breakout_potentiometer','breakout_rgbmatrix5x5','breakout_rtc','breakout_scd41','breakout_sgp30','breakout_trackball','breakout_vl53l5cx','btree','cmath','collections','crypto','cryptolib','curl','deflate','dht','display','display_driver_utils','ds18x20','encoder','errno','esp','esp32','espidf','espnow','ffi','flashbdev','framebuf','freesans20','fs_driver','functools','galactic','gc','gfx_pack','gsm','hashlib','heapq','hub75','ili9341','ili9XXX','imagetools','inisetup','interstate75','io','jpegdec','json','lcd160cr','lodepng',w,'lsm6dsox','lv_colors','lv_utils','lvgl','lwip','machine','math','microWebSocket','microWebSrv','microWebTemplate',b,'mip','mip/__init__','mip/__main__','motor','mpu6500','mpu9250','neopixel','network','ntptime','onewire','os','pcf85063a','picoexplorer','picographics','picokeypad','picoscroll','picounicorn','picowireless','pimoroni','pimoroni_bus','pimoroni_i2c','plasma','platform','pyb',g,'pye','qrcode','queue','random','requests','requests/__init__','rp2','rtch','samd','select','servo','socket','ssd1306','ssh','ssl','stm','struct',v,'termios','time','tpcalib','uarray','uasyncio/__init__','uasyncio/core','uasyncio/event','uasyncio/funcs','uasyncio/lock','uasyncio/stream','uasyncio/tasks','ubinascii','ubluetooth','ucollections','ucrypto','ucryptolib','uctypes','uerrno','uftpd','uhashlib','uheapq','uio','ujson','ulab','ulab/approx','ulab/compare','ulab/fft','ulab/filter','ulab/linalg','ulab/numerical','ulab/poly','ulab/user','ulab/vector','umachine','umqtt/__init__','umqtt/robust','umqtt/simple','uos','uplatform','uqueue','urandom','ure','urequests','urllib/urequest','uselect','usocket','ussl','ustruct','usys','utelnetserver','utime','utimeq','uwebsocket','uzlib',C,'websocket','websocket_helper','wipy','writer','xpt2046','ymodem','zephyr','zlib'];F.collect();stubber.create_all_stubs()
+if __name__=='__main__'or j():
 	if not A4('no_auto_stubber.txt'):
 		try:F.threshold(4*1024);F.enable()
 		except BaseException:pass

stubber/bulk/mcu_stubber.py

@@ -16,14 +16,13 @@ from rich.console import Console
 from rich.table import Table
 from tenacity import retry, stop_after_attempt, wait_fixed
 
+from mpflash.mpremoteboard import ERROR, OK, MPRemoteBoard
 from stubber import utils
-from stubber.publish.merge_docstubs import get_board_path, merge_all_docstubs
+from stubber.publish.merge_docstubs import merge_all_docstubs
 from stubber.publish.pathnames import board_folder_name
 from stubber.publish.publish import build_multiple
 from stubber.utils.config import CONFIG
 
-from .mpremoteboard import ERROR, OK, MPRemoteBoard
-
 # TODO : make this a bit nicer
 HERE = Path(__file__).parent
 ###############################################################################################
@@ -442,10 +441,15 @@ def print_result_table(all_built: List, console: Console):
     table = Table(title="Results")
 
     table.add_column("Result", style="cyan")
-    table.add_column("Name", style="cyan")
+    table.add_column("Name/Path", style="cyan")
     table.add_column("Version", style="green")
     table.add_column("Error", style="red")
 
     for result in all_built:
-        table.add_row(result["result"], result["name"], result["version"], result["error"])
+        table.add_row(
+            result["result"],
+            (result["name"] + "\n" + result["path"]).strip(),
+            result["version"],
+            result["error"],
+        )
     console.print(table)

stubber/codemod/_partials/db_main.py

@@ -1,24 +1,22 @@
+# type: ignore
 """
 This file contains the `def main()` funcion for the db variant of createstubs.py
 - type_check_only is used to avoid circular imports
 The partial is enclosed in ###PARTIAL### and ###PARTIALEND### markers
 """
+
 # sourcery skip: require-parameter-annotation, for-append-to-extend, use-named-expression
 
-from io import TextIOWrapper
-from typing import TYPE_CHECKING, List, type_check_only
+from typing import TYPE_CHECKING, List
 
 if TYPE_CHECKING:
     import gc
     import logging
-    import sys
 
     class logging:
-        def getLogger(self, name: str) -> "logging":
-            ...
+        def getLogger(self, name: str) -> "logging": ...
 
-        def info(self, msg: str) -> None:
-            ...
+        def info(self, msg: str) -> None: ...
 
     log = logging()
 
@@ -28,36 +26,27 @@ if TYPE_CHECKING:
         modules = []
         _json_name: str
 
-        def __init__(self, path: str = "", firmware_id: str = "") -> None:
-            ...
+        def __init__(self, path: str = "", firmware_id: str = "") -> None: ...
 
-        def clean(self) -> None:
-            ...
+        def clean(self) -> None: ...
 
-        def create_one_stub(self, modulename: str) -> bool:
-            ...
+        def create_one_stub(self, modulename: str) -> bool: ...
 
-        def report_start(self, filename: str = "modules.json"):
-            ...
+        def report_start(self, filename: str = "modules.json"): ...
 
-        def report_end(self):
-            ...
+        def report_end(self): ...
 
-        def create_all_stubs(self):
-            ...
+        def create_all_stubs(self): ...
 
-    def read_path() -> str:
-        ...
+    def read_path() -> str: ...
 
     class _gc:
-        def collect(self) -> None:
-            ...
+        def collect(self) -> None: ...
 
     gc: _gc
     log = logging.getLogger("stubber")
 
-    def file_exists(filename: str) -> bool:
-        ...
+    def file_exists(filename: str) -> bool: ...
 
     LIBS = [".", "lib"]
 

stubber/codemod/_partials/lvgl_main.py

@@ -63,12 +63,12 @@ def main():
     except Exception:
         fw_id = "lvgl-{0}_{1}_{2}_{3}-{4}".format(8, 1, 0, "dev", sys.platform)
     finally:
-        stubber = Stubber(firmware_id=fw_id)
+        stubber = Stubber(firmware_id=fw_id) # type: ignore
     stubber.clean()
     # modules to stub : only lvgl specifics
     stubber.modules = ["io", "lodepng", "rtch", "lvgl"]  # spell-checker: enable
 
-    gc.collect()
+    gc.collect() # type: ignore
 
     stubber.create_all_stubs()
     stubber.report()

stubber/codemod/board.py

@@ -1,6 +1,7 @@
 """" 
 Codemods to create the different variants of createstubs.py
 """
+
 from __future__ import annotations
 
 from enum import Enum
@@ -129,7 +130,9 @@ class ReadModulesCodemod(codemod.Codemod):
 
     def __init__(self, context: codemod.CodemodContext, reader_node: Optional[cst.Module] = None):
         super().__init__(context)
-        self.modules_reader_node = reader_node or cst.parse_module(Partial.MODULES_READER.contents())
+        self.modules_reader_node = reader_node or cst.parse_module(
+            Partial.MODULES_READER.contents(),  # type: ignore
+        )
 
     def transform_module_impl(self, tree: cst.Module) -> cst.Module:
         """Replaces static modules list with file-load method."""
@@ -213,7 +216,9 @@ class LVGLCodemod(codemod.Codemod):
         # return self.modules_transform.transform_module_impl(tree)
 
         docstr_transformer = ModuleDocCodemod(self.context, _LVGL_MODULE_DOC)
-        def_main_tree = cst.parse_module(Partial.LVGL_MAIN.contents())
+        def_main_tree = cst.parse_module(
+            Partial.LVGL_MAIN.contents(),  # type: ignore
+        )
 
         work_tree = docstr_transformer.transform_module_impl(tree)
         matches = m.findall(work_tree, _DEF_MAIN_MATCHER, metadata_resolver=self)
@@ -253,7 +258,9 @@ class DBCodemod(codemod.Codemod):
     def transform_module_impl(self, tree: cst.Module) -> cst.Module:
         """Generates createstubs.py db variant."""
         docstr_transformer = ModuleDocCodemod(self.context, _DB_MODULE_DOC)
-        def_main_tree = cst.parse_module(Partial.DB_MAIN.contents())
+        def_main_tree = cst.parse_module(
+            Partial.DB_MAIN.contents(),  # type: ignore
+        )
 
         work_tree = docstr_transformer.transform_module_impl(tree)
         matches = m.findall(work_tree, _DEF_MAIN_MATCHER, metadata_resolver=self)