diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-08-31 01:31:14 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-08-31 01:31:14 +0200 |
| commit | 8d647739c3fab9f260c6ac7a8f81ec9fadfe7f6d (patch) | |
| tree | beac1b3c358fe463f53a60474981ebda3405e758 | |
| parent | 198d3c88a3fde4bbf5f2b18d55853ea78c79eb17 (diff) | |
| parent | e9a838ae53a9388bc6695721cd2d446e750e64c6 (diff) | |
| download | mitmproxy-8d647739c3fab9f260c6ac7a8f81ec9fadfe7f6d.tar.gz mitmproxy-8d647739c3fab9f260c6ac7a8f81ec9fadfe7f6d.tar.bz2 mitmproxy-8d647739c3fab9f260c6ac7a8f81ec9fadfe7f6d.zip | |
Merge branch 'master' into dist
Conflicts:
requirements.txt
setup.py
| -rw-r--r-- | setup.py | 5 | ||||
| -rw-r--r-- | test/test_test.py | 12 |
2 files changed, 9 insertions, 8 deletions
@@ -65,8 +65,9 @@ def findPackages(path, dataExclude=[]): package_data[module] = acc return packages, package_data +with open("README.txt", "rb") as f: + long_description = f.read() -long_description = file("README.txt", "rb").read() packages, package_data = findPackages("libpathod") setup( name="pathod", @@ -93,7 +94,7 @@ setup( ], install_requires=[ 'netlib>=%s' % version.MINORVERSION, - "requests>=1.1.0", + "requests>=2.4.0", "Flask>=0.10.1" ], extras_require={ diff --git a/test/test_test.py b/test/test_test.py index 753d26f7..d26ce07b 100644 --- a/test/test_test.py +++ b/test/test_test.py @@ -1,8 +1,8 @@ -import time, logging +import logging import requests -from libpathod import test, utils +from libpathod import test import tutils - +from requests.packages.urllib3.exceptions import ProtocolError logging.disable(logging.CRITICAL) class TestDaemonManual: @@ -11,7 +11,7 @@ class TestDaemonManual: rsp = requests.get("http://localhost:%s/p/202:da"%d.port) assert rsp.ok assert rsp.status_code == 202 - tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port) + tutils.raises(ProtocolError, requests.get, "http://localhost:%s/p/202:da"%d.port) def test_startstop_ssl(self): d = test.Daemon(ssl=True) @@ -19,7 +19,7 @@ class TestDaemonManual: assert rsp.ok assert rsp.status_code == 202 d.shutdown() - tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port) + tutils.raises(ProtocolError, requests.get, "http://localhost:%s/p/202:da"%d.port) def test_startstop_ssl_explicit(self): ssloptions = dict( @@ -32,6 +32,6 @@ class TestDaemonManual: assert rsp.ok assert rsp.status_code == 202 d.shutdown() - tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202:da"%d.port) + tutils.raises(ProtocolError, requests.get, "http://localhost:%s/p/202:da"%d.port) |