Exclude memory adresses from type info.

Josverl · Josverl · commit 9173d8257125 · 2024-02-29T09:24:27.000+01:00
Signed-off-by: Jos Verlinde <jos.verlinde@microsoft.com> (cherry picked from commit 05cafdb) Signed-off-by: Jos Verlinde <jos.verlinde@microsoft.com>
diff --git a/mip/full.json b/mip/full.json
@@ -18,5 +18,5 @@
         ]
     ],
     "deps": [],
-    "version": "1.17.2"
+    "version": "1.17.3"
 }
diff --git a/mip/minified.json b/mip/minified.json
@@ -18,5 +18,5 @@
         ]
     ],
     "deps": [],
-    "version": "1.17.2"
+    "version": "1.17.3"
 }
diff --git a/mip/mpy_v5.json b/mip/mpy_v5.json
@@ -18,5 +18,5 @@
         ]
     ],
     "deps": [],
-    "version": "1.17.2"
+    "version": "1.17.3"
 }
diff --git a/mip/mpy_v6.json b/mip/mpy_v6.json
@@ -18,5 +18,5 @@
         ]
     ],
     "deps": [],
-    "version": "1.17.2"
+    "version": "1.17.3"
 }
diff --git a/package.json b/package.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.17.2"
+  "version": "1.17.3"
 }
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ repo-path = "./repos"
 
 [tool.poetry]
 name = "micropython-stubber"
-version = "1.17.2"
+version = "1.17.3"
 description = "Tooling to create and maintain stubs for MicroPython"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
diff --git a/repos/micropython b/repos/micropython
@@ -1 +1 @@
-Subproject commit 0285cb2bf4a317490364b9249f25ca0eaa6af3ef
+Subproject commit 9feb0689eeaca5ce88aedcc680f997a3b4d0221c
diff --git a/repos/micropython-lib b/repos/micropython-lib
@@ -1 +1 @@
-Subproject commit 7cdf70881519c73667efbc4a61a04d9c1a49babb
+Subproject commit f20d89c6aad9443a696561ca2a01f7ef0c8fb302
diff --git a/repos/micropython-stubs b/repos/micropython-stubs
@@ -1 +1 @@
-Subproject commit a329b2387f65b4feea0fe9f9a702237370b3cdaa
+Subproject commit 9d9a1227f1ec0a9c30450bdee1fd18824fcb6107
diff --git a/src/stubber/__init__.py b/src/stubber/__init__.py
@@ -1,4 +1,4 @@
 """get the version"""
 
 
-__version__ = "1.17.2"
+__version__ = "1.17.3"
diff --git a/src/stubber/board/createstubs.py b/src/stubber/board/createstubs.py
@@ -23,7 +23,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.2"
+__version__ = "v1.17.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -362,6 +362,8 @@ def write_object_stub(self, fp, object_expr: object, obj_name: str, indent: str,
                     else:
                         # Requires Python 3.6 syntax, which is OK for the stubs/pyi
                         t = "Incomplete"
+                        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)
                 fp.write(s)
                 # log.debug("\n" + s)
diff --git a/src/stubber/board/createstubs_db.py b/src/stubber/board/createstubs_db.py
@@ -18,7 +18,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.17.2
+This variant was generated from createstubs.py by micropython-stubber v1.17.3
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 
@@ -42,7 +42,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.2"
+__version__ = "v1.17.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -375,6 +375,8 @@ def write_object_stub(self, fp, object_expr: object, obj_name: str, indent: str,
                     else:
                         # Requires Python 3.6 syntax, which is OK for the stubs/pyi
                         t = "Incomplete"
+                        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)
                 fp.write(s)
                 # log.debug("\n" + s)
diff --git a/src/stubber/board/createstubs_db_min.py b/src/stubber/board/createstubs_db_min.py
@@ -51,7 +51,7 @@
 except O:pass
 try:from collections import OrderedDict as k
 except O:from ucollections import OrderedDict as k
-__version__='v1.17.2'
+__version__='v1.17.3'
 A3=2
 A4=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]
@@ -132,19 +132,19 @@ def create_module_stub(K,module_name,file_name=E):
 			except(D,q):A.warning('could not del new_module')
 		F.collect();return R
 	def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
-		X='generator';W='{0}{1}: {3} = {2}\n';V='bound_method';U='Incomplete';N=in_class;M='Exception';L=object_expr;I=fp;D=indent;F.collect()
+		Y=' at ';X='generator';W='{0}{1}: {3} = {2}\n';V='bound_method';U='Incomplete';N=in_class;M='Exception';L=object_expr;I=fp;D=indent;F.collect()
 		if L in K.problematic:A.warning('SKIPPING problematic module:{}'.format(L));return
-		Y,O=K.get_obj_attributes(L)
+		Z,O=K.get_obj_attributes(L)
 		if O:A.error(O)
-		for(E,J,H,Z,b)in Y:
+		for(E,J,H,a,c)in Z:
 			if E in['classmethod','staticmethod','BaseException',M]:continue
 			if E[0].isdigit():A.warning('NameError: invalid name {}'.format(E));continue
 			if H=="<class 'type'>"and P(D)<=A4*4:
 				Q=B;R=E.endswith(M)or E.endswith('Error')or E in['KeyboardInterrupt','StopIteration','SystemExit']
 				if R:Q=M
 				C='\n{}class {}({}):\n'.format(D,E,Q)
 				if R:C+=D+'    ...\n';I.write(C);continue
-				I.write(C);K.write_object_stub(I,Z,'{0}.{1}'.format(obj_name,E),D+'    ',N+1);C=D+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=D+'        ...\n\n';I.write(C)
+				I.write(C);K.write_object_stub(I,a,'{0}.{1}'.format(obj_name,E),D+'    ',N+1);C=D+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=D+'        ...\n\n';I.write(C)
 			elif any(A in H for A in[A0,z,'closure']):
 				S=U;T=B
 				if N>0:T='self, '
@@ -155,11 +155,14 @@ def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
 			elif H.startswith("<class '"):
 				G=H[8:-2];C=B
 				if G in(x,v,w,y,'bytearray','bytes'):C=W.format(D,E,J,G)
-				elif G in(f,e,d):a={f:'{}',e:'[]',d:'()'};C=W.format(D,E,a[G],G)
+				elif G in(f,e,d):b={f:'{}',e:'[]',d:'()'};C=W.format(D,E,b[G],G)
 				elif G in('object','set','frozenset','Pin',X):
 					if G==X:G='Generator'
 					C='{0}{1}: {2} ## = {4}\n'.format(D,E,G,H,J)
-				else:G=U;C='{0}{1}: {2} ## {3} = {4}\n'.format(D,E,G,H,J)
+				else:
+					G=U
+					if Y in J:J=J.split(Y)[0]+' at ...>'
+					C='{0}{1}: {2} ## {3} = {4}\n'.format(D,E,G,H,J)
 				I.write(C)
 			else:I.write("# all other, type = '{0}'\n".format(H));I.write(D+E+' # type: Incomplete\n')
 	@property
diff --git a/src/stubber/board/createstubs_db_mpy.mpy b/src/stubber/board/createstubs_db_mpy.mpy
diff --git a/src/stubber/board/createstubs_mem.py b/src/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.17.2
+This variant was generated from createstubs.py by micropython-stubber v1.17.3
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 
@@ -33,7 +33,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.2"
+__version__ = "v1.17.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -366,6 +366,8 @@ def write_object_stub(self, fp, object_expr: object, obj_name: str, indent: str,
                     else:
                         # Requires Python 3.6 syntax, which is OK for the stubs/pyi
                         t = "Incomplete"
+                        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)
                 fp.write(s)
                 # log.debug("\n" + s)
diff --git a/src/stubber/board/createstubs_mem_min.py b/src/stubber/board/createstubs_mem_min.py
@@ -47,7 +47,7 @@
 except N:pass
 try:from collections import OrderedDict as f
 except N:from ucollections import OrderedDict as f
-__version__='v1.17.2'
+__version__='v1.17.3'
 y=2
 z=2
 A0=['lib','/lib','/sd/lib','/flash/lib',J]
@@ -128,19 +128,19 @@ def create_module_stub(K,module_name,file_name=E):
 			except(F,l):A.warning('could not del new_module')
 		D.collect();return R
 	def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
-		X='generator';W='{0}{1}: {3} = {2}\n';V='bound_method';U='Incomplete';N=in_class;M='Exception';L=object_expr;I=fp;E=indent;D.collect()
+		Y=' at ';X='generator';W='{0}{1}: {3} = {2}\n';V='bound_method';U='Incomplete';N=in_class;M='Exception';L=object_expr;I=fp;E=indent;D.collect()
 		if L in K.problematic:A.warning('SKIPPING problematic module:{}'.format(L));return
-		Y,O=K.get_obj_attributes(L)
+		Z,O=K.get_obj_attributes(L)
 		if O:A.error(O)
-		for(F,J,H,Z,e)in Y:
+		for(F,J,H,a,f)in Z:
 			if F in['classmethod','staticmethod','BaseException',M]:continue
 			if F[0].isdigit():A.warning('NameError: invalid name {}'.format(F));continue
 			if H=="<class 'type'>"and P(E)<=z*4:
 				Q=B;R=F.endswith(M)or F.endswith('Error')or F in['KeyboardInterrupt','StopIteration','SystemExit']
 				if R:Q=M
 				C='\n{}class {}({}):\n'.format(E,F,Q)
 				if R:C+=E+'    ...\n';I.write(C);continue
-				I.write(C);K.write_object_stub(I,Z,'{0}.{1}'.format(obj_name,F),E+'    ',N+1);C=E+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=E+'        ...\n\n';I.write(C)
+				I.write(C);K.write_object_stub(I,a,'{0}.{1}'.format(obj_name,F),E+'    ',N+1);C=E+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=E+'        ...\n\n';I.write(C)
 			elif any(A in H for A in[u,t,'closure']):
 				S=U;T=B
 				if N>0:T='self, '
@@ -151,11 +151,14 @@ def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
 			elif H.startswith("<class '"):
 				G=H[8:-2];C=B
 				if G in(r,p,q,s,'bytearray','bytes'):C=W.format(E,F,J,G)
-				elif G in(d,c,b):a={d:'{}',c:'[]',b:'()'};C=W.format(E,F,a[G],G)
+				elif G in(d,c,b):e={d:'{}',c:'[]',b:'()'};C=W.format(E,F,e[G],G)
 				elif G in('object','set','frozenset','Pin',X):
 					if G==X:G='Generator'
 					C='{0}{1}: {2} ## = {4}\n'.format(E,F,G,H,J)
-				else:G=U;C='{0}{1}: {2} ## {3} = {4}\n'.format(E,F,G,H,J)
+				else:
+					G=U
+					if Y in J:J=J.split(Y)[0]+' at ...>'
+					C='{0}{1}: {2} ## {3} = {4}\n'.format(E,F,G,H,J)
 				I.write(C)
 			else:I.write("# all other, type = '{0}'\n".format(H));I.write(E+F+' # type: Incomplete\n')
 	@property
diff --git a/src/stubber/board/createstubs_mem_mpy.mpy b/src/stubber/board/createstubs_mem_mpy.mpy
diff --git a/src/stubber/board/createstubs_min.py b/src/stubber/board/createstubs_min.py
@@ -50,7 +50,7 @@
 except N:pass
 try:from collections import OrderedDict as g
 except N:from ucollections import OrderedDict as g
-__version__='v1.17.2'
+__version__='v1.17.3'
 A0=2
 A1=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]
@@ -131,19 +131,19 @@ def create_module_stub(K,module_name,file_name=D):
 			except(E,l):A.warning('could not del new_module')
 		F.collect();return U
 	def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
-		X='generator';W='{0}{1}: {3} = {2}\n';V='bound_method';U='Incomplete';N=in_class;M='Exception';L=object_expr;I=fp;D=indent;F.collect()
+		Y=' at ';X='generator';W='{0}{1}: {3} = {2}\n';V='bound_method';U='Incomplete';N=in_class;M='Exception';L=object_expr;I=fp;D=indent;F.collect()
 		if L in K.problematic:A.warning('SKIPPING problematic module:{}'.format(L));return
-		Y,O=K.get_obj_attributes(L)
+		Z,O=K.get_obj_attributes(L)
 		if O:A.error(O)
-		for(E,J,H,Z,e)in Y:
+		for(E,J,H,a,f)in Z:
 			if E in['classmethod','staticmethod','BaseException',M]:continue
 			if E[0].isdigit():A.warning('NameError: invalid name {}'.format(E));continue
 			if H=="<class 'type'>"and R(D)<=A1*4:
 				P=B;Q=E.endswith(M)or E.endswith('Error')or E in['KeyboardInterrupt','StopIteration','SystemExit']
 				if Q:P=M
 				C='\n{}class {}({}):\n'.format(D,E,P)
 				if Q:C+=D+'    ...\n';I.write(C);continue
-				I.write(C);K.write_object_stub(I,Z,'{0}.{1}'.format(obj_name,E),D+'    ',N+1);C=D+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=D+'        ...\n\n';I.write(C)
+				I.write(C);K.write_object_stub(I,a,'{0}.{1}'.format(obj_name,E),D+'    ',N+1);C=D+'    def __init__(self, *argv, **kwargs) -> None:\n';C+=D+'        ...\n\n';I.write(C)
 			elif any(A in H for A in[u,t,'closure']):
 				S=U;T=B
 				if N>0:T='self, '
@@ -154,11 +154,14 @@ def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
 			elif H.startswith("<class '"):
 				G=H[8:-2];C=B
 				if G in(r,p,q,s,'bytearray','bytes'):C=W.format(D,E,J,G)
-				elif G in(d,c,b):a={d:'{}',c:'[]',b:'()'};C=W.format(D,E,a[G],G)
+				elif G in(d,c,b):e={d:'{}',c:'[]',b:'()'};C=W.format(D,E,e[G],G)
 				elif G in('object','set','frozenset','Pin',X):
 					if G==X:G='Generator'
 					C='{0}{1}: {2} ## = {4}\n'.format(D,E,G,H,J)
-				else:G=U;C='{0}{1}: {2} ## {3} = {4}\n'.format(D,E,G,H,J)
+				else:
+					G=U
+					if Y in J:J=J.split(Y)[0]+' at ...>'
+					C='{0}{1}: {2} ## {3} = {4}\n'.format(D,E,G,H,J)
 				I.write(C)
 			else:I.write("# all other, type = '{0}'\n".format(H));I.write(D+E+' # type: Incomplete\n')
 	@property
diff --git a/src/stubber/board/createstubs_mpy.mpy b/src/stubber/board/createstubs_mpy.mpy

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@`
`18`	`18`	`]`
`19`	`19`	`],`
`20`	`20`	`"deps": [],`
`21`		`- "version": "1.17.2"`
	`21`	`+ "version": "1.17.3"`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit 0285cb2bf4a317490364b9249f25ca0eaa6af3ef`
	`1`	`+Subproject commit 9feb0689eeaca5ce88aedcc680f997a3b4d0221c`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit 7cdf70881519c73667efbc4a61a04d9c1a49babb`
	`1`	`+Subproject commit f20d89c6aad9443a696561ca2a01f7ef0c8fb302`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit a329b2387f65b4feea0fe9f9a702237370b3cdaa`
	`1`	`+Subproject commit 9d9a1227f1ec0a9c30450bdee1fd18824fcb6107`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`"""get the version"""`
`2`	`2`
`3`	`3`
`4`		`-__version__ = "1.17.2"`
	`4`	`+__version__ = "1.17.3"`