ddns 4.0.0b3__py2.py3-none-any.whl → 4.0.0b4__py2.py3-none-any.whl

{ddns-4.0.0b3.dist-info → ddns-4.0.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddns
-Version: 4.0.0b3
+Version: 4.0.0b4
 Summary: automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]
 Home-page: https://ddns.newfuture.cc
 Author: NewFuture

{ddns-4.0.0b3.dist-info → ddns-4.0.0b4.dist-info}/RECORD

@@ -1,20 +1,20 @@
-run.py,sha256=VvDzoIUwBOKCW0kD-8b1eyndPO_cbwV2A8J3GUIb-bo,5976
-ddns-4.0.0b3.dist-info/licenses/LICENSE,sha256=MI-ECjp-Vl7WZLiSPY6r5VwrOReNiICVB1QCXiUGt_s,1111
+run.py,sha256=VXerRIy_4aCN0MnW0JX-KalVfj8osBQ0BA6FuAgV51k,6068
+ddns-4.0.0b4.dist-info/licenses/LICENSE,sha256=MI-ECjp-Vl7WZLiSPY6r5VwrOReNiICVB1QCXiUGt_s,1111
 dns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dns/alidns.py,sha256=fD8mzr7FJ5QxOWLA3ekoOhjeU1IFepOpxybrgZv2c9k,5782
 dns/callback.py,sha256=V8AG7kxtS0jIkyD9F7xnGJpu1L3E5KUcNDwOnQjcJKs,3208
 dns/cloudflare.py,sha256=OBq4TJwVHHiPMM6FJo-bz20FOHPvA-RSFbuGilw3tVw,5647
 dns/dnscom.py,sha256=Nhyl70JGnZY2IV0j5Ebgy_gYQGFb8hXTshaRG_rC0Ww,5297
-dns/dnspod.py,sha256=giivum1lyxfVtu8d-_muXhMxBcB-DZtpq_IGo7ApdFk,6143
+dns/dnspod.py,sha256=52Hstd92-BkyEAicW5DkexfJiTww5KcNZkKs20HUIFE,6211
 dns/dnspod_com.py,sha256=9DW7Oz1f2fYSLDDGdwQKMp9OhRJ_CYB8bfzGhf0fIMI,339
 dns/he.py,sha256=X_WODK6vDTpHdAvPP_vUltaeAlHeG2jMPbzFkfYxWOg,2142
 dns/huaweidns.py,sha256=0A2jxcJ5zGaMxMMh7C9SsDewhP2zVRLI8FznB9BBBEc,8748
 util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-util/cache.py,sha256=nt_x_BUORwUAZZW13UNeEBOFrIksWWhdj9k4AGyvnU8,3337
+util/cache.py,sha256=LVH5jGZFimXmD7XCQCtZULhagybM7gSjMo-73yqttiA,3338
 util/config.py,sha256=0yJ5Yfz6u__wrXm_SMqw6a9OuMf9usHOxXfRlB7C3mo,6836
 util/ip.py,sha256=GZzqrl_nq9JuGHTWhPB0fffpr94ITJA6BCVlS5KlWcE,3836
-ddns-4.0.0b3.dist-info/METADATA,sha256=P87QP5cH45_TvXiJxhOcyMZ0EiZqnxxc_3VogX3RLZE,15269
-ddns-4.0.0b3.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-ddns-4.0.0b3.dist-info/entry_points.txt,sha256=vpxxBE6Kepc-SHatr-FRRLmZecrTupYejyDB8ovJbLg,34
-ddns-4.0.0b3.dist-info/top_level.txt,sha256=dS3_ClQTIG1ousHykZ1P3AzQa-MKq4jT_rbm21D-KxE,13
-ddns-4.0.0b3.dist-info/RECORD,,
+ddns-4.0.0b4.dist-info/METADATA,sha256=JWsNhE92etdBLN_Sq3s3wEjGtOyxsG2x01_VNap9JMI,15269
+ddns-4.0.0b4.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+ddns-4.0.0b4.dist-info/entry_points.txt,sha256=vpxxBE6Kepc-SHatr-FRRLmZecrTupYejyDB8ovJbLg,34
+ddns-4.0.0b4.dist-info/top_level.txt,sha256=dS3_ClQTIG1ousHykZ1P3AzQa-MKq4jT_rbm21D-KxE,13
+ddns-4.0.0b4.dist-info/RECORD,,

dns/dnspod.py

@@ -106,10 +106,11 @@ def get_domain_id(domain):
         return get_domain_id.domain_list[domain]
     else:
         try:
-            info = request('Domain.Info', domain=domain)
-        except Exception:
+            d_info = request('Domain.Info', domain=domain)
+        except Exception as e:
+            info("get_domain_id(%s) error: %s", domain, e)
             return
-        did = info.get("domain", {}).get("id")
+        did = d_info.get("domain", {}).get("id")
         if did:
             get_domain_id.domain_list[domain] = did
             return did

run.py

@@ -19,7 +19,7 @@ from util import ip
 from util.cache import Cache
 from util.config import init_config, get_config
 
-__version__ = "v4.0.0-beta3@2025-06-04T17:36:22+00:00"  # CI 时会被Tag替换
+__version__ = "v4.0.0-beta4@2025-06-10T17:58:37+00:00"  # CI 时会被Tag替换
 __description__ = "automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]"
 __doc__ = """
 ddns[%s]
@@ -28,7 +28,7 @@ ddns[%s]
 Copyright (c) New Future (MIT License)
 """ % (__version__)
 
-environ["DDNS_VERSION"] = "v4.0.0-beta3"
+environ["DDNS_VERSION"] = "v4.0.0-beta4"
 
 if getattr(sys, 'frozen', False):
     # https://github.com/pyinstaller/pyinstaller/wiki/Recipe-OpenSSL-Certificate
@@ -153,7 +153,7 @@ def main():
     if cache is False:
         info('Cache is disabled!')
     elif not get_config('config_modified_time') or get_config('config_modified_time') >= cache.time:
-        warning('Cache file is out of dated.')
+        warning('Cache file is outdated.')
         cache.clear()
     else:
         debug('Cache is empty.')
@@ -162,8 +162,10 @@ def main():
 
 
 if __name__ == '__main__':
-    if sys.version_info.major == 3 and os_name == 'nt':
+    encoding = sys.stdout.encoding
+    if encoding is not None and encoding.lower() != 'utf-8':
+        # 兼容windows 和部分ASCII编码的老旧系统
         from io import TextIOWrapper
-        sys.stdout = TextIOWrapper(sys.stdout.detach(), encoding='utf-8')
-        sys.stderr = TextIOWrapper(sys.stderr.detach(), encoding='utf-8')
+        sys.stdout = TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
+        sys.stderr = TextIOWrapper(sys.stderr.buffer, encoding='utf-8')
     main()

util/cache.py

@@ -11,10 +11,9 @@ from time import time
 
 from logging import info, debug, warning
 
-try:
+try:  # python 3
     from collections.abc import MutableMapping
-except ImportError:
-    # Python 2 imports
+except ImportError:  # python 2
     from collections import MutableMapping