MainShortcuts2 2.7.4__tar.gz → 2.8.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/PKG-INFO +2 -6
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/pyproject.toml +2 -2
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/_module_info.py +1 -1
- mainshortcuts2-2.8.1/src/MainShortcuts2/_ms2dat_auto.py +28 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/api/github.py +439 -439
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/core.py +16 -5
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ex/aiohttp_ex/web/__init__.py +192 -103
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ex/aiohttp_ex/web/__main__.py +56 -56
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ex/pathlib_ex.py +26 -9
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ex/urlparse_ex.py +24 -24
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/java_ext/__init__.py +339 -339
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/java_ext/ms2ext.py +304 -304
- mainshortcuts2-2.8.1/src/MainShortcuts2/ms2dat1.py +549 -0
- mainshortcuts2-2.8.1/src/MainShortcuts2/sql/_sql_base.py +352 -0
- mainshortcuts2-2.8.1/src/MainShortcuts2/sql/mysql.py +106 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/sql/postgresql.py +59 -48
- mainshortcuts2-2.8.1/src/MainShortcuts2/sql/sqlite.py +113 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/utils.py +86 -0
- mainshortcuts2-2.7.4/src/MainShortcuts2/sql/_sql_base.py +0 -237
- mainshortcuts2-2.7.4/src/MainShortcuts2/sql/sqlite.py +0 -103
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/README.md +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/__init__.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/__main__.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/_any2json_regs.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/_ms2app_regs.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/advanced.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/any2json.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/api/base.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/api/gigachat.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/api/russian_trusted_root_ca_pem.crt +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/api/russian_trusted_sub_ca_pem.crt +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/api/webdav.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/cfg.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/core_config.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/dict.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/dir.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ex/__init__.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ex/datetime_ex.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ex/pil_ex.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ex/psutil_ex.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ex/sqlite_ex.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/file.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/gui_scripts/__init__.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/gui_scripts/ms2_hash_gen.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/gui_scripts/utils.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/json.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/linux.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/list.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ms2app.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/ms2hash.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/path.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/proc.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/regex.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/special_chars.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/str.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/term.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/types.py +0 -0
- {mainshortcuts2-2.7.4 → mainshortcuts2-2.8.1}/src/MainShortcuts2/win.py +0 -0
|
@@ -1,15 +1,11 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: MainShortcuts2
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.8.1
|
|
4
4
|
Summary: Сокращение и улучшение функций + консольные утилиты
|
|
5
5
|
Author: MainPlay TG
|
|
6
6
|
Author-email: xbox.roman6666666666@gmail.com
|
|
7
|
-
Requires-Python: >=3.
|
|
7
|
+
Requires-Python: >=3.10,<4.0
|
|
8
8
|
Classifier: Programming Language :: Python :: 3
|
|
9
|
-
Classifier: Programming Language :: Python :: 3.6
|
|
10
|
-
Classifier: Programming Language :: Python :: 3.7
|
|
11
|
-
Classifier: Programming Language :: Python :: 3.8
|
|
12
|
-
Classifier: Programming Language :: Python :: 3.9
|
|
13
9
|
Classifier: Programming Language :: Python :: 3.10
|
|
14
10
|
Classifier: Programming Language :: Python :: 3.11
|
|
15
11
|
Classifier: Programming Language :: Python :: 3.12
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
[tool.poetry]
|
|
2
|
-
version = "2.
|
|
2
|
+
version = "2.8.1"
|
|
3
3
|
name = "MainShortcuts2"
|
|
4
4
|
description = "Сокращение и улучшение функций + консольные утилиты"
|
|
5
5
|
authors = ["MainPlay TG <xbox.roman6666666666@gmail.com>"]
|
|
@@ -22,7 +22,7 @@ nginx-reload = "MainShortcuts2.__main__:nginx_reload"
|
|
|
22
22
|
nginx-restart = "MainShortcuts2.__main__:nginx_restart"
|
|
23
23
|
|
|
24
24
|
[tool.poetry.dependencies]
|
|
25
|
-
python = "^3.
|
|
25
|
+
python = "^3.10"
|
|
26
26
|
|
|
27
27
|
[build-system]
|
|
28
28
|
build-backend = "poetry.core.masonry.api"
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
name = 'mainshortcuts2'
|
|
2
|
-
version = '2.
|
|
2
|
+
version = '2.8.1'
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import typing
|
|
2
|
+
from . import ms2dat1
|
|
3
|
+
from io import BytesIO
|
|
4
|
+
# Использовать последнюю версию для сохранения
|
|
5
|
+
dump = ms2dat1.dump
|
|
6
|
+
dumps = ms2dat1.dumps
|
|
7
|
+
write_file = ms2dat1.write_file
|
|
8
|
+
# Авто определение версии при загрузке
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
def load(file: typing.BinaryIO, **kw):
|
|
12
|
+
"""Загрузить объект из IO"""
|
|
13
|
+
header = ms2dat1.FileHeader.from_file(file)
|
|
14
|
+
if header.version == 1:
|
|
15
|
+
return ms2dat1.load(file, _h=header, **kw)
|
|
16
|
+
raise Exception(f"Unsupported version {header.version}")
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
def loads(data: bytes, **kw):
|
|
20
|
+
"""Загрузить объект из `bytes`"""
|
|
21
|
+
with BytesIO(data) as f:
|
|
22
|
+
return load(f, **kw)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
def read_file(path, **kw):
|
|
26
|
+
"""Загрузить объект из локального файла"""
|
|
27
|
+
with open(path, "rb") as f:
|
|
28
|
+
return load(f, **kw)
|