ilds 2.2.2__tar.gz → 2.2.4__tar.gz

{ilds-2.2.2 → ilds-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ilds
-Version: 2.2.2
+Version: 2.2.4
 Summary: 常用模块的集合，为了多平台，多电脑调用方便!
 Home-page: https://github.com/ldsxp/ilds
 Author: lds

{ilds-2.2.2 → ilds-2.2.4}/ilds/django/util.py

@@ -2,9 +2,9 @@
 #
 # ---------------------------------------
 #   程序：util.py
-#   版本：0.3
+#   版本：0.4
 #   作者：lds
-#   日期：2019-01-21
+#   日期：2024-09-18
 #   语言：Python 3.X
 #   说明：常用的函数集合
 # ---------------------------------------
@@ -20,23 +20,30 @@ def django_setup(project_name=None, site_path=None):
     """
     设置 Django 运行环境
 
+    用法示例:
     from ilds.django.util import django_setup
     django_setup(r'mysite', site_path=None)
     """
 
-    if site_path is not None:
+    if site_path:
         sys.path.insert(0, site_path)
 
-    if project_name is None:
-        project_name = os.path.split(os.path.dirname(__file__))[-1]
-    print('项目：', project_name)
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{}.settings".format(project_name))
+    if not project_name:
+        project_name = os.path.basename(os.path.dirname(__file__))
+
+    print(f'项目：{project_name}')
+
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", f"{project_name}.settings")
+
     try:
         import django
         django.setup()
     except ModuleNotFoundError as e:
         print("注：如果找不到 Django，请安装它: pip install django\n错误提示：", e)
-        exit()
+        exit(1)  # 使用非零退出代码表示程序异常退出
+    except Exception as e:
+        print("发生了意外错误：", e)
+        exit(1)
 
 
 def random_key():

{ilds-2.2.2 → ilds-2.2.4}/ilds/excel_xlsx.py

@@ -218,7 +218,9 @@ class ReadXlsx(object):
                     # bg_color = fill.end_color.rgb  # end_color bgColor
                     # print(bg_color)
                     # print(c.data_type, c.number_format, is_date_format(c.number_format), c.value)
-                    if c.value is None and self.none_to_null_characters:
+                    if c.hyperlink and c.hyperlink.target:
+                        cell_value = c.hyperlink.target
+                    elif c.value is None and self.none_to_null_characters:
                         cell_value = ''
                     elif c.data_type == "n":
                         if c.number_format != "General" and is_date_format(c.number_format):

{ilds-2.2.2 → ilds-2.2.4}/ilds/file.py

@@ -791,31 +791,27 @@ def json_read(path):
     读取 json 文件
     """
     try:
-        if not os.path.exists(path):
-            return False
         with open(path, 'r', encoding='utf-8') as f:
-            obj = json.load(f)
-        return obj
+            return json.load(f)
     except Exception as e:
-        print('json_read', e)
-        return False
+        print('Error reading JSON:', e)
+        return None
 
 
-def json_save(obj, path):
+def json_save(obj, path, indent=2):
     """
     保存 json 文件
     """
-
     if obj is None:
         return False
-    else:
-        try:
-            with open(path, 'w', encoding='utf-8') as f:
-                json.dump(obj, f, ensure_ascii=False, indent=2)
-            return True
-        except Exception as e:
-            print('json_save', e)
-            return False
+
+    try:
+        with open(path, 'w', encoding='utf-8') as f:
+            json.dump(obj, f, ensure_ascii=False, indent=indent)
+        return True
+    except Exception as e:
+        print('Error saving JSON:', e)
+        return False
 
 
 def doc():

{ilds-2.2.2 → ilds-2.2.4}/ilds/versions.py

@@ -1,4 +1,4 @@
-version = '2.2.2'
+version = '2.2.4'
 
 # 因为日期格式问题，所以下面的版本号不能使用
 # 主版本号 (Major Version): 较大的功能变化或结构调整

{ilds-2.2.2 → ilds-2.2.4}/ilds.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ilds
-Version: 2.2.2
+Version: 2.2.4
 Summary: 常用模块的集合，为了多平台，多电脑调用方便!
 Home-page: https://github.com/ldsxp/ilds
 Author: lds