mangoautomation 1.0.53__tar.gz → 1.0.56__tar.gz

mangoautomation-1.0.56/PKG-INFO

@@ -0,0 +1,42 @@
+Metadata-Version: 2.4
+Name: mangoautomation
+Version: 1.0.56
+Summary: 测试工具
+Home-page: https://gitee.com/mao-peng/testkit
+Author: 毛鹏
+Author-email: 729164035@qq.com
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+License-File: LICENSE
+Requires-Dist: setuptools>=68.2.0
+Requires-Dist: pydantic>=2.9.2
+Requires-Dist: playwright==1.43.0
+Requires-Dist: uiautomation>=2.0.20
+Requires-Dist: uiautomator2>=3.2.5
+Requires-Dist: mangotools>=1.1.28
+Requires-Dist: adbutils~=2.8.9
+Requires-Dist: uiautodev>=0.9.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
+
+# testkit
+
+#### 介绍
+
+测试工具
+
+#### 安装教程
+
+1. pip install mangokit
+
+#### 使用说明
+
+1.  

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/enums/__init__.py

@@ -7,9 +7,7 @@ import sys
 
 from ..enums._ui_enum import ElementExpEnum, ElementOperationEnum, DeviceEnum, BrowserTypeEnum, DriveTypeEnum
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 __all__ = [
     'ElementOperationEnum',
     'DeviceEnum',

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/exceptions/__init__.py

@@ -7,8 +7,6 @@ import sys
 
 from ._exceptions import MangoAutomationError
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 
 __all__ = ['MangoAutomationError']

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/models/__init__.py

@@ -6,9 +6,7 @@ import sys
 
 from ..models._ui_model import ElementModel, ElementResultModel
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 __all__ = [
     'ElementModel',
     'ElementResultModel',

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/tools/__init__.py

@@ -8,7 +8,5 @@ import sys
 from ..tools._mate import Meta
 from ..tools._uiautodev import start_uiautodev, stop_uiautodev
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 __all__ = ['Meta', 'start_uiautodev', 'stop_uiautodev']

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/uidrive/__init__.py

@@ -9,9 +9,7 @@ from ..uidrive._base_data import BaseData
 from ..uidrive._driver_object import DriverObject
 from ..uidrive._sync_element import SyncElement
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 __all__ = [
     'AsyncElement',
     'BaseData',

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/uidrive/_async_element.py

@@ -126,7 +126,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         await self.__ope_value()
-        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         if self.drive_type == DriveTypeEnum.WEB.value:
             await self.web_action_element(
                 self.element_model.name,
@@ -147,7 +146,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         await self.__ope_value(True)
-        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = await self.web_assertion_element(
@@ -235,6 +233,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                     for f, v in self.element_data.items():
                         if f == i.f:
                             i.v = self.base_data.test_data.replace(v)
+                i.v = self.base_data.test_data.replace(i.v)
 
         except AttributeError as error:
             self.base_data.log.debug(

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/uidrive/_driver_object.py

@@ -14,7 +14,8 @@ from ..uidrive.web.sync_web._new_browser import SyncWebNewBrowser
 
 class DriverObject:
 
-    def __init__(self, is_async=False):
+    def __init__(self, log, is_async=False):
+        self.log = log
         self.is_async = is_async
         self.web: Optional[AsyncWebNewBrowser | SyncWebNewBrowser] = None
         self.android: Optional[NewAndroid] = None
@@ -41,7 +42,8 @@ class DriverObject:
                 web_h5,
                 is_header_intercept,
                 web_is_default,
-                videos_path
+                videos_path,
+                log=self.log,
             )
         else:
             self.web = SyncWebNewBrowser(
@@ -53,7 +55,8 @@ class DriverObject:
                 web_h5,
                 is_header_intercept,
                 web_is_default,
-                videos_path
+                videos_path,
+                log=self.log,
             )
 
     def set_android(self, and_equipment: str):

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/uidrive/_sync_element.py

@@ -126,7 +126,6 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         self.__ope_value()
-        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         if self.drive_type == DriveTypeEnum.WEB.value:
             self.web_action_element(
                 self.element_model.name,
@@ -147,7 +146,6 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         self.__ope_value(True)
-        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = self.web_assertion_element(
@@ -235,6 +233,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                     for f, v in self.element_data.items():
                         if f == i.f:
                             i.v = self.base_data.test_data.replace(v)
+                i.v = self.base_data.test_data.replace(i.v)
 
         except AttributeError as error:
             self.base_data.log.debug(

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/uidrive/web/async_web/_new_browser.py

@@ -35,7 +35,8 @@ class AsyncWebNewBrowser:
                  web_h5=None,
                  is_header_intercept=False,
                  web_is_default=False,
-                 videos_path=None
+                 videos_path=None,
+                 log=None,
                  ):
         self.lock = asyncio.Lock()
         self.web_type = web_type
@@ -47,6 +48,7 @@ class AsyncWebNewBrowser:
         self.web_is_default = web_is_default
         self.is_header_intercept = is_header_intercept
         self.videos_path = videos_path
+        self.log = log
         self.browser_path = ['chrome.exe', 'msedge.exe', 'firefox.exe', '苹果', '360se.exe']
         self.browser: Optional[None | Browser] = None
         self.playwright: Optional[None | Playwright] = None
@@ -61,9 +63,9 @@ class AsyncWebNewBrowser:
             context = await self.new_context()
             page = await self.new_page(context)
             return context, page
-        except Exception as error:
+        except Exception:
+            self.log.error(f'初始化page失败，错误信息：{traceback.format_exc()}')
             self.browser = None
-            print(traceback.format_exc())
             if count >= 3:
                 raise MangoAutomationError(*ERROR_MSG_0057)
             else:
@@ -82,7 +84,8 @@ class AsyncWebNewBrowser:
         if self.web_is_default:
             try:
                 return await browser.launch()
-            except Error:
+            except Error as error:
+                self.log.error(f'初始化浏览器失败-1，类型：{error}，详情：{traceback.format_exc()}')
                 raise MangoAutomationError(*ERROR_MSG_0062)
         else:
             try:
@@ -97,7 +100,8 @@ class AsyncWebNewBrowser:
                         headless=self.web_headers,
                         executable_path=self.web_path if self.web_path else self.__search_path()
                     )
-            except Error:
+            except Error as error:
+                self.log.error(f'初始化浏览器失败-2，类型：{error}，详情：{traceback.format_exc()}')
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     async def new_context(self) -> BrowserContext:
@@ -118,7 +122,8 @@ class AsyncWebNewBrowser:
             if self.is_header_intercept:
                 await page.route("**/*", self.wen_intercept_request)  # 应用拦截函数到页面的所有请求
             return page
-        except Error:
+        except Error as error:
+            self.log.error(f'初始化page失败，类型：{error}，详情：{traceback.format_exc()}')
             raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     async def close(self):

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/mangoautomation/uidrive/web/sync_web/_new_browser.py

@@ -24,7 +24,6 @@ from ....exceptions import MangoAutomationError
 from ....exceptions._error_msg import ERROR_MSG_0057, ERROR_MSG_0008, ERROR_MSG_0062, ERROR_MSG_0009, ERROR_MSG_0055
 
 
-
 class SyncWebNewBrowser:
 
     def __init__(self,
@@ -36,7 +35,8 @@ class SyncWebNewBrowser:
                  web_h5=None,
                  is_header_intercept=False,
                  web_is_default=False,
-                 videos_path=None
+                 videos_path=None,
+                 log=None,
                  ):
         self.lock = threading.Lock()
         self.web_type = web_type
@@ -48,6 +48,7 @@ class SyncWebNewBrowser:
         self.web_is_default = web_is_default
         self.videos_path = videos_path
         self.is_header_intercept = is_header_intercept
+        self.log = log
         self.browser_path = ['chrome.exe', 'msedge.exe', 'firefox.exe', '苹果', '360se.exe']
         self.browser: Optional[None | Browser] = None
         self.playwright: Optional[None | Playwright] = None
@@ -55,15 +56,16 @@ class SyncWebNewBrowser:
     def new_web_page(self, count=0) -> tuple[BrowserContext, Page]:
         if self.browser is None:
             with self.lock:
-                self.browser = self.new_browser()
-                time.sleep(1)
+                if self.browser is None:
+                    self.browser = self.new_browser()
+                    time.sleep(1)
         try:
             context = self.new_context()
             page = self.new_page(context)
             return context, page
-        except Exception as error:
+        except Exception:
+            self.log.error(f'初始化page失败，错误信息：{traceback.format_exc()}')
             self.browser = None
-            traceback.format_exc()
             if count >= 3:
                 raise MangoAutomationError(*ERROR_MSG_0057)
             else:
@@ -82,7 +84,8 @@ class SyncWebNewBrowser:
         if self.web_is_default:
             try:
                 return browser.launch()
-            except Error:
+            except Error as error:
+                self.log.error(f'初始化浏览器失败-1，类型：{error}，详情：{traceback.format_exc()}')
                 raise MangoAutomationError(*ERROR_MSG_0062)
         else:
             try:
@@ -97,7 +100,8 @@ class SyncWebNewBrowser:
                         headless=self.web_headers,
                         executable_path=self.web_path if self.web_path else self.__search_path()
                     )
-            except Error:
+            except Error as error:
+                self.log.error(f'初始化浏览器失败-2，类型：{error}，详情：{traceback.format_exc()}')
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     def new_context(self) -> BrowserContext:
@@ -118,7 +122,8 @@ class SyncWebNewBrowser:
             if self.is_header_intercept:
                 page.route("**/*", self.wen_intercept_request)  # 应用拦截函数到页面的所有请求
             return page
-        except Error:
+        except Error as error:
+            self.log.error(f'初始化page失败，类型：{error}，详情：{traceback.format_exc()}')
             raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     def close(self):

mangoautomation-1.0.56/mangoautomation.egg-info/PKG-INFO

@@ -0,0 +1,42 @@
+Metadata-Version: 2.4
+Name: mangoautomation
+Version: 1.0.56
+Summary: 测试工具
+Home-page: https://gitee.com/mao-peng/testkit
+Author: 毛鹏
+Author-email: 729164035@qq.com
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+License-File: LICENSE
+Requires-Dist: setuptools>=68.2.0
+Requires-Dist: pydantic>=2.9.2
+Requires-Dist: playwright==1.43.0
+Requires-Dist: uiautomation>=2.0.20
+Requires-Dist: uiautomator2>=3.2.5
+Requires-Dist: mangotools>=1.1.28
+Requires-Dist: adbutils~=2.8.9
+Requires-Dist: uiautodev>=0.9.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
+
+# testkit
+
+#### 介绍
+
+测试工具
+
+#### 安装教程
+
+1. pip install mangokit
+
+#### 使用说明
+
+1.  

mangoautomation-1.0.56/mangoautomation.egg-info/requires.txt

@@ -0,0 +1,8 @@
+setuptools>=68.2.0
+pydantic>=2.9.2
+playwright==1.43.0
+uiautomation>=2.0.20
+uiautomator2>=3.2.5
+mangotools>=1.1.28
+adbutils~=2.8.9
+uiautodev>=0.9.0

{mangoautomation-1.0.53 → mangoautomation-1.0.56}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = '1.0.53'
+__version__ = '1.0.56'
 
 with open("README.md", "r", encoding='utf-8') as fh:
     long_description = fh.read()
@@ -16,18 +16,21 @@ setup(
     url='https://gitee.com/mao-peng/testkit',
     packages=find_packages(),
     install_requires=[
-        'setuptools==68.2.0',
-        'pydantic==2.9.2',
+        'setuptools>=68.2.0',
+        'pydantic>=2.9.2',
         'playwright==1.43.0',
-        'uiautomation==2.0.20',
-        'uiautomator2==3.2.5',
-        'mangotools>=1.1.17',
+        'uiautomation>=2.0.20',
+        'uiautomator2>=3.2.5',
+        'mangotools>=1.1.28',
         'adbutils~=2.8.9',
-        'uiautodev==0.9.0',
+        'uiautodev>=0.9.0',
 
     ],
     classifiers=[
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ]
 )
 

mangoautomation-1.0.53/PKG-INFO

@@ -1,31 +0,0 @@
-Metadata-Version: 2.1
-Name: mangoautomation
-Version: 1.0.53
-Summary: 测试工具
-Home-page: https://gitee.com/mao-peng/testkit
-Author: 毛鹏
-Author-email: 729164035@qq.com
-Classifier: Programming Language :: Python :: 3.10
-License-File: LICENSE
-Requires-Dist: setuptools==68.2.0
-Requires-Dist: pydantic==2.9.2
-Requires-Dist: playwright==1.43.0
-Requires-Dist: uiautomation==2.0.20
-Requires-Dist: uiautomator2==3.2.5
-Requires-Dist: mangotools>=1.1.17
-Requires-Dist: adbutils~=2.8.9
-Requires-Dist: uiautodev==0.9.0
-
-# testkit
-
-#### 介绍
-
-测试工具
-
-#### 安装教程
-
-1. pip install mangokit
-
-#### 使用说明
-
-1.  

mangoautomation-1.0.53/mangoautomation.egg-info/PKG-INFO

@@ -1,31 +0,0 @@
-Metadata-Version: 2.1
-Name: mangoautomation
-Version: 1.0.53
-Summary: 测试工具
-Home-page: https://gitee.com/mao-peng/testkit
-Author: 毛鹏
-Author-email: 729164035@qq.com
-Classifier: Programming Language :: Python :: 3.10
-License-File: LICENSE
-Requires-Dist: setuptools==68.2.0
-Requires-Dist: pydantic==2.9.2
-Requires-Dist: playwright==1.43.0
-Requires-Dist: uiautomation==2.0.20
-Requires-Dist: uiautomator2==3.2.5
-Requires-Dist: mangotools>=1.1.17
-Requires-Dist: adbutils~=2.8.9
-Requires-Dist: uiautodev==0.9.0
-
-# testkit
-
-#### 介绍
-
-测试工具
-
-#### 安装教程
-
-1. pip install mangokit
-
-#### 使用说明
-
-1.  

mangoautomation-1.0.53/mangoautomation.egg-info/requires.txt

@@ -1,8 +0,0 @@
-setuptools==68.2.0
-pydantic==2.9.2
-playwright==1.43.0
-uiautomation==2.0.20
-uiautomator2==3.2.5
-mangotools>=1.1.17
-adbutils~=2.8.9
-uiautodev==0.9.0