re-common 10.0.22__py3-none-any.whl → 10.0.24__py3-none-any.whl

re_common/baselibrary/readconfig/toml_config.py

@@ -1,49 +1,49 @@
-import os
-
-import toml
-
-
-class TomlConfig(object):
-    """
-    toml 格式的配置文件
-    """
-
-    def __init__(self, configfile=""):
-        # 配置文件路径
-        self.configfile = configfile
-        self.content = None
-
-    def set_config_path(self, configfile):
-        self.configfile = configfile
-        return self
-
-    def read_file_remove_bom(self):
-        if not os.path.exists(self.configfile):
-            print(self.configfile + ' not found')
-            raise FileNotFoundError("配置文件不存在")
-        with open(self.configfile, mode='rb') as f:
-            content = f.read()
-        if content.startswith(b'\xef\xbb\xbf'):  # 去掉 utf8 bom 头
-            content = content[3:]
-        self.content = content
-        return self
-
-    def get_dicts(self, encoding="utf8"):
-        """
-        加载后是一个doc的形式
-        :param content:
-        :param encoding:
-        :return:
-        """
-        dic = toml.loads(self.content.decode(encoding))
-        return dic
-
-    def get_config_dicts(self, encoding="utf8"):
-        """
-        加载后是一个doc的形式
-        :param content:
-        :param encoding:
-        :return:
-        """
-        self.read_file_remove_bom()
-        return self.get_dicts()
+import os
+
+import toml
+
+
+class TomlConfig(object):
+    """
+    toml 格式的配置文件
+    """
+
+    def __init__(self, configfile=""):
+        # 配置文件路径
+        self.configfile = configfile
+        self.content = None
+
+    def set_config_path(self, configfile):
+        self.configfile = configfile
+        return self
+
+    def read_file_remove_bom(self):
+        if not os.path.exists(self.configfile):
+            print(self.configfile + ' not found')
+            raise FileNotFoundError("配置文件不存在")
+        with open(self.configfile, mode='rb') as f:
+            content = f.read()
+        if content.startswith(b'\xef\xbb\xbf'):  # 去掉 utf8 bom 头
+            content = content[3:]
+        self.content = content
+        return self
+
+    def get_dicts(self, encoding="utf8"):
+        """
+        加载后是一个doc的形式
+        :param content:
+        :param encoding:
+        :return:
+        """
+        dic = toml.loads(self.content.decode(encoding))
+        return dic
+
+    def get_config_dicts(self, encoding="utf8"):
+        """
+        加载后是一个doc的形式
+        :param content:
+        :param encoding:
+        :return:
+        """
+        self.read_file_remove_bom()
+        return self.get_dicts()

re_common/baselibrary/temporary/envdata.py

@@ -1,36 +1,36 @@
-from faker import Faker
-from faker.providers import internet
-
-fake = Faker()
-# 生成名字
-print(fake.name())
-# 生成地址
-print(fake.address())
-# 生成国家
-print(fake.country())
-# 生成省份
-print(fake.province())
-# 生成市　县
-print(fake.city_suffix())
-# 生成区
-print(fake.district())
-# 生成街道名
-print(fake.street_name())
-# 生成街　路
-print(fake.street_suffix())
-#　生成０～９　随机数
-print(fake.random_digit())
-# 生成随机字母
-print(fake.random_element())
-# 生成随机颜色名
-print(fake.color_name())
-# 生成随机日期
-print(fake.date())
-# 生成一段文字
-print(fake.text())
-
-fake.add_provider(internet)
-
-# 生成ipv4
-print(fake.ipv4_private())
-
+from faker import Faker
+from faker.providers import internet
+
+fake = Faker()
+# 生成名字
+print(fake.name())
+# 生成地址
+print(fake.address())
+# 生成国家
+print(fake.country())
+# 生成省份
+print(fake.province())
+# 生成市　县
+print(fake.city_suffix())
+# 生成区
+print(fake.district())
+# 生成街道名
+print(fake.street_name())
+# 生成街　路
+print(fake.street_suffix())
+#　生成０～９　随机数
+print(fake.random_digit())
+# 生成随机字母
+print(fake.random_element())
+# 生成随机颜色名
+print(fake.color_name())
+# 生成随机日期
+print(fake.date())
+# 生成一段文字
+print(fake.text())
+
+fake.add_provider(internet)
+
+# 生成ipv4
+print(fake.ipv4_private())
+

re_common/baselibrary/tools/all_requests/aiohttp_request.py

@@ -1,118 +1,118 @@
-import aiohttp
-from aiohttp_socks import ProxyConnector
-from re_common.baselibrary.tools.all_requests.mrequest import MRequest
-from re_common.baselibrary.utils.baseurl import BaseUrl
-from re_common.baselibrary.utils.core.mdeprecated import aiohttp_try_except
-from re_common.baselibrary.utils.core.mlamada import html_strip
-from re_common.baselibrary.utils.core.requests_core import set_proxy_aio
-
-
-async def default_resp_hook(self, resp):
-    pass
-
-
-class AioHttpRequest(MRequest):
-
-    def __init__(self, logger=None):
-        if logger is None:
-            from re_common.baselibrary import MLogger
-            logger = MLogger().streamlogger
-        super().__init__(logger=logger)
-        self.kwargs = {}
-        self.client_session_kwargs = {}
-        self.resp_hook = default_resp_hook
-        # 预留一个字典可以向里面传入其他信息
-        self.other_dicts = {}
-
-    def set_resp_hook(self, resp_hook_func):
-        self.resp_hook = resp_hook_func
-        return self
-
-    def builder(self):
-        if self.refer:
-            self.header["refer"] = self.refer
-        self.kwargs["headers"] = self.header
-        # 比如在请求之前调用API请求COOKIE,这时这个调用就没得 代理
-        self.client_session_kwargs["skip_auto_headers"] = self.skip_auto_headers
-        if self.proxy:
-            if "socks" in self.proxy:
-                if self.force_close == "true":
-                    connector = ProxyConnector.from_url(self.proxy, force_close=True)
-                else:
-                    connector = ProxyConnector.from_url(self.proxy)
-                self.client_session_kwargs["connector"] = connector
-                self.sn = aiohttp.ClientSession(**self.client_session_kwargs)
-            else:
-                self.kwargs["proxy"] = set_proxy_aio(self.proxy)
-        else:
-            self.kwargs["proxy"] = set_proxy_aio(self.proxy)
-        if self.force_close == "true" and "connector" not in self.client_session_kwargs.keys():
-            connector = aiohttp.TCPConnector(force_close=True)
-            self.client_session_kwargs["connector"] = connector
-        if BaseUrl.urlScheme(self.url) == "https":
-            self.kwargs["verify_ssl"] = False
-        self.kwargs["timeout"] = self.timeout
-        self.kwargs["allow_redirects"] = self.allow_redirects
-        self.kwargs["params"] = self.params
-        self.kwargs["cookies"] = self.cookies
-        return self
-
-    async def set_resp(self, resp):
-        self.resp = resp
-        self.set_status_code(resp.status)
-        # 有时候302时我们去获取html会报错
-        if self.allow_resp_text:
-            if self.resp_encoding is not None:
-                self.html = await resp.text(encoding=self.resp_encoding, errors=self.resp_errors)
-            else:
-                self.html = await resp.text(errors=self.resp_errors)
-            self.html = html_strip(self.html)
-        else:
-            self.html = None
-        if self.allow_resp_bytes:
-            self.html_bytes = await resp.content.read()
-        else:
-            self.html_bytes = None
-
-    @aiohttp_try_except
-    async def get(self):
-        if self.sn is None:
-            # skip_auto_headers 用法: 不对列表内的对应参数进行自动生成
-            self.sn = aiohttp.ClientSession(**self.client_session_kwargs)
-        async with self.sn:
-            async with self.sn.get(url=self.url, **self.kwargs) as resp:
-                await self.set_resp(resp)
-                await self.resp_hook(self, resp)
-        return True, {"code": self.status_code, "msg": ""}
-
-    @aiohttp_try_except
-    async def post(self):
-        if self.sn is None:
-            self.sn = aiohttp.ClientSession(**self.client_session_kwargs)
-        async with self.sn:
-            async with self.sn.post(url=self.url, data=self.data, **self.kwargs) as resp:
-                await self.set_resp(resp)
-                await self.resp_hook(self, resp)
-        return True, {"code": self.status_code, "msg": ""}
-
-    def all_middlerwares(self, dicts):
-        bools = True
-        for item in self.middler_list:
-            bools, dicts = item()
-            if not bools:
-                return bools, dicts
-        return bools, dicts
-
-    async def run(self, moths="get"):
-        self.builder()
-        self.on_request_start()
-        if moths == MRequest.GET:
-            bools, dicts = await self.get()
-        elif moths == MRequest.POST:
-            bools, dicts = await self.post()
-        else:
-            bools, dicts = False, {}
-        self.on_request_end()
-        if bools:
-            return self.all_middlerwares(dicts)
-        return bools, dicts
+import aiohttp
+from aiohttp_socks import ProxyConnector
+from re_common.baselibrary.tools.all_requests.mrequest import MRequest
+from re_common.baselibrary.utils.baseurl import BaseUrl
+from re_common.baselibrary.utils.core.mdeprecated import aiohttp_try_except
+from re_common.baselibrary.utils.core.mlamada import html_strip
+from re_common.baselibrary.utils.core.requests_core import set_proxy_aio
+
+
+async def default_resp_hook(self, resp):
+    pass
+
+
+class AioHttpRequest(MRequest):
+
+    def __init__(self, logger=None):
+        if logger is None:
+            from re_common.baselibrary import MLogger
+            logger = MLogger().streamlogger
+        super().__init__(logger=logger)
+        self.kwargs = {}
+        self.client_session_kwargs = {}
+        self.resp_hook = default_resp_hook
+        # 预留一个字典可以向里面传入其他信息
+        self.other_dicts = {}
+
+    def set_resp_hook(self, resp_hook_func):
+        self.resp_hook = resp_hook_func
+        return self
+
+    def builder(self):
+        if self.refer:
+            self.header["refer"] = self.refer
+        self.kwargs["headers"] = self.header
+        # 比如在请求之前调用API请求COOKIE,这时这个调用就没得 代理
+        self.client_session_kwargs["skip_auto_headers"] = self.skip_auto_headers
+        if self.proxy:
+            if "socks" in self.proxy:
+                if self.force_close == "true":
+                    connector = ProxyConnector.from_url(self.proxy, force_close=True)
+                else:
+                    connector = ProxyConnector.from_url(self.proxy)
+                self.client_session_kwargs["connector"] = connector
+                self.sn = aiohttp.ClientSession(**self.client_session_kwargs)
+            else:
+                self.kwargs["proxy"] = set_proxy_aio(self.proxy)
+        else:
+            self.kwargs["proxy"] = set_proxy_aio(self.proxy)
+        if self.force_close == "true" and "connector" not in self.client_session_kwargs.keys():
+            connector = aiohttp.TCPConnector(force_close=True)
+            self.client_session_kwargs["connector"] = connector
+        if BaseUrl.urlScheme(self.url) == "https":
+            self.kwargs["verify_ssl"] = False
+        self.kwargs["timeout"] = self.timeout
+        self.kwargs["allow_redirects"] = self.allow_redirects
+        self.kwargs["params"] = self.params
+        self.kwargs["cookies"] = self.cookies
+        return self
+
+    async def set_resp(self, resp):
+        self.resp = resp
+        self.set_status_code(resp.status)
+        # 有时候302时我们去获取html会报错
+        if self.allow_resp_text:
+            if self.resp_encoding is not None:
+                self.html = await resp.text(encoding=self.resp_encoding, errors=self.resp_errors)
+            else:
+                self.html = await resp.text(errors=self.resp_errors)
+            self.html = html_strip(self.html)
+        else:
+            self.html = None
+        if self.allow_resp_bytes:
+            self.html_bytes = await resp.content.read()
+        else:
+            self.html_bytes = None
+
+    @aiohttp_try_except
+    async def get(self):
+        if self.sn is None:
+            # skip_auto_headers 用法: 不对列表内的对应参数进行自动生成
+            self.sn = aiohttp.ClientSession(**self.client_session_kwargs)
+        async with self.sn:
+            async with self.sn.get(url=self.url, **self.kwargs) as resp:
+                await self.set_resp(resp)
+                await self.resp_hook(self, resp)
+        return True, {"code": self.status_code, "msg": ""}
+
+    @aiohttp_try_except
+    async def post(self):
+        if self.sn is None:
+            self.sn = aiohttp.ClientSession(**self.client_session_kwargs)
+        async with self.sn:
+            async with self.sn.post(url=self.url, data=self.data, **self.kwargs) as resp:
+                await self.set_resp(resp)
+                await self.resp_hook(self, resp)
+        return True, {"code": self.status_code, "msg": ""}
+
+    def all_middlerwares(self, dicts):
+        bools = True
+        for item in self.middler_list:
+            bools, dicts = item()
+            if not bools:
+                return bools, dicts
+        return bools, dicts
+
+    async def run(self, moths="get"):
+        self.builder()
+        self.on_request_start()
+        if moths == MRequest.GET:
+            bools, dicts = await self.get()
+        elif moths == MRequest.POST:
+            bools, dicts = await self.post()
+        else:
+            bools, dicts = False, {}
+        self.on_request_end()
+        if bools:
+            return self.all_middlerwares(dicts)
+        return bools, dicts

re_common/baselibrary/tools/all_requests/httpx_requet.py

@@ -1,102 +1,102 @@
-import aiohttp
-import httpx
-from re_common.baselibrary.tools.all_requests.mrequest import MRequest
-from re_common.baselibrary.utils.baseurl import BaseUrl
-from re_common.baselibrary.utils.core.mdeprecated import aiohttp_try_except
-from re_common.baselibrary.utils.core.mlamada import html_strip
-from re_common.baselibrary.utils.core.requests_core import set_proxy_aio, set_proxy_httpx
-
-
-async def default_resp_hook(self, resp):
-    pass
-
-
-class HttpxRequest(MRequest):
-
-    def __init__(self, logger=None):
-        if logger is None:
-            from re_common.baselibrary import MLogger
-            logger = MLogger().streamlogger
-        super().__init__(logger=logger)
-        self.kwargs = {}
-        self.client_session_kwargs = {}
-        self.resp_hook = default_resp_hook
-        # 预留一个字典可以向里面传入其他信息
-        self.other_dicts = {}
-
-    def set_resp_hook(self, resp_hook_func):
-        self.resp_hook = resp_hook_func
-        return self
-
-    def builder(self):
-        self.kwargs["params"] = self.params
-        if self.refer:
-            self.header["refer"] = self.refer
-        self.kwargs["headers"] = self.header
-        self.kwargs["cookies"] = self.cookies
-        self.kwargs["follow_redirects"] = self.allow_redirects
-        self.kwargs["timeout"] = self.timeout
-        if self.proxy:
-            self.client_session_kwargs["proxies"] = set_proxy_httpx(self.proxy)
-        if BaseUrl.urlScheme(self.url) == "https":
-            self.client_session_kwargs["verify"] = False
-        return self
-
-    def set_resp(self, resp):
-        self.resp = resp
-        self.set_status_code(resp.status_code)
-        # 有时候302时我们去获取html会报错
-        if self.allow_resp_text:
-            if self.resp_encoding:
-                resp.encoding = self.resp_encoding
-            self.html = resp.text
-            self.html = html_strip(self.html)
-        else:
-            self.html = None
-        if self.allow_resp_bytes:
-            self.html_bytes = resp.content
-        else:
-            self.html_bytes = None
-
-    @aiohttp_try_except
-    async def get(self):
-        if self.sn is None:
-            # skip_auto_headers 用法: 不对列表内的对应参数进行自动生成
-            self.sn = httpx.AsyncClient(**self.client_session_kwargs)
-        async with self.sn:
-            resp = await self.sn.get(url=self.url, **self.kwargs)
-            self.set_resp(resp)
-            await self.resp_hook(self, resp)
-        return True, {"code": self.status_code, "msg": ""}
-
-    @aiohttp_try_except
-    async def post(self):
-        if self.sn is None:
-            self.sn = httpx.AsyncClient(**self.client_session_kwargs)
-        async with self.sn:
-            resp = await self.sn.post(url=self.url, data=self.data, **self.kwargs)
-            self.set_resp(resp)
-            await self.resp_hook(self, resp)
-        return True, {"code": self.status_code, "msg": ""}
-
-    def all_middlerwares(self, dicts):
-        bools = True
-        for item in self.middler_list:
-            bools, dicts = item()
-            if not bools:
-                return bools, dicts
-        return bools, dicts
-
-    async def run(self, moths="get"):
-        self.builder()
-        self.on_request_start()
-        if moths == MRequest.GET:
-            bools, dicts = await self.get()
-        elif moths == MRequest.POST:
-            bools, dicts = await self.post()
-        else:
-            bools, dicts = False, {}
-        self.on_request_end()
-        if bools:
-            return self.all_middlerwares(dicts)
-        return bools, dicts
+import aiohttp
+import httpx
+from re_common.baselibrary.tools.all_requests.mrequest import MRequest
+from re_common.baselibrary.utils.baseurl import BaseUrl
+from re_common.baselibrary.utils.core.mdeprecated import aiohttp_try_except
+from re_common.baselibrary.utils.core.mlamada import html_strip
+from re_common.baselibrary.utils.core.requests_core import set_proxy_aio, set_proxy_httpx
+
+
+async def default_resp_hook(self, resp):
+    pass
+
+
+class HttpxRequest(MRequest):
+
+    def __init__(self, logger=None):
+        if logger is None:
+            from re_common.baselibrary import MLogger
+            logger = MLogger().streamlogger
+        super().__init__(logger=logger)
+        self.kwargs = {}
+        self.client_session_kwargs = {}
+        self.resp_hook = default_resp_hook
+        # 预留一个字典可以向里面传入其他信息
+        self.other_dicts = {}
+
+    def set_resp_hook(self, resp_hook_func):
+        self.resp_hook = resp_hook_func
+        return self
+
+    def builder(self):
+        self.kwargs["params"] = self.params
+        if self.refer:
+            self.header["refer"] = self.refer
+        self.kwargs["headers"] = self.header
+        self.kwargs["cookies"] = self.cookies
+        self.kwargs["follow_redirects"] = self.allow_redirects
+        self.kwargs["timeout"] = self.timeout
+        if self.proxy:
+            self.client_session_kwargs["proxies"] = set_proxy_httpx(self.proxy)
+        if BaseUrl.urlScheme(self.url) == "https":
+            self.client_session_kwargs["verify"] = False
+        return self
+
+    def set_resp(self, resp):
+        self.resp = resp
+        self.set_status_code(resp.status_code)
+        # 有时候302时我们去获取html会报错
+        if self.allow_resp_text:
+            if self.resp_encoding:
+                resp.encoding = self.resp_encoding
+            self.html = resp.text
+            self.html = html_strip(self.html)
+        else:
+            self.html = None
+        if self.allow_resp_bytes:
+            self.html_bytes = resp.content
+        else:
+            self.html_bytes = None
+
+    @aiohttp_try_except
+    async def get(self):
+        if self.sn is None:
+            # skip_auto_headers 用法: 不对列表内的对应参数进行自动生成
+            self.sn = httpx.AsyncClient(**self.client_session_kwargs)
+        async with self.sn:
+            resp = await self.sn.get(url=self.url, **self.kwargs)
+            self.set_resp(resp)
+            await self.resp_hook(self, resp)
+        return True, {"code": self.status_code, "msg": ""}
+
+    @aiohttp_try_except
+    async def post(self):
+        if self.sn is None:
+            self.sn = httpx.AsyncClient(**self.client_session_kwargs)
+        async with self.sn:
+            resp = await self.sn.post(url=self.url, data=self.data, **self.kwargs)
+            self.set_resp(resp)
+            await self.resp_hook(self, resp)
+        return True, {"code": self.status_code, "msg": ""}
+
+    def all_middlerwares(self, dicts):
+        bools = True
+        for item in self.middler_list:
+            bools, dicts = item()
+            if not bools:
+                return bools, dicts
+        return bools, dicts
+
+    async def run(self, moths="get"):
+        self.builder()
+        self.on_request_start()
+        if moths == MRequest.GET:
+            bools, dicts = await self.get()
+        elif moths == MRequest.POST:
+            bools, dicts = await self.post()
+        else:
+            bools, dicts = False, {}
+        self.on_request_end()
+        if bools:
+            return self.all_middlerwares(dicts)
+        return bools, dicts