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

re_common/baselibrary/__init__.py

@@ -1,4 +1,4 @@
-from .readconfig.ini_config import IniConfig
-from .utils.mylogger import MLogger
-
-__all__ = ["MLogger", "IniConfig"]
+from .readconfig.ini_config import IniConfig
+from .utils.mylogger import MLogger
+
+__all__ = ["MLogger", "IniConfig"]

re_common/baselibrary/baseabs/__init__.py

@@ -1,7 +1,7 @@
-from .baseabs import BaseAbs
-
-from ..readconfig.ini_config import IniConfig
-from ..utils.mylogger import MLogger
-from ..database.mbuilder import MysqlBuilderAbstract
-
+from .baseabs import BaseAbs
+
+from ..readconfig.ini_config import IniConfig
+from ..utils.mylogger import MLogger
+from ..database.mbuilder import MysqlBuilderAbstract
+
 __all__ = ["BaseAbs", "MysqlBuilderAbstract", "IniConfig", "MLogger"]

re_common/baselibrary/baseabs/baseabs.py

@@ -1,26 +1,26 @@
-
-
-class BaseAbs(object):
-    """
-    抽象工厂模式，方便管理和引用 目前主要将配置文件和sql相关的库引入了抽象工厂模式中
-    """
-    @staticmethod
-    def get_sql_factory():
-        """
-        sql相关的工厂
-        :return:
-        """
-        from re_common.baselibrary.database.sql_factory import SqlFactory
-        return SqlFactory()
-
-    @staticmethod
-    def get_config_factory():
-        """
-        配置文件相关的工厂
-        :return:
-        """
-        from re_common.baselibrary.readconfig.config_factory import ConfigFactory
-        return ConfigFactory()
-
-
-
+
+
+class BaseAbs(object):
+    """
+    抽象工厂模式，方便管理和引用 目前主要将配置文件和sql相关的库引入了抽象工厂模式中
+    """
+    @staticmethod
+    def get_sql_factory():
+        """
+        sql相关的工厂
+        :return:
+        """
+        from re_common.baselibrary.database.sql_factory import SqlFactory
+        return SqlFactory()
+
+    @staticmethod
+    def get_config_factory():
+        """
+        配置文件相关的工厂
+        :return:
+        """
+        from re_common.baselibrary.readconfig.config_factory import ConfigFactory
+        return ConfigFactory()
+
+
+

re_common/baselibrary/database/mbuilder.py

@@ -1,132 +1,132 @@
-from abc import ABCMeta, abstractmethod
-
-from re_common.baselibrary.database.moudle import SqlMoudle, Sqlite3Moudle
-
-
-class MysqlBuilderAbstract:
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    def build_server_address(self, host):
-        pass
-
-    @abstractmethod
-    def build_username(self, user):
-        pass
-
-    @abstractmethod
-    def build_password(self, passwd):
-        pass
-
-    @abstractmethod
-    def build_port(self, port):
-        pass
-
-    @abstractmethod
-    def use_db(self, db):
-        pass
-
-    @abstractmethod
-    def build_chart(self, chartset):
-        pass
-
-    @abstractmethod
-    def get_moudle(self):
-        pass
-
-
-class Sqlite3BuilderAbstract:
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    def build_file_path(self, dbpath):
-        pass
-
-    @abstractmethod
-    def build_isolation_level(self):
-        pass
-
-
-class MysqlBuilder(MysqlBuilderAbstract):
-    def __init__(self, configfile, configname, keytransformdicts=None):
-        self.sqlmoudle = SqlMoudle()
-
-        from re_common.baselibrary.readconfig.ini_config import IniConfig
-        self.ic = IniConfig(configfile).builder()
-        self.configfile = configfile
-        self.configname = configname
-        # 使用key转换器转换key
-        self.keytransformdicts = keytransformdicts
-        """
-        python2
-            self.config.readfp(open(configfile, 'rb'))
-        python3
-            self.config.read_file(open(configfile, 'r'))
-        """
-
-    def build_port(self, port):
-        self.sqlmoudle.port = int(self.ic.get_value(self.configname, port))
-
-    def build_server_address(self, host):
-        self.sqlmoudle.host = self.ic.get_value(self.configname, host)
-
-    def build_password(self, passwd):
-        self.sqlmoudle.passwd = self.ic.get_value(self.configname, passwd)
-
-    def use_db(self, db):
-        self.sqlmoudle.db = self.ic.get_value(self.configname, db)
-
-    def build_username(self, user):
-        self.sqlmoudle.user = self.ic.get_value(self.configname, user)
-
-    def build_chart(self, chartset):
-        self.sqlmoudle.charset = self.ic.get_value(self.configname, chartset)
-
-    def get_moudle(self):
-        return self.sqlmoudle
-
-    def build_all(self):
-        if not self.keytransformdicts:
-            self.keytransformdicts = {"port": "port", "host": "host", "passwd": "passwd", "user": "user", "db": "db",
-                                      "chartset": "chartset"}
-        self.build_port(self.keytransformdicts["port"])
-        self.build_server_address(self.keytransformdicts["host"])
-        self.build_password(self.keytransformdicts["passwd"])
-        self.build_username(self.keytransformdicts["user"])
-        self.use_db(self.keytransformdicts["db"])
-        self.build_chart(self.keytransformdicts["chartset"])
-        return self
-
-    def get_tuples(self):
-        return self.sqlmoudle.host, self.sqlmoudle.user, self.sqlmoudle.passwd, self.sqlmoudle.port
-
-
-class Sqlite3Builder(Sqlite3BuilderAbstract):
-    def __init__(self, configfile="", sec=""):
-        self.sqlite3moudle = Sqlite3Moudle()
-        from re_common.baselibrary.readconfig.ini_config import IniConfig
-        self.ic = IniConfig(configfile).builder()
-        self.configfile = configfile
-        self.sec = sec
-
-    def build_file_path(self, dbpath='', opt="dbpath"):
-        if dbpath:
-            self.sqlite3moudle.database = dbpath
-        else:
-            self.sqlite3moudle.database = self.ic.get_value(self.sec, opt)
-        return self
-
-    def build_timeout(self, timeout):
-        self.sqlite3moudle.timeout = timeout
-        return self
-
-    def build_isolation_level(self):
-        pass
-
-    def build_all(self):
-        self.build_file_path()
-        self.build_isolation_level()
-        return self
-
-    def get_moudle(self):
-        return self.sqlite3moudle
+from abc import ABCMeta, abstractmethod
+
+from re_common.baselibrary.database.moudle import SqlMoudle, Sqlite3Moudle
+
+
+class MysqlBuilderAbstract:
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def build_server_address(self, host):
+        pass
+
+    @abstractmethod
+    def build_username(self, user):
+        pass
+
+    @abstractmethod
+    def build_password(self, passwd):
+        pass
+
+    @abstractmethod
+    def build_port(self, port):
+        pass
+
+    @abstractmethod
+    def use_db(self, db):
+        pass
+
+    @abstractmethod
+    def build_chart(self, chartset):
+        pass
+
+    @abstractmethod
+    def get_moudle(self):
+        pass
+
+
+class Sqlite3BuilderAbstract:
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def build_file_path(self, dbpath):
+        pass
+
+    @abstractmethod
+    def build_isolation_level(self):
+        pass
+
+
+class MysqlBuilder(MysqlBuilderAbstract):
+    def __init__(self, configfile, configname, keytransformdicts=None):
+        self.sqlmoudle = SqlMoudle()
+
+        from re_common.baselibrary.readconfig.ini_config import IniConfig
+        self.ic = IniConfig(configfile).builder()
+        self.configfile = configfile
+        self.configname = configname
+        # 使用key转换器转换key
+        self.keytransformdicts = keytransformdicts
+        """
+        python2
+            self.config.readfp(open(configfile, 'rb'))
+        python3
+            self.config.read_file(open(configfile, 'r'))
+        """
+
+    def build_port(self, port):
+        self.sqlmoudle.port = int(self.ic.get_value(self.configname, port))
+
+    def build_server_address(self, host):
+        self.sqlmoudle.host = self.ic.get_value(self.configname, host)
+
+    def build_password(self, passwd):
+        self.sqlmoudle.passwd = self.ic.get_value(self.configname, passwd)
+
+    def use_db(self, db):
+        self.sqlmoudle.db = self.ic.get_value(self.configname, db)
+
+    def build_username(self, user):
+        self.sqlmoudle.user = self.ic.get_value(self.configname, user)
+
+    def build_chart(self, chartset):
+        self.sqlmoudle.charset = self.ic.get_value(self.configname, chartset)
+
+    def get_moudle(self):
+        return self.sqlmoudle
+
+    def build_all(self):
+        if not self.keytransformdicts:
+            self.keytransformdicts = {"port": "port", "host": "host", "passwd": "passwd", "user": "user", "db": "db",
+                                      "chartset": "chartset"}
+        self.build_port(self.keytransformdicts["port"])
+        self.build_server_address(self.keytransformdicts["host"])
+        self.build_password(self.keytransformdicts["passwd"])
+        self.build_username(self.keytransformdicts["user"])
+        self.use_db(self.keytransformdicts["db"])
+        self.build_chart(self.keytransformdicts["chartset"])
+        return self
+
+    def get_tuples(self):
+        return self.sqlmoudle.host, self.sqlmoudle.user, self.sqlmoudle.passwd, self.sqlmoudle.port
+
+
+class Sqlite3Builder(Sqlite3BuilderAbstract):
+    def __init__(self, configfile="", sec=""):
+        self.sqlite3moudle = Sqlite3Moudle()
+        from re_common.baselibrary.readconfig.ini_config import IniConfig
+        self.ic = IniConfig(configfile).builder()
+        self.configfile = configfile
+        self.sec = sec
+
+    def build_file_path(self, dbpath='', opt="dbpath"):
+        if dbpath:
+            self.sqlite3moudle.database = dbpath
+        else:
+            self.sqlite3moudle.database = self.ic.get_value(self.sec, opt)
+        return self
+
+    def build_timeout(self, timeout):
+        self.sqlite3moudle.timeout = timeout
+        return self
+
+    def build_isolation_level(self):
+        pass
+
+    def build_all(self):
+        self.build_file_path()
+        self.build_isolation_level()
+        return self
+
+    def get_moudle(self):
+        return self.sqlite3moudle

re_common/baselibrary/database/moudle.py

@@ -1,93 +1,93 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-from pymysql.cursors import Cursor
-
-
-# pymysql的moudle
-class SqlMoudle(object):
-    def __init__(self):
-        """
-           host
-          string, host to connect
-          
-        user
-          string, user to connect as
-
-        passwd
-          string, password to use
-
-        db
-          string, database to use
-
-        port
-          integer, TCP/IP port to connect to
-
-        这是一个标准连接的所有参数
-        cursorclass pymysql.cursors.DictCursor 表示返回数据为dicts
-        """
-        self.host = None
-        self.user = None
-        self.password = ""
-        self.database = None
-        self.port = 3306
-        self.unix_socket = None
-        self.charset = ''
-        self.sql_mode = None
-        self.read_default_file = None
-        self.conv = None
-        self.use_unicode = True
-        self.client_flag = 0
-        self.cursorclass = Cursor
-        self.init_command = None
-        self.connect_timeout = 10
-        self.ssl = None
-        self.read_default_group = None
-        self.compress = None
-        self.named_pipe = None
-        self.autocommit = False
-        self.db = None
-        self.passwd = None
-        self.local_infile = False
-        self.max_allowed_packet = 16 * 1024 * 1024
-        self.defer_connect = False
-        self.auth_plugin_map = None
-        self.read_timeout = None
-        self.write_timeout = None
-        self.bind_address = None
-        self.binary_prefix = False
-        self.program_name = None
-        self.server_public_key = None
-
-    # @property
-    # def get_serveraddress(self):
-    #     return self._serveraddress
-    #
-    # @get_serveraddress.setter
-    # def set_serveraddress(self,serveraddress):
-    #     self._serveraddress = serveraddress
-    #
-    # @get_serveraddress.deleter
-    # def del_serveraddress(self):
-    #     del self._serveraddress
-
-    def to_dict(self):
-        return self.__dict__
-
-    def __str__(self):
-        return str(self.__dict__)
-
-
-# sqlite3的 moudle
-class Sqlite3Moudle(object):
-    def __init__(self):
-        self.database = ""
-        self.timeout = None
-        self.detect_types = None
-        self.isolation_level = None
-        self.check_same_thread = None
-        self.factory = None
-        self.cached_statements = None
-        # self.uri = None
-
-    def to_dict(self):
-        return self.__dict__
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+from pymysql.cursors import Cursor
+
+
+# pymysql的moudle
+class SqlMoudle(object):
+    def __init__(self):
+        """
+           host
+          string, host to connect
+          
+        user
+          string, user to connect as
+
+        passwd
+          string, password to use
+
+        db
+          string, database to use
+
+        port
+          integer, TCP/IP port to connect to
+
+        这是一个标准连接的所有参数
+        cursorclass pymysql.cursors.DictCursor 表示返回数据为dicts
+        """
+        self.host = None
+        self.user = None
+        self.password = ""
+        self.database = None
+        self.port = 3306
+        self.unix_socket = None
+        self.charset = ''
+        self.sql_mode = None
+        self.read_default_file = None
+        self.conv = None
+        self.use_unicode = True
+        self.client_flag = 0
+        self.cursorclass = Cursor
+        self.init_command = None
+        self.connect_timeout = 10
+        self.ssl = None
+        self.read_default_group = None
+        self.compress = None
+        self.named_pipe = None
+        self.autocommit = False
+        self.db = None
+        self.passwd = None
+        self.local_infile = False
+        self.max_allowed_packet = 16 * 1024 * 1024
+        self.defer_connect = False
+        self.auth_plugin_map = None
+        self.read_timeout = None
+        self.write_timeout = None
+        self.bind_address = None
+        self.binary_prefix = False
+        self.program_name = None
+        self.server_public_key = None
+
+    # @property
+    # def get_serveraddress(self):
+    #     return self._serveraddress
+    #
+    # @get_serveraddress.setter
+    # def set_serveraddress(self,serveraddress):
+    #     self._serveraddress = serveraddress
+    #
+    # @get_serveraddress.deleter
+    # def del_serveraddress(self):
+    #     del self._serveraddress
+
+    def to_dict(self):
+        return self.__dict__
+
+    def __str__(self):
+        return str(self.__dict__)
+
+
+# sqlite3的 moudle
+class Sqlite3Moudle(object):
+    def __init__(self):
+        self.database = ""
+        self.timeout = None
+        self.detect_types = None
+        self.isolation_level = None
+        self.check_same_thread = None
+        self.factory = None
+        self.cached_statements = None
+        # self.uri = None
+
+    def to_dict(self):
+        return self.__dict__