re-common 10.0.39__py3-none-any.whl → 10.0.41__py3-none-any.whl

re_common/baselibrary/utils/pipupgrade.py

@@ -1,21 +1,21 @@
-# coding=utf-8
-# pip v10.0.0以上版本需要导入下面的包
-from subprocess import call
-
-from pip._internal.utils.misc import get_installed_distributions
-
-'''
-用于升级python的扩展包一次性升级所有另外提供命令行方式
-pip install pip-review
-pip-review --local --interactive
-
-环境迁移
-pip freeze > requirements.txt
-
-pip uninstall -ry requirements.txt
-
-pip install -r requirements.txt
-'''
-for dist in get_installed_distributions():
-    call("pip install --upgrade " + dist.project_name, shell=True)
-
+# coding=utf-8
+# pip v10.0.0以上版本需要导入下面的包
+from subprocess import call
+
+from pip._internal.utils.misc import get_installed_distributions
+
+'''
+用于升级python的扩展包一次性升级所有另外提供命令行方式
+pip install pip-review
+pip-review --local --interactive
+
+环境迁移
+pip freeze > requirements.txt
+
+pip uninstall -ry requirements.txt
+
+pip install -r requirements.txt
+'''
+for dist in get_installed_distributions():
+    call("pip install --upgrade " + dist.project_name, shell=True)
+

re_common/baselibrary/utils/ringlist.py

@@ -1,85 +1,85 @@
-import random
-
-
-class RingList(object):
-    def __init__(self):
-        """
-        环形列表初始化
-        """
-        self.objlist = list()
-        # 列表中数据总量
-        self.num = 0
-        self.index = 0
-
-    def append(self, p_object):
-        """
-
-        :param p_object: 增加到环形列表的元素
-        :return:
-        """
-        self.num += 1
-        self.objlist.append(p_object)
-
-    def pop(self, index=None):
-        """
-
-        :param index: 如果给index值，将会返回固定的该索引位置的值；如果不给，将会循环输出该列表的值
-        :return:
-        """
-        if self.num == 0:
-            return None
-        if index is not None:
-            self.index = index
-        obj = self.objlist[self.index % self.num]
-        self.index += 1
-        return obj
-
-    def exist(self, mstring):
-        """
-
-        :param mstring: 需要验证是否存在的字符串
-        :return:
-        """
-        if mstring:
-            if mstring in self.objlist:
-                return True
-            else:
-                return False
-        else:
-            print("传入的string为空的")
-            return False
-
-    def remove(self, mstring):
-        """
-
-        :param mstring: 需要删除的字符串
-        :return:
-        """
-        if mstring:
-            if mstring in self.objlist:
-                self.objlist.remove(mstring)
-                self.num = self.num - 1
-
-    def length(self):
-        """
-        获取列表当前长度 及环型列表现在的长度
-        :return:
-        """
-        return len(self.objlist)
-
-    def get_random(self):
-        """
-        获取随机代理
-        :return:
-        """
-        return random.choice(self.objlist)
-
-# if __name__ == "__main__":
-#     ringList = RingList()
-#     for i in range(1,100):
-#         ringList.append(i)
-#     # print(ringList.objlist)
-#     # print(ringList.num)
-#     # print()
-#     while True:
-#         print(ringList.pop())
+import random
+
+
+class RingList(object):
+    def __init__(self):
+        """
+        环形列表初始化
+        """
+        self.objlist = list()
+        # 列表中数据总量
+        self.num = 0
+        self.index = 0
+
+    def append(self, p_object):
+        """
+
+        :param p_object: 增加到环形列表的元素
+        :return:
+        """
+        self.num += 1
+        self.objlist.append(p_object)
+
+    def pop(self, index=None):
+        """
+
+        :param index: 如果给index值，将会返回固定的该索引位置的值；如果不给，将会循环输出该列表的值
+        :return:
+        """
+        if self.num == 0:
+            return None
+        if index is not None:
+            self.index = index
+        obj = self.objlist[self.index % self.num]
+        self.index += 1
+        return obj
+
+    def exist(self, mstring):
+        """
+
+        :param mstring: 需要验证是否存在的字符串
+        :return:
+        """
+        if mstring:
+            if mstring in self.objlist:
+                return True
+            else:
+                return False
+        else:
+            print("传入的string为空的")
+            return False
+
+    def remove(self, mstring):
+        """
+
+        :param mstring: 需要删除的字符串
+        :return:
+        """
+        if mstring:
+            if mstring in self.objlist:
+                self.objlist.remove(mstring)
+                self.num = self.num - 1
+
+    def length(self):
+        """
+        获取列表当前长度 及环型列表现在的长度
+        :return:
+        """
+        return len(self.objlist)
+
+    def get_random(self):
+        """
+        获取随机代理
+        :return:
+        """
+        return random.choice(self.objlist)
+
+# if __name__ == "__main__":
+#     ringList = RingList()
+#     for i in range(1,100):
+#         ringList.append(i)
+#     # print(ringList.objlist)
+#     # print(ringList.num)
+#     # print()
+#     while True:
+#         print(ringList.pop())

re_common/baselibrary/utils/version_compare.py

@@ -1,36 +1,36 @@
-def compare(a: str, b: str):
-    '''
-    比较两个版本的大小，需要按.分割后比较各个部分的大小
-    :return 返回较大的版本号
-    '''
-    lena = len(a.split('.'))  # 获取版本字符串的组成部分
-    lenb = len(b.split('.'))
-    a2 = a + '.0' * (lenb-lena)  # b比a长的时候补全a
-    b2 = b + '.0' * (lena-lenb)
-    for i in range(max(lena, lenb)):  # 对每个部分进行比较，需要转化为整数进行比较
-        if int(a2.split('.')[i]) > int(b2.split('.')[i]):
-            return a
-        elif int(a2.split('.')[i]) < int(b2.split('.')[i]):
-            return b
-        else:						# 比较到最后都相等，则返回第一个版本
-            if i == max(lena, lenb)-1:
-                return a
-
-
-def compare_bool(a: str, b: str):
-    '''
-    比较两个版本的大小，需要按.分割后比较各个部分的大小
-    :return 如果 a >= b 返回true
-    '''
-    lena = len(a.split('.'))  # 获取版本字符串的组成部分
-    lenb = len(b.split('.'))
-    a2 = a + '.0' * (lenb-lena)  # b比a长的时候补全a
-    b2 = b + '.0' * (lena-lenb)
-    for i in range(max(lena, lenb)):  # 对每个部分进行比较，需要转化为整数进行比较
-        if int(a2.split('.')[i]) > int(b2.split('.')[i]):
-            return True
-        elif int(a2.split('.')[i]) < int(b2.split('.')[i]):
-            return False
-        else:						# 比较到最后都相等，则返回第一个版本
-            if i == max(lena, lenb)-1:
-                return True
+def compare(a: str, b: str):
+    '''
+    比较两个版本的大小，需要按.分割后比较各个部分的大小
+    :return 返回较大的版本号
+    '''
+    lena = len(a.split('.'))  # 获取版本字符串的组成部分
+    lenb = len(b.split('.'))
+    a2 = a + '.0' * (lenb-lena)  # b比a长的时候补全a
+    b2 = b + '.0' * (lena-lenb)
+    for i in range(max(lena, lenb)):  # 对每个部分进行比较，需要转化为整数进行比较
+        if int(a2.split('.')[i]) > int(b2.split('.')[i]):
+            return a
+        elif int(a2.split('.')[i]) < int(b2.split('.')[i]):
+            return b
+        else:						# 比较到最后都相等，则返回第一个版本
+            if i == max(lena, lenb)-1:
+                return a
+
+
+def compare_bool(a: str, b: str):
+    '''
+    比较两个版本的大小，需要按.分割后比较各个部分的大小
+    :return 如果 a >= b 返回true
+    '''
+    lena = len(a.split('.'))  # 获取版本字符串的组成部分
+    lenb = len(b.split('.'))
+    a2 = a + '.0' * (lenb-lena)  # b比a长的时候补全a
+    b2 = b + '.0' * (lena-lenb)
+    for i in range(max(lena, lenb)):  # 对每个部分进行比较，需要转化为整数进行比较
+        if int(a2.split('.')[i]) > int(b2.split('.')[i]):
+            return True
+        elif int(a2.split('.')[i]) < int(b2.split('.')[i]):
+            return False
+        else:						# 比较到最后都相等，则返回第一个版本
+            if i == max(lena, lenb)-1:
+                return True

re_common/baselibrary/utils/ydmhttp.py

@@ -1,126 +1,126 @@
-import json
-import requests
-import time
-
-
-######################################################################
-
-class YDMHttp(object):
-    """
-    云打码已废弃，（跑路）
-    """
-
-    def __init__(self, username='office', password='officeHelper$123', appid=1, appkey='22cc5376925e9387a23cf797cb9ba745'):
-        self.username = username
-        self.password = password
-        self.appid = str(appid)
-        self.appkey = appkey
-        self.apiurl = 'http://api.yundama.com/api.php'
-
-    def request(self, fields, files=[]):
-        response = self.post_url(self.apiurl, fields, files)
-        response = json.loads(response)
-        return response
-
-    def balance(self):
-        data = {'method': 'balance', 'username': self.username, 'password': self.password, 'appid': self.appid,
-                'appkey': self.appkey}
-        response = self.request(data)
-        if (response):
-            if (response['ret'] and response['ret'] < 0):
-                return response['ret']
-            else:
-                return response['balance']
-        else:
-            return -9001
-
-    def login(self):
-        data = {'method': 'login', 'username': self.username, 'password': self.password, 'appid': self.appid,
-                'appkey': self.appkey}
-        response = self.request(data)
-        if (response):
-            if (response['ret'] and response['ret'] < 0):
-                return response['ret']
-            else:
-                return response['uid']
-        else:
-            return -9001
-
-    def upload(self, filename, codetype, timeout):
-        data = {'method': 'upload', 'username': self.username, 'password': self.password, 'appid': self.appid,
-                'appkey': self.appkey, 'codetype': str(codetype), 'timeout': str(timeout)}
-        file = {'file': filename}
-        response = self.request(data, file)
-        if (response):
-            if (response['ret'] and response['ret'] < 0):
-                return response['ret']
-            else:
-                return response['cid']
-        else:
-            return -9001
-
-    def result(self, cid):
-        data = {'method': 'result', 'username': self.username, 'password': self.password, 'appid': self.appid,
-                'appkey': self.appkey, 'cid': str(cid)}
-        response = self.request(data)
-        return response and response['text'] or ''
-
-    def decode(self, filename, codetype, timeout):
-        cid = self.upload(filename, codetype, timeout)
-        if (cid > 0):
-            for i in range(0, timeout):
-                result = self.result(cid)
-                if (result != ''):
-                    return cid, result
-                else:
-                    time.sleep(1)
-            return -3003, ''
-        else:
-            return cid, ''
-
-    def report(self, cid):
-        data = {'method': 'report', 'username': self.username, 'password': self.password, 'appid': self.appid,
-                'appkey': self.appkey, 'cid': str(cid), 'flag': '0'}
-        response = self.request(data)
-        if (response):
-            return response['ret']
-        else:
-            return -9001
-
-    def post_url(self, url, fields, files=[]):
-        #  在传入二进制时，下面两行官方代码需注释掉
-        # for key in files:
-        #     files[key] = open(files[key], 'rb');
-        res = requests.post(url, files=files, data=fields)
-        return res.text
-
-
-######################################################################
-
-    def Img2Code(self, content, codetype='1004', timeout=5):
-        """
-
-        :param content: 图片文件
-        :param codetype: 验证码类型,
-        例：1004表示4位字母数字，不同类型收费不同。请准确填写，否则影响识别率。
-            在此查询所有类型 http://www.yundama.com/price.html
-        :param timeout: 超时时间，秒
-        :return: 验证码
-        """
-
-        # 登陆云打码
-        uid = self.login()
-        print('uid: %s' % uid)
-
-        # 查询余额
-        balance = self.balance()
-        print('balance: %s' % balance)
-        if int(balance) < 100000:
-            print('Warning: Need Money !!!!!!!!!!!!!!!!!!!!!!!!!')
-
-        # 开始识别，图片路径，验证码类型ID，超时时间（秒），识别结果
-        cid, result = self.decode(content, codetype, timeout)
-        print('cid: %s, result: %s' % (cid, result))
-        return result
-
-
+import json
+import requests
+import time
+
+
+######################################################################
+
+class YDMHttp(object):
+    """
+    云打码已废弃，（跑路）
+    """
+
+    def __init__(self, username='office', password='officeHelper$123', appid=1, appkey='22cc5376925e9387a23cf797cb9ba745'):
+        self.username = username
+        self.password = password
+        self.appid = str(appid)
+        self.appkey = appkey
+        self.apiurl = 'http://api.yundama.com/api.php'
+
+    def request(self, fields, files=[]):
+        response = self.post_url(self.apiurl, fields, files)
+        response = json.loads(response)
+        return response
+
+    def balance(self):
+        data = {'method': 'balance', 'username': self.username, 'password': self.password, 'appid': self.appid,
+                'appkey': self.appkey}
+        response = self.request(data)
+        if (response):
+            if (response['ret'] and response['ret'] < 0):
+                return response['ret']
+            else:
+                return response['balance']
+        else:
+            return -9001
+
+    def login(self):
+        data = {'method': 'login', 'username': self.username, 'password': self.password, 'appid': self.appid,
+                'appkey': self.appkey}
+        response = self.request(data)
+        if (response):
+            if (response['ret'] and response['ret'] < 0):
+                return response['ret']
+            else:
+                return response['uid']
+        else:
+            return -9001
+
+    def upload(self, filename, codetype, timeout):
+        data = {'method': 'upload', 'username': self.username, 'password': self.password, 'appid': self.appid,
+                'appkey': self.appkey, 'codetype': str(codetype), 'timeout': str(timeout)}
+        file = {'file': filename}
+        response = self.request(data, file)
+        if (response):
+            if (response['ret'] and response['ret'] < 0):
+                return response['ret']
+            else:
+                return response['cid']
+        else:
+            return -9001
+
+    def result(self, cid):
+        data = {'method': 'result', 'username': self.username, 'password': self.password, 'appid': self.appid,
+                'appkey': self.appkey, 'cid': str(cid)}
+        response = self.request(data)
+        return response and response['text'] or ''
+
+    def decode(self, filename, codetype, timeout):
+        cid = self.upload(filename, codetype, timeout)
+        if (cid > 0):
+            for i in range(0, timeout):
+                result = self.result(cid)
+                if (result != ''):
+                    return cid, result
+                else:
+                    time.sleep(1)
+            return -3003, ''
+        else:
+            return cid, ''
+
+    def report(self, cid):
+        data = {'method': 'report', 'username': self.username, 'password': self.password, 'appid': self.appid,
+                'appkey': self.appkey, 'cid': str(cid), 'flag': '0'}
+        response = self.request(data)
+        if (response):
+            return response['ret']
+        else:
+            return -9001
+
+    def post_url(self, url, fields, files=[]):
+        #  在传入二进制时，下面两行官方代码需注释掉
+        # for key in files:
+        #     files[key] = open(files[key], 'rb');
+        res = requests.post(url, files=files, data=fields)
+        return res.text
+
+
+######################################################################
+
+    def Img2Code(self, content, codetype='1004', timeout=5):
+        """
+
+        :param content: 图片文件
+        :param codetype: 验证码类型,
+        例：1004表示4位字母数字，不同类型收费不同。请准确填写，否则影响识别率。
+            在此查询所有类型 http://www.yundama.com/price.html
+        :param timeout: 超时时间，秒
+        :return: 验证码
+        """
+
+        # 登陆云打码
+        uid = self.login()
+        print('uid: %s' % uid)
+
+        # 查询余额
+        balance = self.balance()
+        print('balance: %s' % balance)
+        if int(balance) < 100000:
+            print('Warning: Need Money !!!!!!!!!!!!!!!!!!!!!!!!!')
+
+        # 开始识别，图片路径，验证码类型ID，超时时间（秒），识别结果
+        cid, result = self.decode(content, codetype, timeout)
+        print('cid: %s, result: %s' % (cid, result))
+        return result
+
+

re_common/facade/lazy_import.py

@@ -1,11 +1,11 @@
-# 延迟导入　主要是为了使用时不去安装多余的
-
-
-def get_TomlConfig():
-    from re_common.baselibrary.readconfig.toml_config import TomlConfig
-    return TomlConfig
-
-
-def get_streamlogger():
-    from re_common.baselibrary import MLogger
-    return MLogger().streamlogger
+# 延迟导入　主要是为了使用时不去安装多余的
+
+
+def get_TomlConfig():
+    from re_common.baselibrary.readconfig.toml_config import TomlConfig
+    return TomlConfig
+
+
+def get_streamlogger():
+    from re_common.baselibrary import MLogger
+    return MLogger().streamlogger

re_common/facade/loggerfacade.py

@@ -1,25 +1,25 @@
-"""
-提供logger的使用外观  外观模式
-"""
-from re_common.baselibrary import MLogger
-
-
-def get_streamlogger():
-    """
-    提供一个输出流的logger
-    :return:
-    """
-    return MLogger().streamlogger
-
-
-def get_filelogger(filedir):
-    """
-    文件流的logger
-    :param filedir:
-    :return:
-    """
-    return MLogger(filedir).filelogger
-
-
-def get_timerotatingfilelogger(filedir, fileter=None):
-    return MLogger(filedir, fileter).timerotatingfilelogger
+"""
+提供logger的使用外观  外观模式
+"""
+from re_common.baselibrary import MLogger
+
+
+def get_streamlogger():
+    """
+    提供一个输出流的logger
+    :return:
+    """
+    return MLogger().streamlogger
+
+
+def get_filelogger(filedir):
+    """
+    文件流的logger
+    :param filedir:
+    :return:
+    """
+    return MLogger(filedir).filelogger
+
+
+def get_timerotatingfilelogger(filedir, fileter=None):
+    return MLogger(filedir, fileter).timerotatingfilelogger