lazysdk 0.1.101__tar.gz → 0.1.103__tar.gz

{lazysdk-0.1.101 → lazysdk-0.1.103}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.101
+Version: 0.1.103
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker

{lazysdk-0.1.101 → lazysdk-0.1.103}/lazysdk/lazypath.py

@@ -185,10 +185,13 @@ def delete(path_or_file):
     """
     删除目录/文件
     """
-    if os.path.isdir(path_or_file):
-        shutil.rmtree(path_or_file)
+    if os.path.exists(path_or_file):
+        if os.path.isdir(path_or_file):
+            shutil.rmtree(path_or_file)
+        else:
+            os.remove(path_or_file)
     else:
-        os.remove(path_or_file)
+        return
 
 
 def get_folder_name(dir_or_path: str):

{lazysdk-0.1.101 → lazysdk-0.1.103}/lazysdk/lazytime.py

@@ -287,20 +287,26 @@ def get_timestamp():
 def get_timestamp2datetime(
         timestamp: int = None,
         f: str = "%Y-%m-%d %H:%M:%S",
-        zero_to_none: bool = True
+        zero_to_none: bool = True,
+        utc: bool = False
 ):
     """
     将时间戳转换为datetime时间
     :param timestamp: 同时支持字符串和数字格式
     :param f:
     :param zero_to_none: 将0转换为空值
+    :param utc: 是否为utc时间
     :return: 2018-08-01 14:19:53
     """
     if timestamp is not None:
         if timestamp == 0 and zero_to_none is True:
             return
         else:
-            time_array = time.localtime(timestamp)
+            if utc:
+                time_array = time.gmtime(timestamp)
+            else:
+                time_array = time.localtime(timestamp)
+
             date_time = time.strftime(f, time_array)
             return date_time
     else:
@@ -310,7 +316,8 @@ def get_timestamp2datetime(
 def get_timestamp2date(
         timestamp: int = None,
         f: str = "%Y-%m-%d",
-        zero_to_none: bool = True
+        zero_to_none: bool = True,
+        utc: bool = False
 ):
     """
     将时间戳转换为datetime时间
@@ -318,13 +325,17 @@ def get_timestamp2date(
     :param timestamp:
     :param f:
     :param zero_to_none: 将0转换为空值
+    :param utc: 是否为utc时间
     :return: 2018-08-01 14:19:53
     """
     if timestamp is not None:
         if timestamp == 0 and zero_to_none is True:
             return
         else:
-            time_array = time.localtime(timestamp)
+            if utc:
+                time_array = time.gmtime(timestamp)
+            else:
+                time_array = time.localtime(timestamp)
             date_time = time.strftime(f, time_array)
             return date_time
     else:

{lazysdk-0.1.101 → lazysdk-0.1.103}/lazysdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.101
+Version: 0.1.103
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker

{lazysdk-0.1.101 → lazysdk-0.1.103}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setuptools.setup(
     name="lazysdk",
-    version="0.1.101",
+    version="0.1.103",
     description="基于Python的懒人包",
     long_description=long_description,
     long_description_content_type="text/markdown",