From: Kenneth Reitz <me@kennethreitz.org>
Date: Mon, 12 May 2014 19:04:35 +0000 (-0400)
Subject: Merge pull request #1937 from jaraco/master
X-Git-Tag: v2.3.0~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=569cd23c006f54b526061b282c7bab2e7ec1638a;p=services%2Fpython-requests.git

Merge pull request #1937 from jaraco/master

Improved decoding support for Response.iter_content and iter_lines
---

569cd23c006f54b526061b282c7bab2e7ec1638a
diff --cc test_requests.py
index 55e7a3d,65eb571..a1df1f1
--- a/test_requests.py
+++ b/test_requests.py
@@@ -8,8 -8,8 +8,9 @@@ import jso
  import os
  import pickle
  import unittest
 +import collections
  
+ import io
  import requests
  import pytest
  from requests.adapters import HTTPAdapter