PyPtt 1.3.1__tar.gz → 1.3.3__tar.gz

{pyptt-1.3.1 → pyptt-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 1.3.1
+Version: 1.3.3
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Natural Language :: Chinese (Traditional)
 Classifier: Natural Language :: English
@@ -64,7 +65,7 @@ PyPtt 是一套以 Pure Python 實作的 PTT (批踢踢) SDK，提供了完整
 - 其他功能: 即時訊息(水球)、P幣轉帳
 
 ### 系統需求
-- Python 3.6+
+- Python 3.8 以上
 - 非雲端環境 (因 PTT 封鎖雲端 IP)
 
 ### 快速開始

{pyptt-1.3.1 → pyptt-1.3.3}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.3.1'
+__version__ = '1.3.3'
 
 from .PTT import API
 from .data_type import *

{pyptt-1.3.1 → pyptt-1.3.3}/PyPtt/_api_get_newest_index.py

@@ -159,6 +159,7 @@ def get_newest_index(api, index_type: data_type.NewIndex, board: Optional[str] =
 
         target_list = [
             connect_core.TargetUnit(screens.Target.InMailBox, break_detect=True),
+            connect_core.TargetUnit(screens.Target.InMailBoxWithCursor, break_detect=True),
             connect_core.TargetUnit(screens.Target.CursorToGoodbye, response=cmd),
         ]
 
@@ -185,7 +186,7 @@ def get_newest_index(api, index_type: data_type.NewIndex, board: Optional[str] =
             cmd,
             target_list)
 
-        if index == 0:
+        if index == 0 or index == 1:
             normal_newest_index = get_index(api)
 
             if search_list is not None and len(search_list) > 0:

{pyptt-1.3.1 → pyptt-1.3.3}/PyPtt/_api_mail.py

@@ -47,6 +47,8 @@ def mail(api,
         if sign_file.lower() != 'x':
             raise exceptions.ParameterError(f'wrong parameter sign_file: {sign_file}')
 
+    content = lib_util.uniform_new_line(content)
+
     cmd_list = []
     # 回到主選單
     cmd_list.append(command.go_main_menu)

{pyptt-1.3.1 → pyptt-1.3.3}/PyPtt/connect_core.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import asyncio
 import os.path
 import ssl
-import telnetlib
 import tempfile
 import threading
 import time
@@ -213,20 +212,17 @@ class API(object):
         for _ in range(2):
 
             try:
-                if self.config.connect_mode == data_type.ConnectMode.TELNET:
-                    self._core = telnetlib.Telnet(telnet_host, self.config.port)
-                else:
-                    if threading.current_thread() is not threading.main_thread():
-                        loop = asyncio.new_event_loop()
-                        asyncio.set_event_loop(loop)
-
-                    log.logger.debug('USER_AGENT',
-                                     websockets.http11.USER_AGENT if use_http11 else websockets.http.USER_AGENT)
-                    self._core = asyncio.get_event_loop().run_until_complete(
-                        websockets.connect(
-                            websocket_host,
-                            origin=websocket_origin,
-                            ssl=ssl_context))
+                if threading.current_thread() is not threading.main_thread():
+                    loop = asyncio.new_event_loop()
+                    asyncio.set_event_loop(loop)
+
+                log.logger.debug('USER_AGENT',
+                                 websockets.http11.USER_AGENT if use_http11 else websockets.http.USER_AGENT)
+                self._core = asyncio.get_event_loop().run_until_complete(
+                    websockets.connect(
+                        websocket_host,
+                        origin=websocket_origin,
+                        ssl=ssl_context))
 
                 connect_success = True
             except Exception as e:

pyptt-1.3.3/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIDsVaXxAeTEqnC3V2BjBZepjfx3lG0UNiBb6IGs1nqo5oAoGCCqGSM49
+AwEHoUQDQgAExzhLL99T9DDmDW8my+dVvremZ3lYo9l+D6sBkcaD+KxYkd+eHhCp
+DBfIKnDILG7XNOpl3PBa4AOC4BkGkrqq0w==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6TCCAY8CFAIPufXDoRbmCDs53mUkr/QCZ1wnMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNTA5MjYwOTE4MzhaFw0zNTA5MjQwOTE4
+MzhaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABMc4Sy/fU/Qw5g1vJsvnVb63pmd5WKPZfg+rAZHGg/isWJHfnh4QqQwX
+yCpwyCxu1zTqZdzwWuADguAZBpK6qtMwCgYIKoZIzj0EAwIDSAAwRQIhAMTUyNcu
+iVbprDZNcnP58QoqQd3tIyod4eusUqIYjnIUAiAQsnjz0Ffer7IcrXG6pfscfi5O
+JbGxeRO0TFgSybUMBg==
+-----END CERTIFICATE-----
+"""

{pyptt-1.3.1 → pyptt-1.3.3}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 1.3.1
+Version: 1.3.3
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Natural Language :: Chinese (Traditional)
 Classifier: Natural Language :: English
@@ -64,7 +65,7 @@ PyPtt 是一套以 Pure Python 實作的 PTT (批踢踢) SDK，提供了完整
 - 其他功能: 即時訊息(水球)、P幣轉帳
 
 ### 系統需求
-- Python 3.6+
+- Python 3.8 以上
 - 非雲端環境 (因 PTT 封鎖雲端 IP)
 
 ### 快速開始

{pyptt-1.3.1 → pyptt-1.3.3}/README.md

@@ -20,7 +20,7 @@ PyPtt 是一套以 Pure Python 實作的 PTT (批踢踢) SDK，提供了完整
 - 其他功能: 即時訊息(水球)、P幣轉帳
 
 ### 系統需求
-- Python 3.6+
+- Python 3.8 以上
 - 非雲端環境 (因 PTT 封鎖雲端 IP)
 
 ### 快速開始

{pyptt-1.3.1 → pyptt-1.3.3}/setup.py

@@ -107,6 +107,7 @@ setup(
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Programming Language :: Python :: 3 :: Only',
 
         'Natural Language :: Chinese (Traditional)',

pyptt-1.3.1/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAUeDeLJz7Ast36veGFEaSoUTiQKLFuHZ4JqgT2CHh7poAoGCCqGSM49
-AwEHoUQDQgAEOaAq4rxVKFcwKhvnBnkCcj57MMttX9dh79qMgYth50tkp3aNXSZc
-NPQHUur09OejfBy3/V9eoXBMj2f3HhoT/Q==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6TCCAY8CFEq/uOD3yklb0FR3ITccL0U0XJjPMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNTA5MTMxMDM4MjVaFw0zNTA5MTExMDM4
-MjVaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABDmgKuK8VShXMCob5wZ5AnI+ezDLbV/XYe/ajIGLYedLZKd2jV0mXDT0
-B1Lq9PTno3wct/1fXqFwTI9n9x4aE/0wCgYIKoZIzj0EAwIDSAAwRQIhAIe+zYvB
-ylTH27vXomiPRtCMzw42FifKnHtEyKDA6wXyAiBLiB283NBQsJmNACVhz/yKllMB
-wjXzSUhrTUBPbsqYyA==
------END CERTIFICATE-----
-"""