From 88cd4405355b94e48c2cb281e168df7d58618463 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Mon, 28 Dec 2015 22:14:33 +0000 Subject: [PATCH] Fix handling of empty script name This was revealed through testing with gabbi (to see if the new Interceptor will work there). --- docs/interceptor.rst | 2 +- test/test_interceptor.py | 2 +- wsgi_intercept/__init__.py | 2 +- wsgi_intercept/interceptor.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/interceptor.rst b/docs/interceptor.rst index ff974fe..c6681dd 100644 --- a/docs/interceptor.rst +++ b/docs/interceptor.rst @@ -7,7 +7,7 @@ Interceptor Example using `httplib2`, others are much the same: -.. testcode:: +.. testcode:: import httplib2 from wsgi_intercept.interceptor import Httplib2Interceptor diff --git a/test/test_interceptor.py b/test/test_interceptor.py index f3db2d8..5cd84c8 100644 --- a/test/test_interceptor.py +++ b/test/test_interceptor.py @@ -101,7 +101,7 @@ def test_httplib2_interceptor_https_host(): port = 443 http = Http() with Httplib2Interceptor(app=app, host=hostname, port=port) as url: - assert url == 'https://%s/' % hostname + assert url == 'https://%s' % hostname response, content = http.request(url) assert response.status == 200 assert 'WSGI intercept successful!' in content.decode('utf-8') diff --git a/wsgi_intercept/__init__.py b/wsgi_intercept/__init__.py index 37f038f..0697710 100644 --- a/wsgi_intercept/__init__.py +++ b/wsgi_intercept/__init__.py @@ -117,7 +117,7 @@ Additional documentation is available on `Read The Docs`_. """ from __future__ import print_function -__version__ = '0.10.3' +__version__ = '0.99.0' import sys diff --git a/wsgi_intercept/interceptor.py b/wsgi_intercept/interceptor.py index 6ead07a..1d99349 100644 --- a/wsgi_intercept/interceptor.py +++ b/wsgi_intercept/interceptor.py @@ -31,7 +31,7 @@ class Interceptor(object): else: self.host = host self.port = int(port) - self.script_name = prefix or '/' + self.script_name = prefix or '' self.url = self._url_from_primitives() self._module = import_module('.%s' % self.MODULE_NAME,