simtoolsz 0.2.0__tar.gz → 0.2.2__tar.gz

{simtoolsz-0.2.0 → simtoolsz-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: simtoolsz
-Version: 0.2.0
+Version: 0.2.2
 Summary: A simple tool collection.
 Author-email: Sidney Zhang <liangyi@me.com>
 License: MulanPSL-2.0

{simtoolsz-0.2.0 → simtoolsz-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simtoolsz"
-version = "0.2.0"
+version = "0.2.2"
 description = "A simple tool collection."
 keywords = ["tool", "collection"]
 license = { text = "MulanPSL-2.0" }

{simtoolsz-0.2.0 → simtoolsz-0.2.2}/src/simtoolsz/__init__.py

@@ -9,7 +9,7 @@ import simtoolsz.datetime as datetime
 try:
     __version__ = importlib.metadata.version("simtoolsz")
 except importlib.metadata.PackageNotFoundError:
-    __version__ = "0.2.0"
+    __version__ = "0.2.2"
 
 __all__ = [
     '__version__', 'mail', 'utils', 'datetime', 'io'

{simtoolsz-0.2.0 → simtoolsz-0.2.2}/src/simtoolsz/mail.py

@@ -137,8 +137,11 @@ def send_email(
     
     # 设置发件人
     if sender_name:
-        sender_name = Header(sender_name, "utf-8").encode()
-    msg["From"] = formataddr((sender_name, email_account)) if sender_name else email_account
+        # 使用Header处理非ASCII字符，然后手动格式化地址
+        encoded_name = Header(sender_name, "utf-8").encode()
+        msg["From"] = f"{encoded_name} <{email_account}>"
+    else:
+        msg["From"] = email_account
     
     def format_recipient_list(recipient_list):
         """格式化收件人列表"""
@@ -146,8 +149,12 @@ def send_email(
         for recipient in recipient_list:
             if isinstance(recipient, tuple) and len(recipient) == 2:
                 name, addr = recipient
-                name = Header(name, "utf-8").encode()
-                formatted.append(formataddr((name, addr)))
+                if name:
+                    # 使用Header处理非ASCII字符，然后手动格式化地址
+                    encoded_name = Header(name, "utf-8").encode()
+                    formatted.append(f"{encoded_name} <{addr}>")
+                else:
+                    formatted.append(addr)
             else:
                 # 处理字符串格式如 "张三<user@example.com>"
                 recipient_str = str(recipient)
@@ -155,8 +162,9 @@ def send_email(
                     name_part = recipient_str.split("<")[0].strip()
                     addr_part = recipient_str.split("<")[1].split(">")[0].strip()
                     if name_part:
-                        name_part = Header(name_part, "utf-8").encode()
-                        formatted.append(formataddr((name_part, addr_part)))
+                        # 使用Header处理非ASCII字符，然后手动格式化地址
+                        encoded_name = Header(name_part, "utf-8").encode()
+                        formatted.append(f"{encoded_name} <{addr_part}>")
                     else:
                         formatted.append(addr_part)
                 else:
@@ -165,9 +173,15 @@ def send_email(
     
     # 设置收件人
     msg["Subject"] = Header(subject, "utf-8")
-    msg["To"] = ", ".join(format_recipient_list(all_recipients))
+    
+    # 处理收件人，确保正确编码
+    if all_recipients:
+        formatted_recipients = format_recipient_list(all_recipients)
+        msg["To"] = ", ".join(formatted_recipients)
+    
     if all_cc:
-        msg["Cc"] = ", ".join(format_recipient_list(all_cc))
+        formatted_cc = format_recipient_list(all_cc)
+        msg["Cc"] = ", ".join(formatted_cc)
     
     # 处理邮件正文和签名
     full_content = content
@@ -202,8 +216,9 @@ def send_email(
                 _, subtype = mime_type.split("/", 1)
                 img_part = MIMEImage(img_data, _subtype=subtype)
                 img_part.add_header("Content-ID", f"<{cid}>")
-                img_part.add_header("Content-Disposition", "inline", 
-                                  filename=Header(img_path.name, "utf-8").encode())
+                # 正确处理内嵌图片文件名编码
+                encoded_filename = Header(img_path.name, "utf-8").encode()
+                img_part.add_header("Content-Disposition", "inline", filename=encoded_filename)
                 msg.attach(img_part)
             except Exception as e:
                 raise RuntimeError(f"处理内嵌图片失败 {img_path}: {e}")
@@ -218,9 +233,10 @@ def send_email(
             with open(file_path, "rb") as f:
                 file_data = f.read()
             
-            part = MIMEApplication(file_data, Name=Header(file_path.name, "utf-8").encode())
-            part.add_header("Content-Disposition", "attachment", 
-                          filename=Header(file_path.name, "utf-8").encode())
+            # 正确处理附件文件名编码
+            encoded_filename = Header(file_path.name, "utf-8").encode()
+            part = MIMEApplication(file_data, Name=encoded_filename)
+            part.add_header("Content-Disposition", "attachment", filename=encoded_filename)
             msg.attach(part)
         except Exception as e:
             raise RuntimeError(f"处理附件失败 {file_path}: {e}")
@@ -277,6 +293,7 @@ def send_email(
             server.starttls()
         
         # 登录并发送
+        server.local_hostname = 'Localhost'
         server.login(email_account, password)
         server.sendmail(email_account, all_emails, msg.as_string())
         server.quit()

simtoolsz-0.2.2/tests/verify_unicode_fix.py

@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+邮件Unicode编码修复验证脚本
+
+这个脚本验证修复的邮件发送功能是否能正确处理包含中文和其他
+非ASCII字符的情况，避免'ascii' codec编码错误。
+"""
+
+import sys
+import os
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'src'))
+
+from simtoolsz.mail import send_email
+
+def test_unicode_email_sending():
+    """测试Unicode字符邮件发送修复"""
+    print("=== 邮件Unicode编码修复验证 ===\n")
+    
+    test_cases = [
+        {
+            "name": "中文发件人和收件人",
+            "sender_name": "张三",
+            "recipients": ["李四<recipient@example.com>"],
+            "subject": "中文主题测试",
+            "content": "这是一封包含中文内容的测试邮件。"
+        },
+        {
+            "name": "混合字符测试", 
+            "sender_name": "Admin管理员",
+            "recipients": ["Test用户<recipient@example.com>"],
+            "subject": "Mixed Test 混合测试",
+            "content": "This email contains both English and 中文内容 for testing."
+        }
+    ]
+    
+    all_passed = True
+    
+    for i, test_case in enumerate(test_cases, 1):
+        print(f"测试 {i}: {test_case['name']}")
+        
+        try:
+            result = send_email(
+                email_account="test@example.com",
+                password="test123",
+                subject=test_case['subject'],
+                content=test_case['content'],
+                recipients=test_case['recipients'],
+                sender_name=test_case['sender_name'],
+                smtp_config={
+                    "smtp_server": "smtp.example.com",
+                    "port": 587,
+                    "use_ssl": False
+                },
+                timeout=3  # 短超时，因为我们只测试编码不实际发送
+            )
+            
+            # 检查是否出现ASCII编码错误
+            error_msg = result['message'].lower()
+            if "ascii" in error_msg and "codec" in error_msg:
+                print(f"❌ ASCII编码错误仍然存在: {result['message']}")
+                all_passed = False
+            else:
+                print(f"✅ Unicode编码处理正常")
+                print(f"   消息: {result['message']}")
+                
+        except UnicodeEncodeError as e:
+            print(f"❌ Unicode编码错误: {e}")
+            all_passed = False
+        except Exception as e:
+            # 其他错误（如网络连接失败）是可以接受的，因为我们没有真实的服务器
+            error_msg = str(e).lower()
+            if "ascii" in error_msg and "codec" in error_msg:
+                print(f"❌ ASCII编码错误: {e}")
+                all_passed = False
+            else:
+                print(f"✅ 无编码错误（其他错误可接受）: {e}")
+        
+        print()
+    
+    return all_passed
+
+if __name__ == "__main__":
+    success = test_unicode_email_sending()
+    
+    if success:
+        print("🎉 邮件Unicode编码修复验证通过！")
+        print("修复成功解决了 'ascii' codec can't encode characters 错误。")
+    else:
+        print("❌ 邮件Unicode编码修复验证失败。")
+        print("仍然存在编码问题，需要进一步修复。")
+    
+    sys.exit(0 if success else 1)