eric-tools 1.3.3.1__tar.gz → 1.3.4__tar.gz

{eric_tools-1.3.3.1 → eric_tools-1.3.4}/PKG-INFO

@@ -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
@@ -16,7 +16,7 @@ License-File: LICENSE
 
 # 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 → eric_tools-1.3.4}/README.md

@@ -1,6 +1,6 @@
 # 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 → eric_tools-1.3.4}/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-1.3.3.1 → eric_tools-1.3.4}/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-1.3.3.1 → eric_tools-1.3.4}/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-1.3.3.1 → eric_tools-1.3.4}/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-1.3.3.1 → eric_tools-1.3.4}/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 → eric_tools-1.3.4}/eric_tools.egg-info/PKG-INFO

@@ -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
@@ -16,7 +16,7 @@ License-File: LICENSE
 
 # 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 → eric_tools-1.3.4}/eric_tools.egg-info/SOURCES.txt

@@ -18,7 +18,6 @@ eric_tools/logMixin.py
 eric_tools/logger.py
 eric_tools/nginx_log.py
 eric_tools/pgsql.py
-eric_tools/readconfig.py
 eric_tools/remove.py
 eric_tools/resize_image.py
 eric_tools/send_email.py

{eric_tools-1.3.3.1 → eric_tools-1.3.4}/eric_tools.egg-info/requires.txt

@@ -3,3 +3,4 @@ requests
 paramiko
 Pillow
 xlsxwriter
+ImageHash

{eric_tools-1.3.3.1 → eric_tools-1.3.4}/setup.py

@@ -7,7 +7,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="eric_tools",
-    version="1.3.3.1",
+    version="1.3.4",
     author="Eric",
     author_email="jxleric95@gmail.com",
     description="Python Daily Development Tools",
@@ -27,6 +27,7 @@ setuptools.setup(
         'requests',
         'paramiko',
         'Pillow',
-        'xlsxwriter'
+        'xlsxwriter',
+        "ImageHash",
     ]
 )

eric_tools-1.3.3.1/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))
-