ddns 4.0.0b3__tar.gz → 4.0.0b4__tar.gz

{ddns-4.0.0b3 → ddns-4.0.0b4}/PKG-INFO

@@ -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 → ddns-4.0.0b4}/ddns.egg-info/PKG-INFO

@@ -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 → ddns-4.0.0b4}/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

{ddns-4.0.0b3 → ddns-4.0.0b4}/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()

{ddns-4.0.0b3 → ddns-4.0.0b4}/setup.py

@@ -38,7 +38,7 @@ elif 'BUILD_SOURCEBRANCHNAME' in environ:
 elif 'GITHUB_REF_NAME' in environ:  # github actions
     ref = environ['GITHUB_REF_NAME']
     if ref == 'master' or ref == 'main':  # CI
-        version = '0.0.b' + str(int(time()))
+        version = '4.0.b' + str(int(time()))
     elif ref.startswith('v') or ref.startswith('V'):  # Tag
         version = ref
     else:  # PR

{ddns-4.0.0b3 → ddns-4.0.0b4}/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