PyPtt 1.2.9__tar.gz → 1.2.11__tar.gz

{pyptt-1.2.9 → pyptt-1.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPtt
-Version: 1.2.9
+Version: 1.2.11
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan

{pyptt-1.2.9 → pyptt-1.2.11}/PyPtt/PTT.py

@@ -2,7 +2,7 @@
 
 import functools
 import threading
-from typing import Dict, Tuple, Callable, List, Optional, Any
+from typing import Dict, Tuple, List, Optional, Any
 
 from . import __version__
 from . import _api_bucket
@@ -50,7 +50,7 @@ class API:
             logger_callback (Callable): PyPtt 顯示訊息的 callback。預設為 None。
             port (int): PyPtt 連線的 port。預設為 **23**。
             host (:ref:`host`): PyPtt 連線的 PTT 伺服器。預設為 **PTT1**。
-            check_update (bool): 是否檢查 PyPtt 的更新。預設為 **True**。
+            check_update (bool): 是否檢查 PyPtt 的更新。預設為 **False**。
 
         Returns:
             None
@@ -178,7 +178,7 @@ class API:
 
         log.logger.info('PyPtt', i18n.initialization, '...', i18n.done)
 
-        check_update = kwargs.get('check_update', True)
+        check_update = kwargs.get('check_update', False)
         check_value.check_type(check_update, bool, 'check_update')
 
         if check_update:
@@ -195,7 +195,7 @@ class API:
             log.logger.info(i18n.current_version, __version__)
 
     def __del__(self):
-        if log.logger:
+        if log and log.logger:
             log.logger.debug(i18n.goodbye)
 
     def login(self, ptt_id: str, ptt_pw: str, kick_other_session: bool = False) -> None:
@@ -1058,8 +1058,3 @@ class API:
 
     def fast_post_step1(self, sign_file):
         _api_post.fast_post_step1(self, sign_file)
-
-
-if __name__ == '__main__':
-    print('PyPtt v ' + __version__)
-    print('Maintained by CodingMan')

{pyptt-1.2.9 → pyptt-1.2.11}/PyPtt/__init__.py

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

{pyptt-1.2.9 → pyptt-1.2.11}/PyPtt/connect_core.py

@@ -4,6 +4,7 @@ import asyncio
 import os.path
 import ssl
 import telnetlib
+import tempfile
 import threading
 import time
 import traceback
@@ -25,24 +26,27 @@ from . import ssl_config
 
 websockets.http.USER_AGENT += f' PyPtt/{PyPtt.__version__}'
 
-_script_path = os.path.dirname(__file__)
+ssl_context = ssl.create_default_context()
 
 
 def ssl_init():
-    if not os.path.exists(f'{_script_path}/ssl'):
-        os.mkdir(f'{_script_path}/ssl')
 
-    with open(f"{_script_path}/ssl/cert.pem", 'w') as f:
-        f.write(ssl_config.cert)
+    cert_file = tempfile.NamedTemporaryFile(delete=False, suffix='.pem')
+    cert_file.write(ssl_config.cert.encode('utf-8'))
 
-    with open(f"{_script_path}/ssl/key.pem", 'w') as f:
-        f.write(ssl_config.key)
+    key_file = tempfile.NamedTemporaryFile(delete=False, suffix='.pem')
+    key_file.write(ssl_config.key.encode('utf-8'))
 
+    cert_file.close()
+    key_file.close()
 
-ssl_init()
+    ssl_context.load_cert_chain(certfile=cert_file.name, keyfile=key_file.name)
 
-ssl_context = ssl.create_default_context()
-ssl_context.load_cert_chain(certfile=f"{_script_path}/ssl/cert.pem", keyfile=f"{_script_path}/ssl/key.pem")
+    os.unlink(cert_file.name)
+    os.unlink(key_file.name)
+
+
+ssl_init()
 ssl_context.minimum_version = ssl.TLSVersion.TLSv1_2
 
 

pyptt-1.2.11/PyPtt/ssl_config.py

@@ -0,0 +1,25 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIPxohnK+7ol1VI18vCxwWWWLNmxifkx+S+24j+ECvtrIoAoGCCqGSM49
+AwEHoUQDQgAEtI001t4IcID4JF/LoVUNrZqIaGIRB4IdN5FK8umkXZiHMoQBjSLN
+mWZBF8YNj7nTJsE4mnaEagAi9hniZG8Jdg==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIICEjCCAbegAwIBAgIUTd2xAuhGMpBTofRPR0iFQhFrjG4wCgYIKoZIzj0EAwIw
+dzELMAkGA1UEBhMCVFcxDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5MRUw
+EwYDVQQKDAxPcmdhbml6YXRpb24xHDAaBgNVBAsME09yZ2FuaXphdGlvbmFsIFVu
+aXQxFDASBgNVBAMMC0NvbW1vbiBOYW1lMB4XDTI0MDUwMTA3NDc0OFoXDTM0MDQy
+OTA3NDc0OFowdzELMAkGA1UEBhMCVFcxDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQH
+DARDaXR5MRUwEwYDVQQKDAxPcmdhbml6YXRpb24xHDAaBgNVBAsME09yZ2FuaXph
+dGlvbmFsIFVuaXQxFDASBgNVBAMMC0NvbW1vbiBOYW1lMFkwEwYHKoZIzj0CAQYI
+KoZIzj0DAQcDQgAEtI001t4IcID4JF/LoVUNrZqIaGIRB4IdN5FK8umkXZiHMoQB
+jSLNmWZBF8YNj7nTJsE4mnaEagAi9hniZG8JdqMhMB8wHQYDVR0OBBYEFDi7xJKZ
+nUEBB2/j1pWVLJ8+ut4gMAoGCCqGSM49BAMCA0kAMEYCIQCTAENmnDhhG9ECHh7M
+sY8qH+kA4fH6yDNwOIaozhmXuQIhAO5HR40oCn2+uKKM8HapRa9OUj12vmSTuLpO
+UnFFlYXg
+-----END CERTIFICATE-----
+"""

{pyptt-1.2.9 → pyptt-1.2.11}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPtt
-Version: 1.2.9
+Version: 1.2.11
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan

{pyptt-1.2.9 → pyptt-1.2.11}/PyPtt.egg-info/SOURCES.txt

@@ -46,6 +46,4 @@ PyPtt.egg-info/PKG-INFO
 PyPtt.egg-info/SOURCES.txt
 PyPtt.egg-info/dependency_links.txt
 PyPtt.egg-info/requires.txt
-PyPtt.egg-info/top_level.txt
-PyPtt/ssl/cert.pem
-PyPtt/ssl/key.pem
+PyPtt.egg-info/top_level.txt

pyptt-1.2.9/PyPtt/ssl/cert.pem

@@ -1,12 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBrTCCAVOgAwIBAgIUac6b6rzwFIEa9VBigD0jYlE96NkwCgYIKoZIzj0EAwIw
-RTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGElu
-dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNDA0MTEwNzA4NDJaFw0zNDA0MDkw
-NzA4NDJaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYD
-VQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwWTATBgcqhkjOPQIBBggqhkjO
-PQMBBwNCAASGL9hdVzbi6QTzJk409Ne+ZMnK2iQcm6VcAacTyJvQqCEIQysJtRs+
-/53XjdOORHgDfsMK94T4CG6TbULqCT+uoyEwHzAdBgNVHQ4EFgQUoR2GjY1nFWvR
-gTyu936KF11kvL0wCgYIKoZIzj0EAwIDSAAwRQIhAOQ33wHzCv7F2yI8Ye4BHdtZ
-SOW7IgU5rRkFlMPhTXj6AiBGE0+EZPNctmBfj2N8s6lYIxsGmlcSnWVxlQvj6XQc
-Uw==
------END CERTIFICATE-----

pyptt-1.2.9/PyPtt/ssl/key.pem

@@ -1,8 +0,0 @@
------BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO6ELVhrKQdW1YcoP3VOGW4XKGyVmlVdPHxou5XDDlU3oAoGCCqGSM49
-AwEHoUQDQgAEhi/YXVc24ukE8yZONPTXvmTJytokHJulXAGnE8ib0KghCEMrCbUb
-Pv+d143TjkR4A37DCveE+Ahuk21C6gk/rg==
------END EC PRIVATE KEY-----

pyptt-1.2.9/PyPtt/ssl_config.py

@@ -1,25 +0,0 @@
-import os
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIBrTCCAVOgAwIBAgIUac6b6rzwFIEa9VBigD0jYlE96NkwCgYIKoZIzj0EAwIw
-RTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGElu
-dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNDA0MTEwNzA4NDJaFw0zNDA0MDkw
-NzA4NDJaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYD
-VQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwWTATBgcqhkjOPQIBBggqhkjO
-PQMBBwNCAASGL9hdVzbi6QTzJk409Ne+ZMnK2iQcm6VcAacTyJvQqCEIQysJtRs+
-/53XjdOORHgDfsMK94T4CG6TbULqCT+uoyEwHzAdBgNVHQ4EFgQUoR2GjY1nFWvR
-gTyu936KF11kvL0wCgYIKoZIzj0EAwIDSAAwRQIhAOQ33wHzCv7F2yI8Ye4BHdtZ
-SOW7IgU5rRkFlMPhTXj6AiBGE0+EZPNctmBfj2N8s6lYIxsGmlcSnWVxlQvj6XQc
-Uw==
------END CERTIFICATE-----
-"""
-
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO6ELVhrKQdW1YcoP3VOGW4XKGyVmlVdPHxou5XDDlU3oAoGCCqGSM49
-AwEHoUQDQgAEhi/YXVc24ukE8yZONPTXvmTJytokHJulXAGnE8ib0KghCEMrCbUb
-Pv+d143TjkR4A37DCveE+Ahuk21C6gk/rg==
------END EC PRIVATE KEY-----
-"""