ddns 3.1.4__tar.gz → 3.1.6__tar.gz

{ddns-3.1.4 → ddns-3.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddns
-Version: 3.1.4
+Version: 3.1.6
 Summary: automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]
 Home-page: https://ddns.newfuture.cc
 Author: NewFuture
@@ -12,8 +12,15 @@ Keywords: ddns ipv6 ipv4 dns dnspod alidns cloudflare
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: Topic :: Software Development :: Build Tools
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: Topic :: Internet
+Classifier: Topic :: Internet :: Name Service (DNS)
+Classifier: Topic :: System :: Networking
+Classifier: Topic :: Software Development
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=2.5, <4
 Description-Content-Type: text/markdown

{ddns-3.1.4 → ddns-3.1.6}/ddns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddns
-Version: 3.1.4
+Version: 3.1.6
 Summary: automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]
 Home-page: https://ddns.newfuture.cc
 Author: NewFuture
@@ -12,8 +12,15 @@ Keywords: ddns ipv6 ipv4 dns dnspod alidns cloudflare
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: Topic :: Software Development :: Build Tools
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: Topic :: Internet
+Classifier: Topic :: Internet :: Name Service (DNS)
+Classifier: Topic :: System :: Networking
+Classifier: Topic :: Software Development
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=2.5, <4
 Description-Content-Type: text/markdown

{ddns-3.1.4 → ddns-3.1.6}/run.py

@@ -18,7 +18,7 @@ from util import ip
 from util.cache import Cache
 from util.config import init_config, get_config
 
-__version__ = "v3.1.4@2025-04-09T18:42:07+00:00"  # CI 时会被Tag替换
+__version__ = "v3.1.6@2025-05-29T16:18:28+00:00"  # CI 时会被Tag替换
 __description__ = "automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]"
 __doc__ = """
 ddns[%s]
@@ -27,7 +27,7 @@ ddns[%s]
 Copyright (c) New Future (MIT License)
 """ % (__version__)
 
-environ["DDNS_VERSION"] = "v3.1.4"
+environ["DDNS_VERSION"] = "v3.1.6"
 
 if getattr(sys, 'frozen', False):
     # https://github.com/pyinstaller/pyinstaller/wiki/Recipe-OpenSSL-Certificate
@@ -43,7 +43,7 @@ def get_ip(ip_type, index="default"):
     # EN: Catch exceptions
     value = None
     try:
-        debug(f"get_ip({ip_type}, {index})")
+        debug("get_ip(%s, %s)", ip_type, index)
         if index is False:  # disabled
             return False
         elif type(index) is list:  # 如果获取到的规则是列表，则依次判断列表中每一个规则，直到找到一个可以正确获取到的IP

{ddns-3.1.4 → ddns-3.1.6}/setup.py

@@ -37,8 +37,8 @@ elif 'BUILD_SOURCEBRANCHNAME' in environ:
     version = environ['BUILD_SOURCEBRANCHNAME']  # from azure pipelines
 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()))
+    if ref == 'master' or ref == 'main' or ref == "v3" or ref == "v2":  # CI
+        version = '3.0.b' + str(int(time()))
     elif ref.startswith('v') or ref.startswith('V'):  # Tag
         version = ref
     else:  # PR
@@ -126,7 +126,15 @@ setup(
 
         # Indicate who your project is intended for
         'Intended Audience :: Developers',
-        'Topic :: Software Development :: Build Tools',
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+
+        # Topics
+        'Topic :: Internet',
+        'Topic :: Internet :: Name Service (DNS)',
+        'Topic :: System :: Networking',
+        'Topic :: Software Development',
 
         # Pick your license as you wish
         'License :: OSI Approved :: MIT License',
@@ -135,7 +143,7 @@ setup(
         # that you indicate whether you support Python 2, Python 3 or both.
         # These classifiers are *not* checked by 'pip install'. See instead
         # 'python_requires' below.
-        # 'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
     ],
 

{ddns-3.1.4 → ddns-3.1.6}/util/cache.py

@@ -12,10 +12,11 @@ from time import time
 from logging import info, debug, warning
 
 try:
-    from collections.abc import MutableMapping
-except ImportError:
-    # Python 2 imports
+    # Python 2
     from collections import MutableMapping
+except ImportError:
+    # python3
+    from collections.abc import MutableMapping
 
 
 class Cache(MutableMapping):