MainShortcuts2 2.4.8__tar.gz → 2.4.9__tar.gz

{mainshortcuts2-2.4.8 → mainshortcuts2-2.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MainShortcuts2
-Version: 2.4.8
+Version: 2.4.9
 Summary: Сокращение и улучшение функций + консольные утилиты
 Home-page: https://github.com/MainPlay-TG/MainShortcuts2.py
 Author: MainPlay TG

{mainshortcuts2-2.4.8 → mainshortcuts2-2.4.9}/pyproject.toml

@@ -1,5 +1,5 @@
 [tool.poetry]
-version = "2.4.8"
+version = "2.4.9"
 name = "MainShortcuts2"
 description = "Сокращение и улучшение функций + консольные утилиты"
 authors = [ "MainPlay TG <xbox.roman6666666666@gmail.com>",]

{mainshortcuts2-2.4.8 → mainshortcuts2-2.4.9}/src/MainShortcuts2/_module_info.py

@@ -1,2 +1,2 @@
 name = "MainShortcuts2"
-version = "2.4.8"
+version = "2.4.9"

{mainshortcuts2-2.4.8 → mainshortcuts2-2.4.9}/src/MainShortcuts2/api/base.py

@@ -1,17 +1,20 @@
 import requests
-from base64 import b64encode
+import requests.auth
+USER_AGENTS: dict[str, str] = {}
+USER_AGENTS["Android"] = "Mozilla/5.0 (Linux; Android 13; K) Chrome/128.0.6613.146"
+USER_AGENTS["Android13"] = "Mozilla/5.0 (Linux; Android 13; K) Chrome/128.0.6613.146"
 
 
-def auth_basic(username: str, password: str, *, client: "BaseClient" = None):
+def auth_basic(username: str, password: str, *, client: "BaseClient" = None) -> str:
   """Настроить базовую авторизацию для клиента"""
   if username is None:
     username = client.username
   if password is None:
     password = client.password
-  header = "Basic " + b64encode((username + ":" + password).encode("utf-8")).decode("utf-8")
-  if client is None:
-    return header
-  client._headers["Authorization"] = header
+  header = requests.auth._basic_auth_str(username, password)
+  if not client is None:
+    client._headers["Authorization"] = header
+  return header
 
 
 class BaseClient:

{mainshortcuts2-2.4.8 → mainshortcuts2-2.4.9}/src/MainShortcuts2/utils.py

@@ -580,5 +580,75 @@ def is_instance_of_all(obj, *classes: type) -> bool:
   return True
 
 
+def restore_deprecated(force: bool = False):
+  """Восстановить устаревшие функции"""
+  restored = []
+
+  def setmethod(cls, name):
+    def deco(func):
+      if force or not hasattr(cls, name):
+        try:
+          setattr(cls, name, func)
+          restored.append((cls, name, func))
+        except Exception:
+          pass
+      return func
+    return deco
+  if "datetime" in sys.modules:
+    from datetime import datetime
+
+    @setmethod(datetime, "utcnow")
+    def utcnow():
+      return datetime.now(datetime.UTC)
+  if "locale" in sys.modules:
+    import locale
+
+    @setmethod(locale, "resetlocale")
+    def resetlocale(category=locale.LC_ALL):
+      locale.setlocale(category, "")
+  return restored
+
+
+def main_func(_name_: str, exit: bool = True):
+  def deco(func):
+    if _name_ == "__main__":
+      result = func()
+      if exit:
+        if isinstance(result, int):
+          sys.exit(result)
+        sys.exit()
+    return func
+  return deco
+
+
+class decorators:
+  def __init__(self):
+    raise NotImplementedError()
+
+  @staticmethod
+  def append(obj: list):
+    """`obj.append(func)`"""
+    def deco(func):
+      obj.append(func)
+      return func
+    return deco
+
+  @staticmethod
+  def setattr(obj: type, name):
+    """`setattr(obj,name,func)`"""
+    def deco(func):
+      setattr(obj, name, func)
+      return func
+    return deco
+
+  @staticmethod
+  def setitem(obj: dict | list, index):
+    """`obj[index]=func`"""
+    def deco(func):
+      obj[index] = func
+      return func
+    return deco
+
+
 download_file = sync_download_file
 request = sync_request