modulitiz-micro 2.37.0__py311-none-any.whl → 2.38.1__py311-none-any.whl

modulitiz_micro/ModuloDate.py

@@ -139,7 +139,7 @@ class ModuloDate(object):
 	def timestampToDate(timestamp:int|float)->datetime:
 		"""
 		Converte un timestamp in secondi in un oggetto data completo.
-		Se ti serve avere il timestamp in formato UTC usa il metodo dedicato.
+		Se ti serve lavorare con il timestamp in formato UTC usa il metodo dedicato.
 		"""
 		return datetime.fromtimestamp(timestamp)
 	

modulitiz_micro/rete/ModuloNetworking.py

@@ -1,4 +1,5 @@
 import os
+import re
 import socket
 from contextlib import closing
 from uuid import getnode
@@ -46,22 +47,26 @@ class ModuloNetworking(object):
 		return False
 
 	@staticmethod
-	def checkPing(indirizzoIp:str)->bool:
-		# costruisco il comando a seconda del sistema operativo
-		comando="ping "
+	def checkPing(ipAddress:str)->bool:
+		# build command
+		cmd="ping "
+		regexPercPacketsLost=r"(\d{1,3})\% "
 		if ModuloSystem.isWindows():
-			comando+="-n"
+			cmd+="-n"
+			regexPercPacketsLost=r"\("+regexPercPacketsLost
 		elif os.name=='posix':
-			comando+="-c"
+			cmd+="-c"
+			regexPercPacketsLost=r", "+regexPercPacketsLost
 		else:
 			raise EccezioneRuntime("Tipologia del sistema operativo non riconosciuta: "+os.name)
-		comando+=" 1 " + indirizzoIp
-		# eseguo il comando
-		outputComando=ModuloStringhe.normalizzaEol(ModuloSystem.systemCallReturnOutput(comando,None))
-		righe=outputComando.split("\n")
-		righe=ModuloListe.eliminaElementiVuoti(righe)
-		for riga in righe:
-			if ModuloStringhe.contains(riga, "%"):
-				numPacchettiPersi=int(riga.split("=")[1].split("(")[0].strip())
-				return numPacchettiPersi==0
+		cmd+=" 1 "+ipAddress
+		# execute command
+		outputComando=ModuloStringhe.normalizzaEol(ModuloSystem.systemCallReturnOutput(cmd,None))
+		rows=outputComando.split("\n")
+		rows=ModuloListe.eliminaElementiVuoti(rows)
+		for row in rows:
+			if ModuloStringhe.contains(row, "%"):
+				regexOutput=re.search(regexPercPacketsLost,row)
+				if regexOutput is not None:
+					return int(regexOutput.group(1).strip())==0
 		return False

modulitiz_micro/rete/http/ModuloHttp.py

@@ -1,4 +1,5 @@
 import gzip
+import json
 import logging
 import ssl
 import urllib
@@ -47,33 +48,35 @@ class ModuloHttp(object):
 		
 		self.setUserAgent(self.UA_WINDOWS_FIREFOX)
 		self.addHeader('Accept-Encoding','gzip, deflate, br')		# questo serve per ridurre la dimensione della risposta
-		if useProxy is True:
+		if useProxy:
 			self.addHeader('Origin','localhost')
 		self.connectionSafe=ModuloHttpConnectionSafe(self.__logger)
-		self.postData=None
 	
 	def doGet(self,retries:int,ignoreCerts:bool=False)->HttpResponseBean:
 		"""
 		Esegue una richiesta di tipo GET
 		"""
 		if retries==0:
-			return self.__getOrPost(True,ignoreCerts)
-		return self.connectionSafe.run(retries,0,self.__getOrPost,True,ignoreCerts)
+			return self.__getOrPost(ignoreCerts)
+		return self.connectionSafe.run(retries,0,self.__getOrPost,ignoreCerts)
 	
-	def doPost(self, postData:dict, retries:int,ignoreCerts:bool=False)->HttpResponseBean:
+	def doPost(self, postData:dict, asJson:bool, retries:int,ignoreCerts:bool=False)->HttpResponseBean:
 		"""
 		Esegue una richiesta di tipo POST
 		"""
-		self.postData=postData
+		if not asJson:
+			postDataEncoded=urlencode(postData)
+		else:
+			postDataEncoded=json.dumps(postData)
+			self.addHeader("Content-Type","application/json; charset=utf-8")
+		postDataEncoded=postDataEncoded.encode()
+		self.__requestObj.data=postDataEncoded
 		if retries==0:
-			return self.__getOrPost(False,ignoreCerts)
-		return self.connectionSafe.run(retries,0,self.__getOrPost,False,ignoreCerts)
+			return self.__getOrPost(ignoreCerts)
+		return self.connectionSafe.run(retries,0,self.__getOrPost,ignoreCerts)
 	
 	@catchAndRaiseHttpExceptions
-	def __getOrPost(self, isGet:bool,ignoreCerts:bool)->HttpResponseBean:
-		if not isGet:
-			postData=urlencode(self.postData).encode()
-			self.__requestObj.data=postData
+	def __getOrPost(self, ignoreCerts:bool)->HttpResponseBean:
 		# ignoro certificati
 		ctx=None
 		if ignoreCerts:

modulitiz_micro/util/wheel/ModuloBuildWheel.py

@@ -47,15 +47,15 @@ class ModuloBuildWheel(object):
 		{}""".format(ModuloColorText.GRASSETTO,msg,self.versionOld,ModuloColorText.DEFAULT))
 		# change dir
 		os.chdir(self.percorsoCartellaSource)
-		if self.__doUnitTests() is True:
+		if self.__doUnitTests():
 			return
 		# aggiorno versione
 		self.moduloToml.updateVersion(self.versionNew)
 		# building wheel
 		ModuloSystem.systemCallPrintOutput(f'{self.CMD_PYTHON} -m pip install -U build twine==6.0.1',None)
 		print()
-		percorsoCartellaOut=ModuloFiles.pathJoin(self.percorsoCartellaRoot,"wheel")
-		cmd='{} -m build --wheel --outdir "{}"'.format(self.CMD_PYTHON,percorsoCartellaOut)
+		pathFolderWheel=ModuloFiles.pathJoin(self.percorsoCartellaRoot,"wheel")
+		cmd='{} -m build --wheel --outdir "{}"'.format(self.CMD_PYTHON,pathFolderWheel)
 		ModuloSystem.systemCallPrintOutput(cmd,None)
 		# deleting temporary dirs
 		print()
@@ -63,15 +63,16 @@ class ModuloBuildWheel(object):
 		shutil.rmtree(ModuloFiles.pathJoin(self.percorsoCartellaSource,self.moduleName+".egg-info"))
 		# install wheel
 		self.filenameWheel=self.PATTERN_NOMEFILE_WHEEL.format(self.moduleName,self.versionNew,self.moduloToml.retrieveMinPyVersion())
-		percorsoWheel=ModuloFiles.pathJoin(percorsoCartellaOut,self.filenameWheel)
+		percorsoWheel=ModuloFiles.pathJoin(pathFolderWheel,self.filenameWheel)
 		cmd='{} -m pip install -U "{}"'.format(self.CMD_PYTHON,percorsoWheel)
 		ModuloSystem.systemCallPrintOutput(cmd,None)
+		# upload to web
 		print()
 		print("Uploading to Pypi")
 		cmd='{} -m twine upload "{}"'.format(self.CMD_PYTHON,percorsoWheel)
 		ModuloSystem.systemCallPrintOutput(cmd,None)
 		# delete wheel
-		os.remove(percorsoWheel)
+		shutil.rmtree(pathFolderWheel)
 	
 	def __doUnitTests(self) -> bool:
 		if self.skipUnitTest:

modulitiz_micro/util/wheel/ModuloCheckTestNamingConvention.py

@@ -51,11 +51,14 @@ class ModuloCheckTestNamingConvention(object):
 			return
 		# file name must match class name
 		testClasses=ModuloFunzioni.getClassesFromFileSource(filenameAbs)
+		if len(testClasses)==0:
+			self.errors.append("File must contain at least 1 class: %s"%(filenameRel,))
+			return
 		if len(testClasses)>1:
 			self.errors.append("File must not contain more than 1 class: %s"%(filenameRel,))
 			return
 		baseFilename=ModuloFiles.getBaseFileNameAndExtension(filename)[0]
-		testClassName=None
+		testClassName:str|None=None
 		if not isDecorator:
 			testClassName=testClasses[0]
 			if testClassName!=baseFilename:
@@ -68,6 +71,9 @@ class ModuloCheckTestNamingConvention(object):
 			return
 		# source class name must equals class test
 		if not isDecorator:
+			if ModuloStringhe.isEmpty(testClassName):
+				self.errors.append("Test class name doesn't match source class name: %s"%(filenameRel,))
+				return
 			sourceClassName=ModuloFunzioni.getClassesFromFileSource(ModuloFiles.pathJoin(self.pathSource,sourceFilenameRel))[0]
 			if not testClassName.startswith(sourceClassName):
 				self.errors.append("Test class name doesn't match source class name: %s"%(filenameRel,))

{modulitiz_micro-2.37.0.dist-info → modulitiz_micro-2.38.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modulitiz_micro
-Version: 2.37.0
+Version: 2.38.1
 Summary: Raccolta dei miei moduli - versione micro
 Author-email: tiz <sderfo1234@altervista.org>
 Classifier: Programming Language :: Python :: 3

{modulitiz_micro-2.37.0.dist-info → modulitiz_micro-2.38.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 modulitiz_micro/ModuloBase64.py,sha256=dW1TP8TkIuOqAbbJcvTAo4xEurHl8NBs8lQTuHY_HaU,1866
 modulitiz_micro/ModuloColorText.py,sha256=_sMSh9xZ-qbpa35oaSGdzQJKpFiGLsCHtM4P1HQWcTE,828
-modulitiz_micro/ModuloDate.py,sha256=CNOoovOCkpn2eJeB8Jrit32qqUyJPw8fSYtMqhCw6K0,7990
+modulitiz_micro/ModuloDate.py,sha256=niDdyhWUkRNOfxK7G-RkvvuGJdPCCJRpL3-TFZiuUOE,7997
 modulitiz_micro/ModuloFunzioni.py,sha256=K-8rwVeSEgKCCLQSIXVHZ69YhLRCy3ILYxZXZOy95eI,1947
 modulitiz_micro/ModuloListe.py,sha256=aWqnJX2JAk_LApUQvObkc6P89qXJzFviljJeKa39KC8,3581
 modulitiz_micro/ModuloMeteo.py,sha256=Tr3lRW-lvk9XKm_M-ZvohJ6ueA9oA4TbP6BaZVeCl60,2310
@@ -54,11 +54,11 @@ modulitiz_micro/multithread/ModuloThreadLogger.py,sha256=oQql4C3qrqOUksvcdrgZxgW
 modulitiz_micro/multithread/ModuloThreadWithCallbackError.py,sha256=RQWfLDssdVmXoewrWaCdVSrySjbElh2iNBqlSslg0W8,724
 modulitiz_micro/nlp/ModuloNlp.py,sha256=h7ca9kVLKRcqHMK6rCVOambdpPfh-ehVSppP2nYGxVA,799
 modulitiz_micro/nlp/ModuloNlpDateAndTime.py,sha256=QCURYksP4-z_u03CVzcESLp5EtdIx2GNXDNYgYOPGuU,1851
-modulitiz_micro/rete/ModuloNetworking.py,sha256=ouaArJo-sc_eKrTaJW3rzk6zLtNtpfI8YGHQboi_urE,1999
+modulitiz_micro/rete/ModuloNetworking.py,sha256=3tatSHP4s2AeBBZM4nsyZFHdhlXhNIG16C1SsCb6xYk,2114
 modulitiz_micro/rete/ModuloOpenVpn.py,sha256=t99ofIYhM7q3HnQrvzQbx-6JeyDQqOc1wvg7pxvYo8U,627
 modulitiz_micro/rete/email/EmailBean.py,sha256=EOKLfBVqwBEkbWfywiUmk2iB5K2uVlykxsh4zB9red8,168
 modulitiz_micro/rete/email/ModuloEmail.py,sha256=6roT23q15xmo_olXORF19PRwss81tQg-71gGquvs28A,2956
-modulitiz_micro/rete/http/ModuloHttp.py,sha256=6s8F_NsVUqEoKGRwonBgCoLWlYc4ZH839QJ5eqnSDuY,4593
+modulitiz_micro/rete/http/ModuloHttp.py,sha256=4IPwfUjwYHHBTavLxnAULOVetKpcE_kFLESWUFgO3w4,4693
 modulitiz_micro/rete/http/ModuloHttpConnectionSafe.py,sha256=w1cLQrnPJXltUeJ4OOtFOTPv5k0J6uNqlrXUzO0UbX4,2936
 modulitiz_micro/rete/http/ModuloHttpUtils.py,sha256=9r6Z4eT4j4ZH-UyjOQXz_vUaltW-oH9gyyQLZDgVf7s,2350
 modulitiz_micro/rete/http/beans/HttpResponseBean.py,sha256=7JVywcWURv1I9rYKj4Kt9XLt7387wMZGTMefcsm7E3I,202
@@ -93,12 +93,12 @@ modulitiz_micro/util/spooler/eccezioni/EccezioneSpoolerFull.py,sha256=KEcDisixOS
 modulitiz_micro/util/unittesting/AbstractOverrideTestUtil.py,sha256=5YX20I-rhl6TpRrqSdNafI1cqBAdTs2sgtOTDjzDn5k,754
 modulitiz_micro/util/unittesting/AbstractTestUtil.py,sha256=AW9mCj8i_qHrigcXcvvjgdLxa-4Ce0jrwJEZqpPVBxY,297
 modulitiz_micro/util/unittesting/ModuloRunUnitTest.py,sha256=_YHxjTk_t9wvlCYgS4HSQ657ht7ekSRQsH7i1aKw1LY,774
-modulitiz_micro/util/wheel/ModuloBuildWheel.py,sha256=eEnozE5OZGXEMQq9fujhS5tHrzSIQ25lkFTtAt5DAoo,4781
-modulitiz_micro/util/wheel/ModuloCheckTestNamingConvention.py,sha256=2J3yE6Ba2EyhXSzH5gcmxHnEUOSGOin9dW_Q6dADsXM,3606
+modulitiz_micro/util/wheel/ModuloBuildWheel.py,sha256=OtZdKTiiU0XhrIjWaFlBx8denZXwWIe-V794YUi8WcE,4786
+modulitiz_micro/util/wheel/ModuloCheckTestNamingConvention.py,sha256=ZGwMtVexRscwVEtiwxgU5ENsItcfsV2NEAcyclcLFgA,3885
 modulitiz_micro/util/wheel/ModuloToml.py,sha256=774GQ8y6lyhOrT0edJPlLq4TBU7Nq4699q74deGlFW4,1205
 modulitiz_micro/util/wheel/ModuloWheel.py,sha256=VRS_6kSt62qubBYzkGm91_GWzcIiD0KlSnaqhM_aQnE,338
-modulitiz_micro-2.37.0.dist-info/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
-modulitiz_micro-2.37.0.dist-info/METADATA,sha256=yjneIKpxluCODwSY6HQv9WawsqV2VLvq2BavOfNnR44,1690
-modulitiz_micro-2.37.0.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
-modulitiz_micro-2.37.0.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
-modulitiz_micro-2.37.0.dist-info/RECORD,,
+modulitiz_micro-2.38.1.dist-info/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
+modulitiz_micro-2.38.1.dist-info/METADATA,sha256=F3Qr0knvwgGjNuWU7UqoZlLZta1i55imXv1TcTyz9bQ,1690
+modulitiz_micro-2.38.1.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
+modulitiz_micro-2.38.1.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
+modulitiz_micro-2.38.1.dist-info/RECORD,,