Functions-d 1.39__tar.gz → 1.41__tar.gz

{functions_d-1.39 → functions_d-1.41}/Functions_d/Functions_d.py

@@ -7,7 +7,7 @@ import shutil
 import time
 import urllib.request
 import WeComMsg
-import xlwings as xw
+# import xlwings as xw
 import yagmail
 import HiveClient
 from PIL import ImageGrab, Image
@@ -20,7 +20,7 @@ from selenium.webdriver.edge.service import Service
 from selenium.webdriver.edge.options import Options
 from webdriver_manager.microsoft import EdgeChromiumDriverManager
 import psutil
-import pythoncom
+# import pythoncom
 from tenacity import retry, stop_after_attempt, wait_fixed
 import requests
 import pandas as pd
@@ -122,7 +122,9 @@ class DataProcessingAndMessaging:
 
     # -------------------------- 初始化Edge驱动 --------------------------
     def init_edge_driver(self, headless=True):
-        os.environ['WDM_ARCH'] = 'x86'  # 强制32位驱动
+        import sys
+        if sys.platform == "win32":
+            os.environ['WDM_ARCH'] = 'x86'  # 只有 Windows 才强制32位驱动
         edge_options = Options()
         edge_options.add_argument('--disable-gpu')
         edge_options.add_argument('--no-sandbox')
@@ -676,10 +678,10 @@ class DataProcessingAndMessaging:
 
     # -------------------------- 写入Excel数据 --------------------------
     def writer_excel_data(self, path, filename, send_file, sheet_data, headers):
+        import xlwings as xw
         self.logger.info('开始处理Excel表格')
         print('开始处理Excel表格')
         filename = path + filename
-        send_file = send_file
         dfs = []
         sheet_names = []
         clear_ranges = []
@@ -755,6 +757,8 @@ class DataProcessingAndMessaging:
 
     # -------------------------- Excel截图（安全版） --------------------------
     def screen(self, filename, sheetname, screen_area, img_name):
+        import pythoncom
+        import xlwings as xw
         self.logger.info('开始截图')
         print('开始截图')
         pythoncom.CoInitialize()
@@ -1933,7 +1937,7 @@ class DataProcessingAndMessaging:
                     final_name = short_name
                 new_cols.append(final_name)
             df.columns = new_cols
-            self.logger.info(f"列名清洗完成，原列名：{old_columns} → 新列名：{list(df.columns)}")
+            self.logger.info(f"列名清洗完成，共{len(df.columns)}个字段")
             print(f"列名清洗完成，共{len(df.columns)}个字段")
 
             # 增加优化参数，大幅提升PowerBI读取性能
@@ -1985,7 +1989,7 @@ class DataProcessingAndMessaging:
                     final_name = short_name
                 new_cols.append(final_name)
             df.columns = new_cols
-            self.logger.info(f"列名清洗完成，原列名：{old_columns} → 新列名：{list(df.columns)}")
+            self.logger.info(f"列名清洗完成，共{len(df.columns)}个字段")
             print(f"列名清洗完成，共{len(df.columns)}个字段")
 
             # 导出csv，utf-8-sig解决中文乱码，不输出索引

{functions_d-1.39 → functions_d-1.41}/Functions_d.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Functions_d
-Version: 1.39
+Version: 1.41
 Summary: 包含数据处理、Hive交互、企业微信消息发送、Excel操作等功能的工具类库
 Author: DongYang
 Author-email: 649898871@qq.com

{functions_d-1.39 → functions_d-1.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Functions_d
-Version: 1.39
+Version: 1.41
 Summary: 包含数据处理、Hive交互、企业微信消息发送、Excel操作等功能的工具类库
 Author: DongYang
 Author-email: 649898871@qq.com

{functions_d-1.39 → functions_d-1.41}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Functions_d
-version = 1.39
+version = 1.41
 author = DongYang
 author_email = 649898871@qq.com
 description = 包含数据处理、Hive交互、企业微信消息发送、Excel操作等功能的工具类库