Merge branch 'release/1.5.0'

Author: vmalloc

.gitignore

@@ -1,6 +1,7 @@
 *.pyc
 .vagrant
 *.egg-info
+.eggs
 build
 .tox
 flycheck-*

.pylintrc

@@ -0,0 +1,8 @@
+[MESSAGES CONTROL]
+disable= R,attribute-defined-outside-init,bad-continuation,bad-option-value,bare-except,invalid-name,locally-disabled,missing-docstring,redefined-builtin,ungrouped-imports,wrong-import-order,wrong-import-position,unnecessary-pass,global-statement
+
+[REPORTS]
+reports=no
+
+[FORMAT]
+max-line-length=150

.travis.yml

@@ -19,3 +19,4 @@ deploy:
     tags: true
     python: '3.6'
     repo: vmalloc/Flask-Loopback
+    python: "3.6"

Makefile

@@ -1,13 +1,12 @@
 default: test
 
 test: env
-	.env/bin/py.test tests
+	.env/bin/pytest tests
+	.env/bin/pylint --rcfile .pylintrc flask_loopback tests setup.py
 
 env: .env/.up-to-date
 
 .env/.up-to-date: setup.py Makefile
 	python -m virtualenv .env
-	.env/bin/pip install -e .
-	.env/bin/pip install pytest
+	.env/bin/pip install -e ".[testing]"
 	touch $@
-

README.md

@@ -1,4 +1,4 @@
-![Build Status] (https://secure.travis-ci.org/vmalloc/Flask-Loopback.png )   ![Version] (https://img.shields.io/pypi/v/Flask-Loopback.svg )
+![Build Status](https://secure.travis-ci.org/vmalloc/Flask-Loopback.png)   ![Version](https://img.shields.io/pypi/v/Flask-Loopback.svg)
 
 Overview
 ========

flask_loopback/__version__.py

@@ -1 +1,3 @@
-__version__ = "1.4.7"
+import pkg_resources
+
+__version__ = pkg_resources.get_distribution('Flask-Loopback').version

flask_loopback/_compat.py

@@ -1,3 +1,4 @@
+# pylint: disable=import-error,unused-import
 from contextlib import contextmanager
 import gzip
 import sys

flask_loopback/flask_loopback.py

@@ -2,7 +2,9 @@
 from contextlib import contextmanager
 
 import requests
+import six
 from requests.cookies import MockRequest
+from urllib3 import HTTPResponse
 
 from . import dispatch
 from ._compat import httplib, iteritems, gzip_decompress
@@ -23,6 +25,29 @@ def __init__(self, request, code):
         self.response.request = request
 
 
+class _IOReader(six.BytesIO):
+    """A reader that makes a BytesIO look like a HTTPResponse.
+    A HTTPResponse will return an empty string when you read from it after
+    the socket has been closed. A BytesIO will raise a ValueError. For
+    compatibility we want to do the same thing a HTTPResponse does.
+    """
+
+    def read(self, *args, **kwargs):  # pylint: disable=arguments-differ
+        if self.closed:
+            return six.b('')
+
+        # not a new style object in python 2
+        result = six.BytesIO.read(self, *args, **kwargs)
+
+        # when using resp.iter_content(None) it'll go through a different
+        # request path in urllib3. This path checks whether the object is
+        # marked closed instead of the return value. see gh124.
+        if result == six.b(''):
+            self.close()
+
+        return result
+
+
 class FlaskLoopback(object):
 
     def __init__(self, flask_app):
@@ -72,12 +97,12 @@ def handle_request(self, session, url, request):
         with ExitStack() as stack:
             for handler in self._request_context_handlers:
                 try:
-                    stack.enter_context(handler(request))
+                    stack.enter_context(handler(request))  # pylint: disable=no-member
                 except CustomHTTPResponse as e:
                     return e.response
 
             self._test_client.cookie_jar.clear()
-            for cookie in request._cookies:
+            for cookie in request._cookies:  # pylint: disable=protected-access
                 self._test_client.cookie_jar.set_cookie(cookie)
             resp = self._test_client.open(path, **open_kwargs)
             returned = requests.Response()
@@ -89,8 +114,16 @@ def handle_request(self, session, url, request):
             resp_data = resp.get_data()
             if resp.headers.get('content-encoding') == 'gzip':
                 resp_data = gzip_decompress(resp_data)
-            returned._content = resp_data # pylint: disable=protected-access
+            returned._content = resp_data  # pylint: disable=protected-access
             returned.headers.update(resp.headers.items())
+            returned.raw = HTTPResponse(
+                status=returned.status_code,
+                reason=returned.reason,
+                headers=returned.headers,
+                body=_IOReader(resp_data) or _IOReader(six.b('')),
+                decode_content=False,
+                preload_content=False,
+            )
             self._extract_cookies(session, request, resp, returned)
             return returned
 
@@ -122,8 +155,9 @@ def get_all(self, name, default=None):
 
 _hostname = None
 
+
 def _get_hostname():
-    global _hostname            # pylint: disable=global-statement
+    global _hostname  # pylint: disable=global-statement
     if _hostname is None:
         _hostname = socket.getfqdn()
     return _hostname

requirements.txt

@@ -0,0 +1,6 @@
+requests
+Flask
+URLObject
+
+unittest2; python_version<'2.7'
+contextlib2; python_version<'3.3'

setup.cfg

@@ -0,0 +1,26 @@
+[metadata]
+name = Flask-Loopback
+classifiers =
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+summary = Library for faking HTTP requests using flask applications without actual network operations
+description-file =
+    README.md
+description-content-type = text/markdown
+license = BSD3
+author = Rotem Yaari
+author_email = vmalloc@gmail.com
+url = https://github.com/vmalloc/flask-loopback
+
+[extras]
+testing =
+    pytest
+    astroid~=1.5.3; python_version=='2.7'
+    astroid>=2.0; python_version >= '3.4'
+    pylint~=1.7.2; python_version=='2.7'
+    pylint~=2.3.1; python_version >= '3.4'
+
+[tool:pytest]
+testpaths = tests