eric-tools 1.3.3.1__py3-none-any.whl → 1.3.4__py3-none-any.whl

eric_tools/__init__.py

@@ -11,7 +11,7 @@ from .dynamic_settings import DynamicConfig
 name = 'Eric-Tools'
 __title__ = 'tools'
 __description__ = 'Python HTTP for Humans.'
-__version__ = "1.3.3.1"
+__version__ = "1.3.4"
 __author__ = 'Eric'
 __doc__ = ["Python Daily Development Tools"]
 __url__ = "https://github.com/Eric-jxl/Tools"

eric_tools/dynamic_settings.py

@@ -162,7 +162,7 @@ def get_config_key(key):
     """获取指定配置项的值，并支持自动重新加载"""
     config = DynamicConfig("config.yml", debug=True, mode="production")
     config.force_reload()  # ✅ 先重新加载配置
-    value = Config.get(key)  # ✅ 取值
+    value = config.get(key)  # ✅ 取值
     if value is None:
         return jsonify({"error": "Key not found"}), 404  # ✅ 404 + 友好错误信息
     return jsonify(value)

eric_tools/logMixin.py

@@ -34,8 +34,6 @@ class StrategyMeta(type):
 
         return super().__new__(meta, name, bases, dct)
 
-# 假设SecurityMixin, CacheMixin, CacheControlMixin已定义
-
 
 class MySecureClass(metaclass=StrategyMeta):
     security_required = True

eric_tools/pgsql.py

@@ -25,17 +25,14 @@ class PostgreSQL(object):
         self.__dict__[key] = value
 
     def __getattr__(self, item):
-        print self.__dict__[item]
         return self.__dict__[item]
 
     def __call__(self, *args, **kwargs):
-        print '%s'% PostgreSQL.__dict__
+        print('%s' % PostgreSQL.__dict__)
 
     @property
     def info(self):
-        return psycopg2.__version__,psycopg2.__doc__
-
-
+        return psycopg2.__version__, psycopg2.__doc__
 
     def operate(self, sql, params):
         count = 0
@@ -45,7 +42,7 @@ class PostgreSQL(object):
             self.conn.commit()
             self.close()
         except Exception, e:
-            print e.message
+            print(e.message)
         return count
 
     def connect(self):
@@ -66,7 +63,7 @@ class PostgreSQL(object):
             result = self.cursor.fetchone()
             self.close()
         except Exception, e:
-            print e.message
+            print(e.message)
         return result
 
     def get_all(self, sql, params=()):
@@ -77,7 +74,7 @@ class PostgreSQL(object):
             tup = self.cursor.fetchall()
             self.close()
         except Exception, e:
-            print e.message
+            print(e.message)
         return tup
 
     def insert(self, sql, params=()):
@@ -88,7 +85,3 @@ class PostgreSQL(object):
 
     def delete(self, sql, params=()):
         return self.operate(sql, params)
-
-
-
-

eric_tools/remove.py

@@ -17,7 +17,6 @@ class RemoveFile(object):
 
     @staticmethod
     def fileremove(filename, timedifference):
-        '''remove file'''
 
         date = datetime.datetime.fromtimestamp(os.path.getmtime(filename))
         now = datetime.datetime.now()
@@ -25,17 +24,15 @@ class RemoveFile(object):
         if (now - date).seconds > timedifference:
             if os.path.exists(filename):
                 os.remove(filename)
-                print 'remove file: %s' % filename
+                print('remove file: %s' % filename)
             else:
-                print 'no such file: %s' % filename
+                print('no such file: %s' % filename)
 
 
 FILE_DIR = '/home'
 
 if __name__ == '__main__':
 
-    print 'Script is running...'
-
     while True:
         ITEMS = os.listdir(FILE_DIR)
         NEWLIST = []
@@ -44,7 +41,7 @@ if __name__ == '__main__':
                 NEWLIST.append(FILE_DIR + names)
 
         for names in NEWLIST:
-            print 'current file: %s' % (names)
+            print('current file: %s' % (names))
             RemoveFile.fileremove(names, 10)
 
         time.sleep(2)

{eric_tools-1.3.3.1.dist-info → eric_tools-1.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eric-tools
-Version: 1.3.3.1
+Version: 1.3.4
 Summary: Python Daily Development Tools
 Home-page: https://github.com/Eric-jxl/Tools
 Author: Eric
@@ -18,10 +18,11 @@ Requires-Dist: requests
 Requires-Dist: paramiko
 Requires-Dist: Pillow
 Requires-Dist: xlsxwriter
+Requires-Dist: ImageHash
 
 # Tools
 [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![latest 1.3.3.1](https://img.shields.io/badge/latest-1.3.3.1-green.svg?style=flat)
+![latest 1.3.4](https://img.shields.io/badge/latest-1.3.4-green.svg?style=flat)
 ![GitHub commits since latest release](https://img.shields.io/github/commits-since/eric-jxl/Tools/latest)
 [![Publish Python Package](https://github.com/eric-jxl/Tools/actions/workflows/publish-pypi.yml/badge.svg)](https://github.com/eric-jxl/Tools/actions/workflows/publish-pypi.yml)
 

{eric_tools-1.3.3.1.dist-info → eric_tools-1.3.4.dist-info}/RECORD

@@ -1,27 +1,26 @@
 eric_tools/Abstract.py,sha256=8HpTno0VnviyYaRvc2whTUfUJefg2tZhgR94RU9f-FQ,1619
-eric_tools/__init__.py,sha256=AzdqdRGGJQONw9Wm-92xghu7pbW5dDJCs_w4JM2fhig,388
+eric_tools/__init__.py,sha256=G4_vDPbMbHzI9mJzrTSxvoFguhxsTpseOUyE7MwIM0s,386
 eric_tools/async_queue.py,sha256=-wiImRYCWcNBbCAMLXFTjKkPrK94mFL836-f_wvUewA,1122
 eric_tools/convert_json.py,sha256=Qcs8VQGB7cBkwAiqH1Xd9vbagw19sA2bE9s4EJFA33E,638
 eric_tools/decorator.py,sha256=DEN_-TSvtAo0TWvs_7-HbeMQCqdgVAkxz2K5fekYFbM,1887
 eric_tools/delete_duplicate.py,sha256=X3mXW2rjD4TnhmJPYFl6H06lu4rsUkoltL2C3btpkL4,1919
 eric_tools/downloader.py,sha256=iSs6fpcxzlZX5VRjeahPOtf5G_HclY7aPNGXL5XyOwg,1758
-eric_tools/dynamic_settings.py,sha256=WGsjU1YYdXkoXB3J_8Tm6TUvNqc7qjQ2NmVzt0CnH1U,5717
+eric_tools/dynamic_settings.py,sha256=a5t4m1QXRrrnljRWEyH99WZnE8KHo2W1svGFmiTxRCc,5717
 eric_tools/encryption_classmethod.py,sha256=JaR0rBnaxOEWxOtoOZ6qN1x31Zm1boh5kw264juHLWg,1662
 eric_tools/excel_generator.py,sha256=8pfd4yfDfd63f6XzFUuMKdpgLiSAnrEfyRcYXKAh8XM,1430
 eric_tools/exception_class.py,sha256=4ntO2ynm3D9tGoeJ538OGKKsudqhoDRw-fpFd4X6Hy0,741
 eric_tools/ip.py,sha256=TqeWnJe2M5HhoI8WGNFwyYrsI7kYDQ4PBDBDIDjLSkc,915
 eric_tools/jwt_encrypt.py,sha256=_FxRezFnfEwCviFzx3K0s1yN872VqxqaAwMsU-GI3EI,1358
-eric_tools/logMixin.py,sha256=D7S8FmjO_5ON6vIQXrOQFblDNmeoTHb3TV2eisJOFAQ,2298
+eric_tools/logMixin.py,sha256=1-atM_plpGaZ2KxxDZ9-c38buhPfahrQJ2sRrRo-meI,2235
 eric_tools/logger.py,sha256=zvpDv0YpeXZld2w2yPIuosfLWdbdvOqSQsJS2PtstXQ,3058
 eric_tools/nginx_log.py,sha256=zEhfYBtXNJam9tfRbOY5TjezvZspFQzcV5fgrcXv_PM,1260
-eric_tools/pgsql.py,sha256=hYt9GwdpobHOoQ6SAemlyN0zlo0X0niYiTcG-2yWEeQ,2320
-eric_tools/readconfig.py,sha256=Wosz96C1RFITBN2pgfw-TlX7C-wnOiLcDowb7mITysk,737
-eric_tools/remove.py,sha256=RtnNFZzvRc-YNKdDb0h9zVZAPXyDSM1nVcUHTFEjQGk,1163
+eric_tools/pgsql.py,sha256=6rBZillrJF2zOptpnPUiczhKf8-HYosFcoshKrrFGpI,2286
+eric_tools/remove.py,sha256=M1BOj1Np-YMduDfOqfSqnday-Yy68kJdMT352gtF0PA,1106
 eric_tools/resize_image.py,sha256=A2OBCF7XfnQesWIYTs2W1jmZDslftagPxcc-Fijmyoo,2855
 eric_tools/send_email.py,sha256=z1SMVpRaJZQIpA-zUHxxd3WKnUGMaAl9ZG-GirO9fTQ,1177
 eric_tools/sftp.py,sha256=UUBmy4R-7Pezo9haA8JufDyJRcxZg2pKquX0KJIDZIw,423
-eric_tools-1.3.3.1.dist-info/LICENSE,sha256=wURoCIWynkcZ4qUfCqtUOaHgLZgGkrWq8IbK4Scn8os,10849
-eric_tools-1.3.3.1.dist-info/METADATA,sha256=iiQhVWg7FoqVUmWUXePM7GX8zy_tZkZKv_yvG6iOvxo,5152
-eric_tools-1.3.3.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-eric_tools-1.3.3.1.dist-info/top_level.txt,sha256=mtO1Tce6qLPcuy4F8bXHByXuIb2LSAEkQEqeQ3UZpzU,11
-eric_tools-1.3.3.1.dist-info/RECORD,,
+eric_tools-1.3.4.dist-info/LICENSE,sha256=wURoCIWynkcZ4qUfCqtUOaHgLZgGkrWq8IbK4Scn8os,10849
+eric_tools-1.3.4.dist-info/METADATA,sha256=OtGmfKqJB2wtikjYuaI5YX6d09rGnv3cQp6uD8PmAWo,5171
+eric_tools-1.3.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+eric_tools-1.3.4.dist-info/top_level.txt,sha256=mtO1Tce6qLPcuy4F8bXHByXuIb2LSAEkQEqeQ3UZpzU,11
+eric_tools-1.3.4.dist-info/RECORD,,

eric_tools/readconfig.py

@@ -1,30 +0,0 @@
-# -*- coding:utf-8 -*-
-'''
-@Author  : Eric
-@Time    : 2021-02-07 14:01
-@IDE     : PyCharm
-'''
-import sys
-
-import configparser
-
-# proDir = os.path.split(os.path.realpath(__file__))[0]
-# configPath = os.path.join(proDir, "config.ini")
-
-
-class ReadConfig(object):
-    def __init__(self, configPath,title, name):
-        self.conf = configparser.ConfigParser()
-        self.title = title
-        self.name = name
-        self.conf.read(configPath, encoding='utf-8')
-        self.conf.get(title, name)
-        print self.conf.get(title, name)
-
-
-    def __repr__(self):
-        if sys.version_info < 3:
-            print '%s' % self.conf.get(self.title, self.name)
-        else:
-            print('%s' % self.conf.get(self.title, self.name))
-