tweepy-self 1.0.0b2__tar.gz → 1.0.1__tar.gz

{tweepy_self-1.0.0b2 → tweepy_self-1.0.1}/PKG-INFO

@@ -1,13 +1,11 @@
 Metadata-Version: 2.1
 Name: tweepy-self
-Version: 1.0.0b2
+Version: 1.0.1
 Summary: Twitter (selfbot) for Python!
 Author: Alen
 Author-email: alen.kimov@gmail.com
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.11,<4.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: beautifulsoup4 (>=4,<5)
@@ -50,7 +48,7 @@ pip install tweepy-self
 import asyncio
 import twitter
 
-account = twitter.Account("auth_token")
+account = twitter.Account(auth_token="auth_token")
 
 async def main():
     async with twitter.Client(account) as twitter_client:

{tweepy_self-1.0.0b2 → tweepy_self-1.0.1}/README.md

@@ -28,7 +28,7 @@ pip install tweepy-self
 import asyncio
 import twitter
 
-account = twitter.Account("auth_token")
+account = twitter.Account(auth_token="auth_token")
 
 async def main():
     async with twitter.Client(account) as twitter_client:

{tweepy_self-1.0.0b2 → tweepy_self-1.0.1}/pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "tweepy-self"
-version = "1.0.0.b2"
+version = "1.0.1"
 description = "Twitter (selfbot) for Python!"
 authors = ["Alen <alen.kimov@gmail.com>"]
 readme = "README.md"
 packages = [{include = "twitter"}]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.11"
 curl_cffi = {version = "0.6.0b9", allow-prereleases = true}
 python3-capsolver = "^0.9"
 better-proxy = "0.5.0"

{tweepy_self-1.0.0b2 → tweepy_self-1.0.1}/twitter/__init__.py

@@ -6,7 +6,7 @@ A basic wrapper for the Twitter user API.
 """
 
 from .client import Client
-from .account import Account, AccountStatus
+from .account import Account, AccountStatus, load_accounts_from_file, extract_accounts_to_file
 from .models import Tweet, UserData
 from . import errors, utils
 
@@ -16,9 +16,15 @@ __all__ = [
     "AccountStatus",
     "utils",
     "errors",
+    "load_accounts_from_file",
+    "extract_accounts_to_file",
 ]
 
 
 import warnings
 # HACK: Ignore event loop warnings from curl_cffi
 warnings.filterwarnings('ignore', module='curl_cffi')
+
+
+from python3_capsolver.core import config
+config.APP_ID = "6F895B2F-F454-44D1-8FE0-77ACAD3DBDC8"

{tweepy_self-1.0.0b2 → tweepy_self-1.0.1}/twitter/account.py

@@ -1,9 +1,11 @@
+from pathlib import Path
+from typing import Sequence, Iterable
 import enum
 
 from pydantic import BaseModel, Field
 import pyotp
 
-from .utils import hidden_value
+from .utils import hidden_value, load_lines, write_lines
 
 
 class AccountStatus(enum.StrEnum):
@@ -56,3 +58,41 @@ class Account(BaseModel):
             raise ValueError("No key2fa")
 
         return str(pyotp.TOTP(self.key2fa).now())
+
+
+def load_accounts_from_file(
+        filepath: Path | str,
+        *,
+        separator: str = ":",
+        fields: Sequence[str] = ("auth_token", "password", "email", "username"),
+) -> list[Account]:
+    """
+    :param filepath: Путь до файла с данными об аккаунтах.
+    :param separator: Разделитель между данными в строке.
+    :param fields: Кортеж, содержащий имена полей в порядке их появления в строке.
+    :return: Список Twitter аккаунтов.
+    """
+    accounts = []
+    for line in load_lines(filepath):
+        data = dict(zip(fields, line.split(separator)))
+        data.update({key: None for key in data if not data[key]})
+        accounts.append(Account(**data))
+    return accounts
+
+
+def extract_accounts_to_file(
+        filepath: Path | str,
+        accounts: Iterable[Account],
+        *,
+        separator: str = ":",
+        fields: Sequence[str] = ("auth_token", "password", "email", "username"),
+):
+    lines = []
+    for account in accounts:
+        account_data = []
+        for field_name in fields:
+            field = getattr(account, field_name)
+            field = field if field is not None else ""
+            account_data.append(field)
+        lines.append(separator.join(account_data))
+    write_lines(filepath, lines)

{tweepy_self-1.0.0b2 → tweepy_self-1.0.1}/twitter/utils/__init__.py

@@ -7,10 +7,6 @@ from .file import (
     write_json,
     to_json,
 )
-from .accounts import (
-    load_accounts_from_file,
-    extract_accounts_to_file,
-)
 from .html import (
     parse_unlock_html,
     parse_oauth_html,
@@ -31,8 +27,6 @@ __all__ = [
     "write_lines",
     "write_json",
     "to_json",
-    "load_accounts_from_file",
-    "extract_accounts_to_file",
     "parse_unlock_html",
     "parse_oauth_html",
     "remove_at_sign",

tweepy_self-1.0.0b2/twitter/utils/accounts.py

@@ -1,43 +0,0 @@
-from pathlib import Path
-from typing import Sequence, Iterable
-
-from .file import load_lines, write_lines
-from ..account import Account
-
-
-def load_accounts_from_file(
-        filepath: Path | str,
-        *,
-        separator: str = ":",
-        fields: Sequence[str] = ("auth_token", "password", "email", "username"),
-) -> list[Account]:
-    """
-    :param filepath: Путь до файла с данными об аккаунтах.
-    :param separator: Разделитель между данными в строке.
-    :param fields: Кортеж, содержащий имена полей в порядке их появления в строке.
-    :return: Список Twitter аккаунтов.
-    """
-    accounts = []
-    for line in load_lines(filepath):
-        data = dict(zip(fields, line.split(separator)))
-        data.update({key: None for key in data if not data[key]})
-        accounts.append(Account(**data))
-    return accounts
-
-
-def extract_accounts_to_file(
-        filepath: Path | str,
-        accounts: Iterable[Account],
-        *,
-        separator: str = ":",
-        fields: Sequence[str] = ("auth_token", "password", "email", "username"),
-):
-    lines = []
-    for account in accounts:
-        account_data = []
-        for field_name in fields:
-            field = getattr(account, field_name)
-            field = field if field is not None else ""
-            account_data.append(field)
-        lines.append(separator.join(account_data))
-    write_lines(filepath, lines)