From 26904cf83604fcacd5ec32a4338bd1edd983ff46 Mon Sep 17 00:00:00 2001
From: chenyongzhiaaron <262667641@qq.com>
Date: Fri, 25 Aug 2023 14:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A9=E5=90=8E=E7=BD=AE=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=94=99=E8=AF=AF=E7=9B=B4=E6=8E=A5=E6=8A=9B?=
 =?UTF-8?q?=E5=87=BA=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=AE=A9=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E5=8F=98=E6=88=90=E5=A4=B1=E8=B4=A5=E7=9A=84=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/utils/action.py     | 5 +----
 common/utils/exceptions.py | 1 -
 debug/pm.py                | 6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/common/utils/action.py b/common/utils/action.py
index ec2eb78..f04485d 100644
--- a/common/utils/action.py
+++ b/common/utils/action.py
@@ -96,12 +96,9 @@ class Action(Extractor, LoadScript, Validator):
                 ast_obj = ast.parse(code, mode='exec')
                 compiled = compile(ast_obj, '<string>', 'exec')
                 exec(compiled, {"pm": self})
-            except SyntaxError as e:
-                ExecuteDynamiCodeError(code, e)
-            except TypeError as e:
-                ExecuteDynamiCodeError(code, e)
             except Exception as e:
                 ExecuteDynamiCodeError(code, e)
+                raise e
 
         return self.variables
 
diff --git a/common/utils/exceptions.py b/common/utils/exceptions.py
index 7b81164..a193a2b 100644
--- a/common/utils/exceptions.py
+++ b/common/utils/exceptions.py
@@ -77,7 +77,6 @@ class ExecuteDynamiCodeError(MyBaseException):
 
     def __init__(self, code_info, reason):
         msg = f"执行动态代码异常：动态代码信息={code_info}, 原因={reason}"
-        print(msg)
         super().__init__(msg)
         self.logger.error(msg)
 
diff --git a/debug/pm.py b/debug/pm.py
index 2bc1b71..6d092d2 100644
--- a/debug/pm.py
+++ b/debug/pm.py
@@ -3,7 +3,7 @@ import json
 
 
 def setup(pm):
-    print("pm---------------->", pm.variables())
+    print("pm---------------->", pm.variables)
     # request_data = pm.get_variables()  # 获取得到请求数据
     """
     request_data 的值:  {'Url': '/login',
@@ -14,7 +14,7 @@ def setup(pm):
        'Expected': None, 'Response': '', 'Assertion': '', 'Error Log': ''
        }
     """
-    request = pm.variables()
+    request = pm.variables
     email = json.loads(request.get("Request Data")).get("email")
     pm.update_environments("email", email)  # 设置环境变量
     print("---->pm.get_environments", pm.get_environments("{{email}}"))
@@ -26,7 +26,7 @@ setup(pm)
 # 后置脚本代码
 def tear_down(pm):
     # vars_data = pm.get_environments("{{变量名称}}")  # 获取环境变量
-    response = pm.variables()  # 获取得到响应结果对象
+    response = pm.variables  # 获取得到响应结果对象
     response.json()
     # print(f"请求地址 --> {response.request.url}")
     # print(f"请求头 --> {response.request.headers}")