PyPtt 1.2.12__tar.gz → 1.2.13__tar.gz

{pyptt-1.2.12 → pyptt-1.2.13}/PKG-INFO

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

{pyptt-1.2.12 → pyptt-1.2.13}/PyPtt/__init__.py

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

{pyptt-1.2.12 → pyptt-1.2.13}/PyPtt/connect_core.py

@@ -13,7 +13,6 @@ from typing import Any
 
 import websockets
 import websockets.exceptions
-import websockets.http
 
 import PyPtt
 from . import command
@@ -24,7 +23,14 @@ from . import log
 from . import screens
 from . import ssl_config
 
-websockets.http.USER_AGENT += f' PyPtt/{PyPtt.__version__}'
+try:
+    import websockets.http
+    websockets.http.USER_AGENT += f' PyPtt/{PyPtt.__version__}'
+    use_http11 = False
+except AttributeError:
+    import websockets.http11
+    websockets.http11.USER_AGENT += f' PyPtt/{PyPtt.__version__}'
+    use_http11 = True
 
 ssl_context = None
 
@@ -203,7 +209,7 @@ class API(object):
                         loop = asyncio.new_event_loop()
                         asyncio.set_event_loop(loop)
 
-                    log.logger.debug('USER_AGENT', websockets.http.USER_AGENT)
+                    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,

{pyptt-1.2.12 → pyptt-1.2.13}/PyPtt/i18n.py

@@ -56,3 +56,4 @@ def init(locale: str, cache: bool = False) -> None:
         if cache:
             global _lang_data
             _lang_data[k] = v
+

pyptt-1.2.13/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIPlyCHd9g7xUfCSjEZiEVuQzYHTwHyQS1ph6IJeuWp0loAoGCCqGSM49
+AwEHoUQDQgAEbzihcA0pY7m4q5+x+5MEka1HNMOzYuotBRKZsuNbIAhQttVpSH59
+WOEQ8otbmNwApn97Rzo8Wc2Hwd1Couc7nA==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6DCCAY8CFAqUEaN/XA35JcqUvcOv6ACavBaaMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNDA5MDkwMzExMTBaFw0zNDA5MDcwMzEx
+MTBaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABG84oXANKWO5uKufsfuTBJGtRzTDs2LqLQUSmbLjWyAIULbVaUh+fVjh
+EPKLW5jcAKZ/e0c6PFnNh8HdQqLnO5wwCgYIKoZIzj0EAwIDRwAwRAIgTW8rYznR
+C0HtopDFIDXfYsAosEaVbFNYgUAFhEJb85ACIC+Tt5Q6HldwlzxeiTjqLJgiJcQX
+Gn7eTXHDpDm24QA4
+-----END CERTIFICATE-----
+"""

{pyptt-1.2.12 → pyptt-1.2.13}/PyPtt.egg-info/PKG-INFO

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

{pyptt-1.2.12 → pyptt-1.2.13}/setup.py

@@ -7,7 +7,9 @@ from setuptools import setup
 
 def version_automation_script():
     is_merged = os.environ.get('GITHUB_EVENT_NAME') == 'pull_request'
+    branch = os.environ.get('GITHUB_REF_NAME')
     print('is_merged:', is_merged)
+    print('branch:', branch)
 
     # read the main version from __init__.py
     with open('PyPtt/__init__.py', 'r', encoding='utf-8') as f:
@@ -37,7 +39,7 @@ def version_automation_script():
     if version is None or pypi_version is None:
         raise ValueError('Can not get version from pypi')
 
-    if not is_merged:
+    if 'master' not in branch:
         commit_file = '/tmp/commit_hash.txt'
         if os.path.exists(commit_file):
             with open(commit_file, 'r', encoding='utf-8') as f:

pyptt-1.2.12/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO+xEROY5c66+lghuzon4+QSQjNMjYOsIcZTGu9kvdUooAoGCCqGSM49
-AwEHoUQDQgAEpjnp/z3Dr9rh+vP35MvZAUdgVo9cr4JBYXGbYlxtc0WyNuSz0NyS
-dM6vy7SZ5wSM3jhqd1//7MzGZ3bQquANuw==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6jCCAY8CFGuxNOT4MXnzlELPVff39pImhwuBMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNDA1MDUwNTU2NTVaFw0zNDA1MDMwNTU2
-NTVaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABKY56f89w6/a4frz9+TL2QFHYFaPXK+CQWFxm2JcbXNFsjbks9DcknTO
-r8u0mecEjN44andf/+zMxmd20KrgDbswCgYIKoZIzj0EAwIDSQAwRgIhAOeKSR2I
-Ru+Ois0V+G6ab3Hwu7E182D+pBHvjQHEouW9AiEApcJFk95BQU2R4KCup1wnUnxw
-bnffr8eMeWFiqo74EX0=
------END CERTIFICATE-----
-"""