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

stubber/board/createstubs_db_min.py

@@ -26,16 +26,16 @@ b=repr
 W='-preview'
 V='-'
 U='board'
-T=IndexError
-S=print
-R=True
-Q='family'
-P=len
+T=True
+S='family'
+R=len
+Q=IndexError
+P=print
 O=ImportError
 N=dir
 M=open
-K='port'
-J='.'
+L='port'
+K='.'
 I=AttributeError
 H=False
 G='/'
@@ -51,33 +51,35 @@ try:from machine import reset
 except O:pass
 try:from collections import OrderedDict as l
 except O:from ucollections import OrderedDict as l
-__version__='v1.23.3'
+__version__='v1.24.0'
 A3=2
 A4=2
-A5=['lib','/lib','/sd/lib','/flash/lib',J]
-class L:
-	INFO=20;WARNING=30;ERROR=40;level=INFO;prnt=S
+A5=['lib','/lib','/sd/lib','/flash/lib',K]
+class J:
+	DEBUG=10;INFO=20;WARNING=30;ERROR=40;level=INFO;prnt=P
 	@staticmethod
-	def getLogger(name):return L()
+	def getLogger(name):return J()
 	@classmethod
 	def basicConfig(A,level):A.level=level
+	def debug(A,msg):
+		if A.level<=J.DEBUG:A.prnt('DEBUG :',msg)
 	def info(A,msg):
-		if A.level<=L.INFO:A.prnt('INFO  :',msg)
+		if A.level<=J.INFO:A.prnt('INFO  :',msg)
 	def warning(A,msg):
-		if A.level<=L.WARNING:A.prnt('WARN  :',msg)
+		if A.level<=J.WARNING:A.prnt('WARN  :',msg)
 	def error(A,msg):
-		if A.level<=L.ERROR:A.prnt('ERROR :',msg)
-A=L.getLogger(t)
-L.basicConfig(level=L.INFO)
+		if A.level<=J.ERROR:A.prnt('ERROR :',msg)
+A=J.getLogger(t)
+J.basicConfig(level=J.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 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[U]));F.collect()
+		B.info=_info();A.info('Port: {}'.format(B.info[L]));A.info('Board: {}'.format(B.info[U]));F.collect()
 		if C:B._fwid=C.lower()
-		elif B.info[Q]==u:B._fwid='{family}-v{version}-{port}-{board}'.format(**B.info).rstrip(V)
+		elif B.info[S]==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:
@@ -94,14 +96,14 @@ class Stubber:
 			try:
 				D=getattr(H,A)
 				try:E=b(type(D)).split("'")[1]
-				except T:E=B
+				except Q: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,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 p as J:S('MemoryError: {}'.format(J));sleep(1);reset()
+			except p as J:P('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):
@@ -112,60 +114,62 @@ class Stubber:
 		B=module_name
 		if B in C.problematic:A.warning('Skip module: {:<25}        : Known problematic'.format(B));return H
 		if B in C.excluded:A.warning('Skip module: {:<25}        : Excluded'.format(B));return H
-		I='{}/{}.pyi'.format(C.path,B.replace(J,G));F.collect();E=H
+		I='{}/{}.pyi'.format(C.path,B.replace(K,G));F.collect();E=H
 		try:E=C.create_module_stub(B,I)
 		except D:return H
 		F.collect();return E
-	def create_module_stub(K,module_name,file_name=E):
+	def create_module_stub(J,module_name,file_name=E):
 		I=file_name;C=module_name
-		if I is E:L=C.replace(J,'_')+'.pyi';I=K.path+G+L
+		if I is E:L=C.replace(K,'_')+'.pyi';I=J.path+G+L
 		else:L=I.split(G)[-1]
-		if G in C:C=C.replace(G,J)
+		if G in C:C=C.replace(G,K)
 		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
 		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)
+		with M(I,h)as P:R=c(J.info).replace('OrderedDict(',B).replace('})','}');S='"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(C,J._fwid,R,__version__);P.write(S);P.write('from __future__ import annotations\nfrom typing import Any, Generator\nfrom _typeshed import Incomplete\n\n');J.write_object_stub(P,N,C,B)
+		J.report_add(C,I)
 		if C not in{'os','sys','logging','gc'}:
 			try:del N
 			except(D,r):A.warning('could not del new_module')
-		F.collect();return R
+		F.collect();return T
 	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()
+		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;F.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(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)<=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)
+		a,P=L.get_obj_attributes(M)
+		if P:A.error(P)
+		for(C,H,I,b,d)in a:
+			if C in['classmethod','staticmethod','BaseException',N]:continue
+			if C[0].isdigit():A.warning('NameError: invalid name {}'.format(C));continue
+			if I=="<class 'type'>"and R(E)<=A4*4:
+				Q=B;S=C.endswith(N)or C.endswith('Error')or C in['KeyboardInterrupt','StopIteration','SystemExit']
+				if S:Q=N
+				D='\n{}class {}({}):\n'.format(E,C,Q)
+				if S:D+=E+'    ...\n';J.write(D);continue
+				J.write(D);L.write_object_stub(J,b,'{0}.{1}'.format(obj_name,C),E+'    ',O+1);D=E+'    def __init__(self, *argv, **kwargs) -> None:\n';D+=E+'        ...\n\n';J.write(D)
 			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)
-				else:C='{}def {}({}*args, **kwargs) -> {}:\n'.format(D,E,U,T)
-				C+=D+'    ...\n\n';J.write(C)
+				if W in I or W in H:D='{}@classmethod\n'.format(E)+'{}def {}(cls, *args, **kwargs) -> {}:\n'.format(E,C,T)
+				else:D='{}def {}({}*args, **kwargs) -> {}:\n'.format(E,C,U,T)
+				D+=E+'    ...\n\n';J.write(D)
 			elif I=="<class 'module'>":0
 			elif I.startswith("<class '"):
-				G=I[8:-2];C=B
-				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)
+				G=I[8:-2];D=B
+				if G in(x,v,w,y,'bytearray','bytes'):
+					if C.upper()==C:D='{0}{1}: Final[{3}] = {2}\n'.format(E,C,H,G)
+					else:D=X.format(E,C,H,G)
+				elif G in(g,f,e):c={g:'{}',f:'[]',e:'()'};D=X.format(E,C,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)
+					D='{0}{1}: {2} ## = {4}\n'.format(E,C,G,I,H)
 				else:
 					G=V
 					if K in H:H=H.split(K)[0]+Z
 					if K in H:H=H.split(K)[0]+Z
-					C='{0}{1}: {2} ## {3} = {4}\n'.format(D,E,G,I,H)
-				J.write(C)
-			else:J.write("# all other, type = '{0}'\n".format(I));J.write(D+E+' # type: Incomplete\n')
+					D='{0}{1}: {2} ## {3} = {4}\n'.format(E,C,G,I,H)
+				J.write(D)
+			else:J.write("# all other, type = '{0}'\n".format(I));J.write(E+C+' # type: Incomplete\n')
 	@property
 	def flat_fwid(self):
 		A=self._fwid;B=' .()/\\:$'
@@ -183,7 +187,7 @@ class Stubber:
 				try:C.clean(B);os.rmdir(B)
 				except D:pass
 	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()
+		H='firmware';B._json_name=i.format(B.path,filename);B._json_first=T;X(B._json_name);A.info('Report file: {}'.format(B._json_name));F.collect()
 		try:
 			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
@@ -208,7 +212,7 @@ def X(path):
 			try:I=os.stat(C)
 			except D as F:
 				if F.args[0]==A3:
-					try:os.mkdir(C)
+					try:A.debug('Create folder {}'.format(C));os.mkdir(C)
 					except D as H:A.error('failed to create folder {}'.format(C));raise H
 		E=B+1
 def Y(s):
@@ -219,45 +223,47 @@ def Y(s):
 		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
+	A=s.split(W)[1].split(K)[1];return A
 def _info():
-	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 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]==S:A[K]='windows'
-	elif A[K]=='linux':A[K]=V
+	a='ev3-pybricks';Z='pycom';X='pycopy';V='unix';T='win32';R='arch';P='cpu';M='ver';F='mpy';D='build'
+	try:J=sys.implementation[0]
+	except d:J=sys.implementation.name
+	A=l({S:J,C:B,D:B,M:B,L:sys.platform,U:'UNKNOWN',P:B,F:B,R:B})
+	if A[L].startswith('pyb'):A[L]='stm32'
+	elif A[L]==T:A[L]='windows'
+	elif A[L]=='linux':A[L]=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[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
+	try:K=sys.implementation._machine if'_machine'in N(sys.implementation)else os.uname().machine;A[U]=K;A[P]=K.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,Q):pass
 	A[U]=A7()
 	try:
 		if'uname'in N(os):
 			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):
+	except(I,Q,d):pass
+	if A[C]==B and sys.platform not in(V,T):
 		try:b=os.uname();A[C]=b.release
-		except(T,I,d):pass
+		except(Q,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
+		try:g=__import__(e,E,E,f);A[S]=c;del g;break
 		except(O,r):pass
-	if A[Q]==a:A['release']='2.0.0'
-	if A[Q]==u:
+	if A[S]==a:A['release']='2.0.0'
+	if A[S]==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
+		G=int(A[F])
+		try:H=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin','rv32imc'][G>>10]
+		except Q:H='unknown'
+		if H:A[R]=H
 		A[F]='v{}.{}'.format(G&255,G>>8&3)
 	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 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]
+	A=version;B=K.join([c(A)for A in A[:3]])
+	if R(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))
@@ -265,29 +271,29 @@ def A7():
 	return C
 def get_root():
 	try:A=os.getcwd()
-	except(D,I):A=J
+	except(D,I):A=K
 	B=A
-	for B in[A,'/sd','/flash',G,J]:
+	for B in['/remote','/sd','/flash',G,A,K]:
 		try:C=os.stat(B);break
 		except D:continue
 	return B
 def Z(filename):
 	try:
-		if os.stat(filename)[0]>>14:return R
+		if os.stat(filename)[0]>>14:return T
 		return H
 	except D:return H
-def m():S("-p, --path   path to store the stubs in, defaults to '.'");sys.exit(1)
+def m():P("-p, --path   path to store the stubs in, defaults to '.'");sys.exit(1)
 def read_path():
 	path=B
-	if P(sys.argv)==3:
+	if R(sys.argv)==3:
 		A=sys.argv[1].lower()
 		if A in('--path','-p'):path=sys.argv[2]
 		else:m()
-	elif P(sys.argv)==2:m()
+	elif R(sys.argv)==2:m()
 	return path
 def n():
 	try:A=bytes('abc',encoding='utf8');B=n.__module__;return H
-	except(o,I):return R
+	except(o,I):return T
 a='modulelist.done'
 def A8(skip=0):
 	for E in A5:
@@ -296,10 +302,10 @@ def A8(skip=0):
 		try:
 			with M(B)as F:
 				C=0
-				while R:
+				while T:
 					A=F.readline().strip()
 					if not A:break
-					if P(A)>0 and A[0]=='#':continue
+					if R(A)>0 and A[0]=='#':continue
 					C+=1
 					if C<skip:continue
 					yield A
@@ -324,9 +330,10 @@ def main():
 		try:stubber.create_one_stub(E)
 		except p:D.reset()
 		F.collect();B+=1;A9(B)
-	S('All modules have been processed, Finalizing report');stubber.report_end()
+	P('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()
+		P(f"createstubs.py: {__version__}")
+		try:F.threshold(4096);F.enable()
 		except BaseException:pass
 		main()

stubber/board/createstubs_mem.py

@@ -9,7 +9,7 @@
     - 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.3
+This variant was generated from createstubs.py by micropython-stubber v1.24.0
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -34,7 +34,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.23.3"
+__version__ = "v1.24.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -42,7 +42,7 @@ LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
 
 # our own logging module to avoid dependency on and interfering with logging module
 class logging:
-    # DEBUG = 10
+    DEBUG = 10
     INFO = 20
     WARNING = 30
     ERROR = 40
@@ -57,9 +57,9 @@ class logging:
     def basicConfig(cls, level):
         cls.level = level
 
-    # def debug(self, msg):
-    #     if self.level <= logging.DEBUG:
-    #         self.prnt("DEBUG :", msg)
+    def debug(self, msg):
+        if self.level <= logging.DEBUG:
+            self.prnt("DEBUG :", msg)
 
     def info(self, msg):
         if self.level <= logging.INFO:
@@ -235,6 +235,7 @@ class Stubber:
             return False
 
         # Start a new file
+        # log.debug("Create file: {}".format(file_name))
         ensure_folder(file_name)
         with open(file_name, "w") as fp:
             info_ = str(self.info).replace("OrderedDict(", "").replace("})", "}")
@@ -348,8 +349,10 @@ class Stubber:
 
                 if t in ("str", "int", "float", "bool", "bytearray", "bytes"):
                     # known type: use actual value
-                    # s = "{0}{1} = {2} # type: {3}\n".format(indent, item_name, item_repr, t)
-                    s = "{0}{1}: {3} = {2}\n".format(indent, item_name, item_repr, t)
+                    if item_name.upper() == item_name:  # ALL_CAPS --> Final
+                        s = "{0}{1}: Final[{3}] = {2}\n".format(indent, item_name, item_repr, t)
+                    else:
+                        s = "{0}{1}: {3} = {2}\n".format(indent, item_name, item_repr, t)
                 elif t in ("dict", "list", "tuple"):
                     # dict, list , tuple: use empty value
                     ev = {"dict": "{}", "list": "[]", "tuple": "()"}
@@ -482,6 +485,7 @@ def ensure_folder(path: str):
                 # folder does not exist
                 if e.args[0] == ENOENT:
                     try:
+                        log.debug("Create folder {}".format(p))
                         os.mkdir(p)
                     except OSError as e2:
                         log.error("failed to create folder {}".format(p))
@@ -492,7 +496,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.3-preview.6.g3d0b6276f'
+    # sys.version: 'MicroPython v1.24.0-preview.6.g3d0b6276f'
     # sys.implementation.version: 'v1.13-103-gb137d064e'
     if not s:
         return ""
@@ -597,29 +601,33 @@ 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.3 do not have a micro .0
+            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.24.0 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.23.3 do not have a micro .0
+            # versions from 1.10.0 to 1.24.0 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable
     if "mpy" in info and info["mpy"]:  # mpy on some v1.11+ builds
         sys_mpy = int(info["mpy"])
         # .mpy architecture
-        arch = [
-            None,
-            "x86",
-            "x64",
-            "armv6",
-            "armv6m",
-            "armv7m",
-            "armv7em",
-            "armv7emsp",
-            "armv7emdp",
-            "xtensa",
-            "xtensawin",
-        ][sys_mpy >> 10]
+        try:
+            arch = [
+                None,
+                "x86",
+                "x64",
+                "armv6",
+                "armv6m",
+                "armv7m",
+                "armv7em",
+                "armv7emsp",
+                "armv7emdp",
+                "xtensa",
+                "xtensawin",
+                "rv32imc",
+            ][sys_mpy >> 10]
+        except IndexError:
+            arch = "unknown"
         if arch:
             info["arch"] = arch
         # .mpy version.minor
@@ -659,7 +667,7 @@ def get_root() -> str:  # sourcery skip: use-assigned-variable
         # unix port
         c = "."
     r = c
-    for r in [c, "/sd", "/flash", "/", "."]:
+    for r in ["/remote", "/sd", "/flash", "/", c, "."]:
         try:
             _ = os.stat(r)
             break
@@ -758,6 +766,7 @@ def main():
 
 if __name__ == "__main__" or is_micropython():
     if not file_exists("no_auto_stubber.txt"):
+        print(f"createstubs.py: {__version__}")
         try:
             gc.threshold(4 * 1024)  # type: ignore
             gc.enable()