orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed various issues on the Python 3 port

Browse source
This commit is contained in:
Armin Ronacher 2013-05-30 15:07:18 +01:00
parent 8aaf302586
commit abc1505196
3 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flask/testing.py
View file

@ -13,7 +13,11 @@
from contextlib import contextmanager
from werkzeug.test import Client, EnvironBuilder
from flask import _request_ctx_stack
from ._compat import urlparse
try:
from werkzeug.urls import url_parse
except ImportError:
from urlparse import urlsplit as url_parse
def make_test_environ_builder(app, path='/', base_url=None, *args, **kwargs):
@ -21,7 +25,7 @@ def make_test_environ_builder(app, path='/', base_url=None, *args, **kwargs):
http_host = app.config.get('SERVER_NAME')
app_root = app.config.get('APPLICATION_ROOT')
if base_url is None:
url = urlparse(path)
url = url_parse(path)
base_url = 'http://%s/' % (url.netloc or http_host or 'localhost')
if app_root:
base_url += app_root.lstrip('/')