modulitiz-micro 2.30.0__py311-none-any.whl → 2.31.0__py311-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. modulitiz_micro/rete/ModuloNetworking.py +5 -2
  2. modulitiz_micro/rete/http/ModuloHttp.py +3 -2
  3. modulitiz_micro/rete/http/ModuloHttpUtils.py +5 -2
  4. {modulitiz_micro-2.30.0.dist-info → modulitiz_micro-2.31.0.dist-info}/METADATA +1 -1
  5. {modulitiz_micro-2.30.0.dist-info → modulitiz_micro-2.31.0.dist-info}/RECORD +8 -8
  6. {modulitiz_micro-2.30.0.dist-info → modulitiz_micro-2.31.0.dist-info}/LICENSE +0 -0
  7. {modulitiz_micro-2.30.0.dist-info → modulitiz_micro-2.31.0.dist-info}/WHEEL +0 -0
  8. {modulitiz_micro-2.30.0.dist-info → modulitiz_micro-2.31.0.dist-info}/top_level.txt +0 -0
modulitiz_micro/rete/ModuloNetworking.py CHANGED
@@ -18,11 +18,14 @@ class ModuloNetworking(object):
18
18
  return mac
19
19
 
20
20
  @staticmethod
21
- def getIp()->str|None:
21
+ def getLocalIp()->str|None:
22
+ """
23
+ Returns private local IP address.
24
+ """
22
25
  sockObj = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
23
26
  sockObj.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
24
- # doesn't even have to be reachable
25
27
  try:
28
+ # doesn't even have to be reachable
26
29
  sockObj.connect(('255.255.255.255', 1))
27
30
  indirizzoIp = sockObj.getsockname()[0]
28
31
  except gaierror:
modulitiz_micro/rete/http/ModuloHttp.py CHANGED
@@ -30,9 +30,10 @@ class ModuloHttp(object):
30
30
  UAS=[UA_MACOS_CHROME,UA_WINDOWS_CHROME,UA_WINDOWS_FIREFOX]
31
31
 
32
32
  URL_CERCA_GOOGLE="https://www.google.it/search?q="
33
- URLS_GET_IP=('https://ipecho.net/plain','https://ipinfo.io/ip','https://api.ipify.org')
33
+ # https://ipecho.net/plain removed because it can return either ipv4 or ipv6 depending on your ISP/Internet connection
34
+ URLS_GET_IPV4=('https://ipinfo.io/ip','https://api.ipify.org','https://ipv4.seeip.org')
34
35
 
35
- REGEX_INDIRIZZO_IP=r"\b(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\b"
36
+ REGEX_IPV4_ADDRESS=r"\b(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\b"
36
37
 
37
38
  STATUS_OK=200
38
39
  STATUS_OK_PARTIAL_CONTENT=206
modulitiz_micro/rete/http/ModuloHttpUtils.py CHANGED
@@ -31,8 +31,11 @@ class ModuloHttpUtils(object):
31
31
  return response.status_code==ModuloHttp.STATUS_OK
32
32
 
33
33
  @staticmethod
34
- def getIp() -> str|None:
35
- url=random.choice(ModuloHttp.URLS_GET_IP)
34
+ def getIpV4() -> str|None:
35
+ """
36
+ Returns public external IpV4 address.
37
+ """
38
+ url=random.choice(ModuloHttp.URLS_GET_IPV4)
36
39
  http=ModuloHttp(url,None)
37
40
  try:
38
41
  response=http.doGet(2,False)
{modulitiz_micro-2.30.0.dist-info → modulitiz_micro-2.31.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: modulitiz_micro
3
- Version: 2.30.0
3
+ Version: 2.31.0
4
4
  Summary: Raccolta dei miei moduli - versione micro
5
5
  Author-email: tiz <sderfo1234@altervista.org>
6
6
  Classifier: Programming Language :: Python :: 3
{modulitiz_micro-2.30.0.dist-info → modulitiz_micro-2.31.0.dist-info}/RECORD RENAMED
@@ -54,13 +54,13 @@ modulitiz_micro/multithreading/ModuloThreadLogger.py,sha256=YMFsiT5G2AAgJfEYACZG
54
54
  modulitiz_micro/multithreading/ModuloThreadWithCallbackError.py,sha256=RQWfLDssdVmXoewrWaCdVSrySjbElh2iNBqlSslg0W8,724
55
55
  modulitiz_micro/nlp/ModuloNlp.py,sha256=h7ca9kVLKRcqHMK6rCVOambdpPfh-ehVSppP2nYGxVA,799
56
56
  modulitiz_micro/nlp/ModuloNlpDateAndTime.py,sha256=QCURYksP4-z_u03CVzcESLp5EtdIx2GNXDNYgYOPGuU,1851
57
- modulitiz_micro/rete/ModuloNetworking.py,sha256=sNlB90VGNEEUfGbv2y_-CML0Fcw_hVb5N2J8az43vcU,1942
57
+ modulitiz_micro/rete/ModuloNetworking.py,sha256=ouaArJo-sc_eKrTaJW3rzk6zLtNtpfI8YGHQboi_urE,1999
58
58
  modulitiz_micro/rete/ModuloOpenVpn.py,sha256=t99ofIYhM7q3HnQrvzQbx-6JeyDQqOc1wvg7pxvYo8U,627
59
59
  modulitiz_micro/rete/email/EmailBean.py,sha256=-2FPalluaGUwA8Syj2B7kFzkLVDcZnal_PnfYGIPOkM,196
60
60
  modulitiz_micro/rete/email/ModuloEmail.py,sha256=NtlrqlY1TZGr8vGps8frZUft5yReHjtu7CPDKJLSEQ0,2963
61
- modulitiz_micro/rete/http/ModuloHttp.py,sha256=rPw0hc69502yW3Puh8X0UkNj-yHkk-IdyG6M850Mo48,4472
61
+ modulitiz_micro/rete/http/ModuloHttp.py,sha256=6s8F_NsVUqEoKGRwonBgCoLWlYc4ZH839QJ5eqnSDuY,4593
62
62
  modulitiz_micro/rete/http/ModuloHttpConnectionSafe.py,sha256=w1cLQrnPJXltUeJ4OOtFOTPv5k0J6uNqlrXUzO0UbX4,2936
63
- modulitiz_micro/rete/http/ModuloHttpUtils.py,sha256=yza4I_vonf79Xut0j2NM7gmOgzFb0sSH08k1ev31nTE,2291
63
+ modulitiz_micro/rete/http/ModuloHttpUtils.py,sha256=9r6Z4eT4j4ZH-UyjOQXz_vUaltW-oH9gyyQLZDgVf7s,2350
64
64
  modulitiz_micro/rete/http/beans/HttpResponseBean.py,sha256=7JVywcWURv1I9rYKj4Kt9XLt7387wMZGTMefcsm7E3I,202
65
65
  modulitiz_micro/rete/http/decorators/catchAndRaiseHttpExceptions.py,sha256=MRhCeNMcy3hw-A8W40gozUY0FiL0tyKASauA7hRW0fo,595
66
66
  modulitiz_micro/rete/ntp/AbstractModuloNtp.py,sha256=acwbAPhHz-1nEyxA2PzxLQC-_DKWIir4jy4CJFLA3Tk,2840
@@ -96,8 +96,8 @@ modulitiz_micro/util/unittesting/ModuloRunUnitTest.py,sha256=_YHxjTk_t9wvlCYgS4H
96
96
  modulitiz_micro/util/wheel/ModuloBuildWheel.py,sha256=-NTUqEjmGl8OUFa1hSwmBbLOaoJZhmzStvOexIN6CDo,5039
97
97
  modulitiz_micro/util/wheel/ModuloToml.py,sha256=774GQ8y6lyhOrT0edJPlLq4TBU7Nq4699q74deGlFW4,1205
98
98
  modulitiz_micro/util/wheel/ModuloWheel.py,sha256=VRS_6kSt62qubBYzkGm91_GWzcIiD0KlSnaqhM_aQnE,338
99
- modulitiz_micro-2.30.0.dist-info/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
100
- modulitiz_micro-2.30.0.dist-info/METADATA,sha256=hfAml3Kj9dirKABA0vKbepgOiA4RwkfxCBIO7sXy2aI,1651
101
- modulitiz_micro-2.30.0.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
102
- modulitiz_micro-2.30.0.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
103
- modulitiz_micro-2.30.0.dist-info/RECORD,,
99
+ modulitiz_micro-2.31.0.dist-info/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
100
+ modulitiz_micro-2.31.0.dist-info/METADATA,sha256=YENRtxuTjS0v5NVXm33hsoBPDkWp0OtckjNqXi4y808,1651
101
+ modulitiz_micro-2.31.0.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
102
+ modulitiz_micro-2.31.0.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
103
+ modulitiz_micro-2.31.0.dist-info/RECORD,,