PyPtt 2.1.3__tar.gz → 2.1.4__tar.gz

{pyptt-2.1.3 → pyptt-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.1.3
+Version: 2.1.4
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.1.3 → pyptt-2.1.4}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.1.3'
+__version__ = '2.1.4'
 __author__ = 'CodingMan'
 __email__ = 'pttcodingman@gmail.com'
 

{pyptt-2.1.3 → pyptt-2.1.4}/PyPtt/connect_core.py

@@ -196,8 +196,12 @@ class API(object):
             websocket_host = 'wss://ws.ptt2.cc/bbs/'
             websocket_origin = 'https://term.ptt2.cc'
         elif self.config.host == data_type.HOST.LOCALHOST:
-            websocket_host = 'wss://localhost'
-            websocket_origin = 'https://term.ptt.cc'
+            # ponytail: local pttbbs docker image (bbsdocker/imageptt) serves plain ws
+            # (no TLS) on 48763; config.port defaults to 23 (telnet default) so treat
+            # that as "not set" and fall back to imageptt's default port
+            port = self.config.port if self.config.port != 23 else 48763
+            websocket_host = f'ws://localhost:{port}/bbs'
+            websocket_origin = 'http://localhost'
         else:
             websocket_host = f'wss://{self.config.host}'
             websocket_origin = 'https://term.ptt.cc'
@@ -209,11 +213,15 @@ class API(object):
             try:
                 log.logger.debug('USER_AGENT',
                                  websockets.http11.USER_AGENT if use_http11 else websockets.http.USER_AGENT)
+                # ponytail: ws:// (local docker target) can't take an ssl context —
+                # websockets errors out if you pass one on a non-wss URI
+                connect_kwargs = {'origin': websocket_origin}
+                if websocket_host.startswith('wss://'):
+                    connect_kwargs['ssl'] = self._ssl_context
                 self._core = loop.run_until_complete(
                     websockets.connect(
                         websocket_host,
-                        origin=websocket_origin,
-                        ssl=self._ssl_context))
+                        **connect_kwargs))
                 # Respond to PTT's IAC DO NAWS (ff fd 1f) and announce terminal size.
                 # PTT honours any height >= 24; larger values reduce get_content iterations.
                 # PTT's hard cap is 100 rows regardless of what we send.

{pyptt-2.1.3 → pyptt-2.1.4}/PyPtt/screens.py

@@ -199,7 +199,9 @@ class Target:
     content_end_list = [
         '--\n※ 發信站: 批踢踢實業坊',
         '--\n※ 發信站: 批踢踢兔(ptt2.cc)',
-        '--\n※ 發信站: 新批踢踢(ptt2.twbbs.org.tw)'
+        '--\n※ 發信站: 新批踢踢(ptt2.twbbs.org.tw)',
+        # bbsdocker/imageptt (HOST.LOCALHOST test container) site name.
+        '--\n※ 發信站: 批踢踢 docker(pttdocker.test)'
     ]
 
     OnlineUser = [

pyptt-2.1.4/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIPSUMd0VM3Lz9oHqzRjDOoA7mMSwkff1CvCmOhswqdeToAoGCCqGSM49
+AwEHoUQDQgAEFL8NgpDyAYc1AfvrY4QeOOF5bEaj3fQyrfF+SQhRzgqnKFPxCVVs
+qPE3yCC7L/2VweGjoPMg1YPOsSTsiliqlg==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6jCCAY8CFFnMpZwQZ949yt925TXsbCqq9/+SMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA3MTMxNTE4MDhaFw0zNjA3MTAxNTE4
+MDhaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABBS/DYKQ8gGHNQH762OEHjjheWxGo930Mq3xfkkIUc4KpyhT8QlVbKjx
+N8gguy/9lcHho6DzINWDzrEk7IpYqpYwCgYIKoZIzj0EAwIDSQAwRgIhAJaKKQ+t
+oEPH2j3xs3Rg3F3IR/8EdlzdD+mFPoXtjl9dAiEAhvHMefijy34Ya268zOGArdNz
+5msfSDH5QT27scqencw=
+-----END CERTIFICATE-----
+"""

{pyptt-2.1.3 → pyptt-2.1.4}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.1.3
+Version: 2.1.4
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.1.3 → pyptt-2.1.4}/tests/test_bucket.py

@@ -17,6 +17,7 @@ import pytest
 
 import PyPtt
 from tests import config
+from tests import util
 
 
 def test_bucket_nonexistent_user_raises(ptt_bots):
@@ -38,7 +39,7 @@ def test_bucket_on_moderated_board(ptt_bots):
     if not config.MOD_BOARD:
         pytest.skip('MOD_BOARD env var not set')
     for ptt_bot in ptt_bots:
-        if ptt_bot.host != PyPtt.HOST.PTT1:
+        if not util.is_primary_host(ptt_bot, ptt_bots):
             continue
         try:
             ptt_bot.bucket(

{pyptt-2.1.3 → pyptt-2.1.4}/tests/test_del_post.py

@@ -5,6 +5,7 @@ import pytest
 
 import PyPtt
 from tests import config
+from tests import util
 
 
 def test_del_own_post(ptt_bots):
@@ -25,6 +26,8 @@ def test_del_own_post(ptt_bots):
 
         # 2. Verify we found our post
         for i in range(5):
+            if newest_index - i <= 0:
+                continue
             post_data = ptt_bot.get_post('Test', index=newest_index - i)
 
             if post_data['author'].startswith(ptt_bot.ptt_id):
@@ -36,13 +39,24 @@ def test_del_own_post(ptt_bots):
         # 3. Delete the post
 
         for i in range(5):  # Retry up to 3 times in case of transient issues
+            if newest_index - i <= 0:
+                continue
             try:
                 ptt_bot.del_post(board='Test', index=newest_index - i)
             except PyPtt.exceptions.NoPermission:
                 pass
 
         for i in range(5):
-            deleted_post_data = ptt_bot.get_post('Test', index=newest_index - i)
+            if newest_index - i <= 0:
+                continue
+            try:
+                deleted_post_data = ptt_bot.get_post('Test', index=newest_index - i)
+            except PyPtt.exceptions.ParameterError:
+                # On a small local board, deleting every remaining post can
+                # shrink the board's live index range out from under this
+                # stale `newest_index`; an out-of-range index unambiguously
+                # means the post is gone, which is what this loop checks for.
+                continue
 
             print(json.dumps(deleted_post_data, ensure_ascii=False, indent=2))
 
@@ -72,6 +86,8 @@ def test_del_other_post_permission_error(ptt_bots):
         target_index = -1
         for i in range(10):  # Check the last 10 posts
             index_to_check = newest_index - i
+            if index_to_check <= 0:
+                continue
             try:
                 post = ptt_bot.get_post(board, index=index_to_check, query=True)
                 if post[PyPtt.PostField.post_status] == PyPtt.PostStatus.EXISTS and not post['author'].startswith(
@@ -101,6 +117,8 @@ def test_del_own_post_with_reason_raises(ptt_bots):
         newest_index = ptt_bot.get_newest_index(PyPtt.NewIndex.BOARD, board='Test')
         index = -1
         for i in range(5):
+            if newest_index - i <= 0:
+                continue
             post_data = ptt_bot.get_post('Test', index=newest_index - i)
             if post_data['author'].startswith(ptt_bot.ptt_id) and \
                     post_data['title'] == f"[測試] {post_title}":
@@ -122,8 +140,12 @@ def test_del_other_post_with_reason_as_moderator(ptt_bots):
     if not config.MOD_BOARD:
         pytest.skip('MOD_BOARD env var not set')
     for ptt_bot in ptt_bots:
-        if ptt_bot.host != PyPtt.HOST.PTT1:
-            continue  # MOD_BOARD is a PTT1 board
+        if not util.is_primary_host(ptt_bot, ptt_bots):
+            continue  # MOD_BOARD is moderated by the primary bot
+
+        if ptt_bot.host == PyPtt.HOST.LOCALHOST:
+            pytest.skip('local imageptt hard-deletes and reindexes moderator '
+                        'posts, leaving no DELETED_BY_MODERATOR tombstone to read back')
 
         board = config.MOD_BOARD
         newest_index = ptt_bot.get_newest_index(PyPtt.NewIndex.BOARD, board=board)

{pyptt-2.1.3 → pyptt-2.1.4}/tests/test_get_newest_index.py

@@ -20,6 +20,15 @@ PTT2_BOARD_CASES = [
     ('PttSuggest', PyPtt.SearchType.KEYWORD, '[問題]'),
 ]
 
+# The PTT1/PTT2 cases above search real, host-specific historical posts and
+# boards that don't exist on a local imageptt container. `Python` is seeded
+# with at least one post by scripts/bootstrap_local_pttbbs.py and — unlike
+# `Test` — no other test in the suite deletes from it, so its post count
+# only ever grows across a full-suite run.
+LOCALHOST_BOARD_CASES = [
+    ('Python', None, None),
+]
+
 def test_get_mail_index(ptt_bots):
     """Tests getting the newest mail index."""
     for ptt_bot in ptt_bots:
@@ -30,7 +39,9 @@ def test_get_mail_index(ptt_bots):
 def test_get_board_index(ptt_bots):
     """Tests getting the newest board index on PTT2 with various search parameters."""
     for ptt_bot in ptt_bots:
-        if ptt_bot.config.host == PyPtt.HOST.PTT1:
+        if ptt_bot.config.host == PyPtt.HOST.LOCALHOST:
+            test_params = LOCALHOST_BOARD_CASES
+        elif ptt_bot.config.host == PyPtt.HOST.PTT1:
             test_params = PTT1_BOARD_CASES
         else:
             test_params = PTT2_BOARD_CASES

{pyptt-2.1.3 → pyptt-2.1.4}/tests/test_get_waterball.py

@@ -7,9 +7,16 @@ try:
 except KeyError:
     import config
 
+import os
+
+# ponytail: PTT_HOST=LOCALHOST points at a local imageptt docker container
+# instead of the real PTT1 host; unset keeps the status quo.
+_use_localhost = os.environ.get('PTT_HOST') == 'LOCALHOST'
+
 
 def test_get_waterball():
     ptt1_bot = PyPtt.API(
+        host=PyPtt.HOST.LOCALHOST if _use_localhost else PyPtt.HOST.PTT1,
     )
     ptt1_bot.login(ptt_id=config.PTT1_ID, ptt_pw=config.PTT1_PW, kick_other_session=True)
 

{pyptt-2.1.3 → pyptt-2.1.4}/tests/test_give_money.py

@@ -12,6 +12,11 @@ def test_give_money(ptt_bots):
         # PTT2 test host does not support giving money.
         if ptt_bot.host == PyPtt.HOST.PTT2:
             continue
+        # Can't give money to yourself — under LOCALHOST both bots share the
+        # same .host value, so the PTT2 skip above doesn't disambiguate them,
+        # and TEST_USER may legitimately be the PTT2 account's own ptt_id.
+        if ptt_bot.ptt_id.lower() == recipient_id.lower():
+            continue
 
         try:
             # This call should not raise an exception on success

{pyptt-2.1.3 → pyptt-2.1.4}/tests/test_mark_post.py

@@ -13,6 +13,7 @@ import pytest
 import PyPtt
 from PyPtt import PostField, NewIndex
 from tests import config
+from tests import util
 
 
 def _post_and_get_aid(ptt_bot, board: str) -> str:
@@ -39,8 +40,8 @@ def test_mark_post_on_moderated_board(ptt_bots):
     if not config.MOD_BOARD:
         pytest.skip('MOD_BOARD env var not set')
     for ptt_bot in ptt_bots:
-        if ptt_bot.host != PyPtt.HOST.PTT1:
-            continue  # MOD_BOARD is a PTT1 board
+        if not util.is_primary_host(ptt_bot, ptt_bots):
+            continue  # MOD_BOARD is moderated by the primary bot
         aid = _post_and_get_aid(ptt_bot, board=config.MOD_BOARD)
         try:
             ptt_bot.mark_post(

{pyptt-2.1.3 → pyptt-2.1.4}/tests/test_service.py

@@ -1,3 +1,5 @@
+import os
+
 import pytest
 import PyPtt
 import threading
@@ -5,6 +7,10 @@ import time
 from PyPtt import Service, PostField
 from tests import config # Assuming config.py has PTT1_ID and PTT1_PW
 
+# ponytail: PTT_HOST=LOCALHOST points at a local imageptt docker container
+# instead of the real PTT1 host; unset keeps the status quo.
+_use_localhost = os.environ.get('PTT_HOST') == 'LOCALHOST'
+
 class TestCallInterval:
     """Tests for call_interval feature (no network required)."""
 
@@ -56,7 +62,7 @@ class TestCallInterval:
 def service_instance():
     import time
 
-    pyptt_init_config = {}
+    pyptt_init_config = {'host': PyPtt.HOST.LOCALHOST} if _use_localhost else {}
     service = Service(pyptt_init_config)
 
     max_retries = 3

{pyptt-2.1.3 → pyptt-2.1.4}/tests/test_set_board_title.py

@@ -16,6 +16,7 @@ import pytest
 
 import PyPtt
 from tests import config
+from tests import util
 
 
 def test_a_set_board_title_without_moderator_perm_raises(ptt_bots):
@@ -36,7 +37,7 @@ def test_b_set_board_title_on_moderated_board(ptt_bots):
     if not config.MOD_BOARD:
         pytest.skip('MOD_BOARD env var not set')
     for ptt_bot in ptt_bots:
-        if ptt_bot.host != PyPtt.HOST.PTT1:
+        if not util.is_primary_host(ptt_bot, ptt_bots):
             continue
         info = ptt_bot.get_board_info(board=config.MOD_BOARD)
         original = info[PyPtt.BoardField.mandarin_des]

pyptt-2.1.3/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEkOJyMNiLY15Dbj6KQAQzcL8VCnyWHTZRAtIku05VDZoAoGCCqGSM49
-AwEHoUQDQgAEKUSVL5IptOLhRvvjbwASpbMm2u9g5bB+JzwZFipu7YcP/M3O/hdn
-itOTx/TQ1WUZzOO1K8VVP+PiJ848Gf7oXQ==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6DCCAY8CFBQB2jo2W/VcD/OwELD8q619nPFLMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA2MjkxMzI5MjNaFw0zNjA2MjYxMzI5
-MjNaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABClElS+SKbTi4Ub7428AEqWzJtrvYOWwfic8GRYqbu2HD/zNzv4XZ4rT
-k8f00NVlGczjtSvFVT/j4ifOPBn+6F0wCgYIKoZIzj0EAwIDRwAwRAIgXp4Ylzan
-xWWkNTM2MrkPDIy06zA6vLWkKaXNaTRbc+8CICnfggxFK7IrkX5Z7ZOstjCaO+kd
-/xwJcAEv99IpTAr/
------END CERTIFICATE-----
-"""