From 47ee7770853c63bdf2fedd5838f220c5ddf672bd Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Thu, 30 Jul 2020 11:40:32 +0800
Subject: [PATCH] fix: pickle BufferedReader TypeError in upload feature

---
 docs/CHANGELOG.md   | 1 +
 httprunner/utils.py | 2 +-
 tests/make_test.py  | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e375d384..80c55d9e 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - fix: parameters feature with custom functions
 - fix: request json field with variable reference
+- fix: pickle BufferedReader TypeError in upload feature
 
 ## 3.1.3 (2020-07-06)
 
diff --git a/httprunner/utils.py b/httprunner/utils.py
index 277cb81b..feb10283 100644
--- a/httprunner/utils.py
+++ b/httprunner/utils.py
@@ -207,7 +207,7 @@ def merge_variables(
 
         step_new_variables[key] = value
 
-    merged_variables = copy.deepcopy(variables_to_be_overridden)
+    merged_variables = copy.copy(variables_to_be_overridden)
     merged_variables.update(step_new_variables)
     return merged_variables
 
diff --git a/tests/make_test.py b/tests/make_test.py
index 7cf56e3d..934feadb 100644
--- a/tests/make_test.py
+++ b/tests/make_test.py
@@ -218,7 +218,12 @@ from request_methods.request_with_functions_test import (
     def test_make_requests_with_json_chain_style(self):
         step = {
             "name": "get with params",
-            "variables": {"foo1": "bar1", "foo2": 123, "sum_v": "${sum_two(1, 2)}","myjson":{"name": "user", "password": "123456"}},
+            "variables": {
+                "foo1": "bar1",
+                "foo2": 123,
+                "sum_v": "${sum_two(1, 2)}",
+                "myjson": {"name": "user", "password": "123456"},
+            },
             "request": {
                 "method": "GET",
                 "url": "/get",