PyPtt 2.3.5__tar.gz → 2.3.6__tar.gz

{pyptt-2.3.5 → pyptt-2.3.6}/PKG-INFO

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

{pyptt-2.3.5 → pyptt-2.3.6}/PyPtt/PTT.py

@@ -230,6 +230,7 @@ class API:
 
         Raises:
             LoginError: 登入失敗。
+            TwoFactorAuthRequired: 偵測到兩階段驗證畫面，PyPtt 無法自動完成驗證。
             WrongIDorPassword: 帳號或密碼錯誤。
             OnlySecureConnection: 只能使用安全連線。
             ResetYourContactEmail: 請先至信箱設定連絡信箱。
@@ -242,6 +243,8 @@ class API:
             try:
                 ptt_bot.login(
                     ptt_id='ptt_id', ptt_pw='ptt_pw', kick_other_session=True)
+            except PyPtt.TwoFactorAuthRequired:
+                print('偵測到兩階段驗證，請先手動登入完成驗證')
             except PyPtt.LoginError:
                 print('登入失敗')
             except PyPtt.WrongIDorPassword:

{pyptt-2.3.5 → pyptt-2.3.6}/PyPtt/__init__.py

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

{pyptt-2.3.5 → pyptt-2.3.6}/PyPtt/_api_loginout.py

@@ -97,6 +97,8 @@ def login(api, ptt_id: str, ptt_pw: str, kick_other_session: bool) -> None:
         connect_core.TargetUnit('密碼正確'),
         connect_core.TargetUnit('您想刪除其他重複登入的連線嗎', response=kick_other_login_response),
         connect_core.TargetUnit('◆ 您的註冊申請單尚在處理中', response=command.enter, handler=register_processing),
+        # 需排在「任意鍵」等泛用 catch-all 之前, 否則會被搶先命中而吃不到這條。
+        connect_core.TargetUnit('兩階段', break_detect=True, exceptions_=exceptions.TwoFactorAuthRequired()),
         connect_core.TargetUnit('任意鍵', response=' '),
         connect_core.TargetUnit('正在更新與同步線上使用者及好友名單'),
         connect_core.TargetUnit('【分類看板】', response=command.go_main_menu),

{pyptt-2.3.5 → pyptt-2.3.6}/PyPtt/exceptions.py

@@ -38,6 +38,16 @@ class LoginError(Error):
         return self.message
 
 
+# 繼承 LoginError 以維持既有 `except LoginError` 呼叫端的相容性。
+# PyPtt 不實作 TOTP 自動輸入, 這裡只負責偵測畫面並指路。
+class TwoFactorAuthRequired(LoginError):
+    def __init__(self):
+        self.message = i18n.two_factor_auth_required
+
+    def __str__(self):
+        return self.message
+
+
 class NoFastComment(Error):
     def __init__(self):
         self.message = i18n.no_fast_comment

{pyptt-2.3.5 → pyptt-2.3.6}/PyPtt/lang_en_US.py

@@ -110,6 +110,14 @@ string_data = {
     "success": "Success",
     "title": "Title",
     "transaction_cancelled": "The transaction is cancelled!",
+    "two_factor_auth_required": (
+        "This account has two-factor authentication (2FA) enabled, and PyPtt cannot "
+        "complete the verification automatically. PTT's 2FA can be configured to only "
+        "require verification from new IPs, so logging in again from the same IP will "
+        "skip it. Please first manually log in to PTT from this machine using a regular "
+        "BBS client and complete one 2FA verification; afterwards this machine's IP will "
+        "be considered verified, and you can then log in with PyPtt."
+    ),
     "unregistered_user_cant_use_all_api": "Unregistered UserField Can't Use All API",
     "unregistered_user_cant_use_this_api": "Unregistered UserField Can't Use This API",
     "update_remote_version": "Fetching latest version",

{pyptt-2.3.5 → pyptt-2.3.6}/PyPtt/lang_zh_TW.py

@@ -110,6 +110,12 @@ string_data = {
     "success": "成功",
     "title": "標題",
     "transaction_cancelled": "交易取消!",
+    "two_factor_auth_required": (
+        "此帳號已啟用兩階段驗證(2FA), PyPtt 無法自動完成驗證。"
+        "PTT 的兩階段驗證可設定為「僅新 IP 需要驗證」, 同一 IP 再次登入時會跳過驗證。"
+        "請先在這台機器上使用一般 BBS 客戶端手動登入 PTT 並完成一次兩階段驗證, "
+        "之後這台機器的 IP 即可被視為已驗證, 再用 PyPtt 登入。"
+    ),
     "unregistered_user_cant_use_all_api": "未註冊使用者，將無法使用全部功能",
     "unregistered_user_cant_use_this_api": "未註冊使用者，無法使用此功能",
     "update_remote_version": "確認最新版本",

{pyptt-2.3.5 → pyptt-2.3.6}/PyPtt.egg-info/PKG-INFO

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