summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Falcão <gabriel@nacaolivre.org>2015-07-29 11:08:59 -0400
committerGabriel Falcão <gabriel@nacaolivre.org>2015-07-29 11:08:59 -0400
commit911addeab8fcd0512e201319529a8e2207edba11 (patch)
treea64e82166c19183173e45d907c432c9484e90c59
parent90d9cf20bf39f01dc0295091af195c26d562c63d (diff)
parent830e33826c1820a79fc100535500a19e8518bd2e (diff)
downloadhttpretty-merging-prs.tar.gz
Merge branch 'EvaSDK-178-free-urllib3-requirement'merging-prs
-rw-r--r--httpretty/core.py2
-rw-r--r--requirements.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/httpretty/core.py b/httpretty/core.py
index 8f05c69..5ad0952 100644
--- a/httpretty/core.py
+++ b/httpretty/core.py
@@ -590,7 +590,7 @@ class Entry(BaseClass):
if self.body_is_callable:
status, headers, self.body = self.callable_body(self.request, self.info.full_url(), headers)
headers.update({
- 'content-length': len(self.body)
+ 'content-length': str(len(self.body)),
})
string_list = [
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..1b77c9e
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+urllib3 >=1.7.1, <2