many pep8 improvements
This commit is contained in:
mdipierro committed
1 parent
71ec15190b
commit
6aa5edc7ff
117 files changed
+7160
-5670
No files matched your search
+172
-91
@@ -10,9 +10,9 @@ import tempfile
|
||||
import logging
|
||||
|
||||
if os.path.isdir('gluon'):
|
||||
sys.path.append(os.path.realpath('gluon')) # running from web2py base
|
||||
sys.path.append(os.path.realpath('gluon')) # running from web2py base
|
||||
else:
|
||||
sys.path.append(os.path.realpath('../')) # running from gluon/tests/
|
||||
sys.path.append(os.path.realpath('../')) # running from gluon/tests/
|
||||
os.environ['web2py_path'] = os.path.realpath('../../') # for settings
|
||||
|
||||
from rewrite import load, filter_url, filter_err, get_effective_router, regex_filter_out, regex_select
|
||||
@@ -26,6 +26,7 @@ logger = None
|
||||
oldcwd = None
|
||||
root = None
|
||||
|
||||
|
||||
def setUpModule():
|
||||
def make_apptree():
|
||||
"build a temporary applications tree"
|
||||
@@ -39,13 +40,16 @@ def setUpModule():
|
||||
os.mkdir(abspath('applications', app, subdir))
|
||||
# applications/admin/controllers/*.py
|
||||
for ctr in ('appadmin', 'default', 'gae', 'mercurial', 'shell', 'wizard'):
|
||||
open(abspath('applications', 'admin', 'controllers', '%s.py' % ctr), 'w').close()
|
||||
open(abspath('applications', 'admin',
|
||||
'controllers', '%s.py' % ctr), 'w').close()
|
||||
# applications/examples/controllers/*.py
|
||||
for ctr in ('ajax_examples', 'appadmin', 'default', 'global', 'spreadsheet'):
|
||||
open(abspath('applications', 'examples', 'controllers', '%s.py' % ctr), 'w').close()
|
||||
open(abspath('applications', 'examples',
|
||||
'controllers', '%s.py' % ctr), 'w').close()
|
||||
# applications/welcome/controllers/*.py
|
||||
for ctr in ('appadmin', 'default'):
|
||||
open(abspath('applications', 'welcome', 'controllers', '%s.py' % ctr), 'w').close()
|
||||
open(abspath('applications', 'welcome',
|
||||
'controllers', '%s.py' % ctr), 'w').close()
|
||||
# create an app-specific routes.py for examples app
|
||||
routes = open(abspath('applications', 'examples', 'routes.py'), 'w')
|
||||
routes.write("default_function='exdef'\n")
|
||||
@@ -55,7 +59,8 @@ def setUpModule():
|
||||
if oldcwd is None: # do this only once
|
||||
oldcwd = os.getcwd()
|
||||
if not os.path.isdir('gluon'):
|
||||
os.chdir(os.path.realpath('../../')) # run from web2py base directory
|
||||
os.chdir(os.path.realpath(
|
||||
'../../')) # run from web2py base directory
|
||||
import main # for initialization after chdir
|
||||
global logger
|
||||
logger = logging.getLogger('web2py.rewrite')
|
||||
@@ -64,6 +69,7 @@ def setUpModule():
|
||||
root = global_settings.applications_parent
|
||||
make_apptree()
|
||||
|
||||
|
||||
def tearDownModule():
|
||||
global oldcwd
|
||||
if oldcwd is not None:
|
||||
@@ -78,16 +84,26 @@ class TestRoutes(unittest.TestCase):
|
||||
""" Tests a null routes table """
|
||||
load(data='')
|
||||
# incoming
|
||||
self.assertEqual(filter_url('http://domain.com'), '/init/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/'), '/init/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/abc'), '/abc/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/abc/'), '/abc/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/abc/def'), "/abc/def/index")
|
||||
self.assertEqual(filter_url('http://domain.com/abc/def/'), "/abc/def/index")
|
||||
self.assertEqual(filter_url('http://domain.com/abc/def/ghi'), "/abc/def/ghi")
|
||||
self.assertEqual(filter_url('http://domain.com/abc/def/ghi/'), "/abc/def/ghi")
|
||||
self.assertEqual(filter_url('http://domain.com/abc/def/ghi/jkl'), "/abc/def/ghi ['jkl']")
|
||||
self.assertEqual(filter_url('http://domain.com/abc/def/ghi/j%20kl'), "/abc/def/ghi ['j_kl']")
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com'), '/init/default/index')
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/'), '/init/default/index')
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/abc'), '/abc/default/index')
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/abc/'), '/abc/default/index')
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/abc/def'), "/abc/def/index")
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/abc/def/'), "/abc/def/index")
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/abc/def/ghi'), "/abc/def/ghi")
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/abc/def/ghi/'), "/abc/def/ghi")
|
||||
self.assertEqual(filter_url(
|
||||
'http://domain.com/abc/def/ghi/jkl'), "/abc/def/ghi ['jkl']")
|
||||
self.assertEqual(filter_url(
|
||||
'http://domain.com/abc/def/ghi/j%20kl'), "/abc/def/ghi ['j_kl']")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static'), "%s/applications/welcome/static/path/to/static" % root)
|
||||
self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/st~tic')
|
||||
try:
|
||||
@@ -96,9 +112,11 @@ class TestRoutes(unittest.TestCase):
|
||||
except AttributeError:
|
||||
pass
|
||||
# outgoing
|
||||
self.assertEqual(filter_url('http://domain.com/init/default/index', out=True), '/init/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/init/default/index',
|
||||
out=True), '/init/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/init/default/index/arg1', out=True), '/init/default/index/arg1')
|
||||
self.assertEqual(filter_url('http://domain.com/init/default/abc', out=True), '/init/default/abc')
|
||||
self.assertEqual(filter_url('http://domain.com/init/default/abc',
|
||||
out=True), '/init/default/abc')
|
||||
|
||||
def test_routes_query(self):
|
||||
""" Test query appending """
|
||||
@@ -125,8 +143,10 @@ routes_app = [
|
||||
]
|
||||
'''
|
||||
load(data=data)
|
||||
self.assertEqual(filter_url('http://domain.com/welcome'), '/welcome/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/examples'), '/examples/default/exdef')
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome'), '/welcome/default/index')
|
||||
self.assertEqual(filter_url(
|
||||
'http://domain.com/examples'), '/examples/default/exdef')
|
||||
|
||||
def test_routes_defapp(self):
|
||||
""" Test the default-application function """
|
||||
@@ -135,12 +155,17 @@ default_application = 'defapp'
|
||||
'''
|
||||
load(data=data)
|
||||
# incoming
|
||||
self.assertEqual(filter_url('http://domain.com'), '/defapp/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/'), '/defapp/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/welcome'), '/welcome/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/app'), '/app/default/index')
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com'), '/defapp/default/index')
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/'), '/defapp/default/index')
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome'), '/welcome/default/index')
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/app'), '/app/default/index')
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/index/abc'), "/welcome/default/index ['abc']")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/static/abc'), '%s/applications/welcome/static/abc' % root)
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/static/abc'),
|
||||
'%s/applications/welcome/static/abc' % root)
|
||||
self.assertEqual(filter_url('http://domain.com/defapp/static/path/to/static'), "%s/applications/defapp/static/path/to/static" % root)
|
||||
|
||||
def test_routes_raise(self):
|
||||
@@ -149,15 +174,21 @@ default_application = 'defapp'
|
||||
'''
|
||||
# test non-exception variants
|
||||
load(data='')
|
||||
self.assertEqual(filter_url('http://domain.com/init'), "/init/default/index")
|
||||
self.assertEqual(filter_url('http://domain.com/init/default'), "/init/default/index")
|
||||
self.assertEqual(filter_url('http://domain.com/init/default/fcn.ext'), "/init/default/fcn.ext")
|
||||
self.assertEqual(filter_url('http://domain.com/init/default/fcn/arg'), "/init/default/fcn ['arg']")
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/init'), "/init/default/index")
|
||||
self.assertEqual(filter_url(
|
||||
'http://domain.com/init/default'), "/init/default/index")
|
||||
self.assertEqual(filter_url('http://domain.com/init/default/fcn.ext'),
|
||||
"/init/default/fcn.ext")
|
||||
self.assertEqual(filter_url('http://domain.com/init/default/fcn/arg'),
|
||||
"/init/default/fcn ['arg']")
|
||||
# now raise-HTTP variants
|
||||
self.assertRaises(HTTP, filter_url, 'http://domain.com/bad!ctl')
|
||||
self.assertRaises(HTTP, filter_url, 'http://domain.com/ctl/bad!fcn')
|
||||
self.assertRaises(HTTP, filter_url, 'http://domain.com/ctl/fcn.bad!ext')
|
||||
self.assertRaises(HTTP, filter_url, 'http://domain.com/ctl/fcn/bad!arg')
|
||||
self.assertRaises(
|
||||
HTTP, filter_url, 'http://domain.com/ctl/fcn.bad!ext')
|
||||
self.assertRaises(
|
||||
HTTP, filter_url, 'http://domain.com/ctl/fcn/bad!arg')
|
||||
try:
|
||||
# 2.7+ only
|
||||
self.assertRaisesRegexp(HTTP, '400 BAD REQUEST \[invalid path\]', filter_url, 'http://domain.com/init/bad!ctl')
|
||||
@@ -167,7 +198,8 @@ default_application = 'defapp'
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/fcn_1'), "/welcome/default/fcn_1")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/fcn_1'),
|
||||
"/welcome/default/fcn_1")
|
||||
#self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/default/fcn-1')
|
||||
#try:
|
||||
# # 2.7+ only
|
||||
@@ -194,17 +226,26 @@ default_application = 'defapp'
|
||||
('/favicon.ico', '/welcome/static/favicon.ico'),
|
||||
('/admin$anything', '/admin$anything'),
|
||||
('.*:https?://(.*\\.)?domain1.com:$method /', '/app1/default'),
|
||||
('.*:https?://(.*\\.)?domain1.com:$method /static/$anything', '/app1/static/$anything'),
|
||||
('.*:https?://(.*\\.)?domain1.com:$method /appadmin/$anything', '/app1/appadmin/$anything'),
|
||||
('.*:https?://(.*\\.)?domain1.com:$method /$anything', '/app1/default/$anything'),
|
||||
('.*:https?://(.*\\.)?domain1.com:$method /static/$anything',
|
||||
'/app1/static/$anything'),
|
||||
('.*:https?://(.*\\.)?domain1.com:$method /appadmin/$anything',
|
||||
'/app1/appadmin/$anything'),
|
||||
('.*:https?://(.*\\.)?domain1.com:$method /$anything',
|
||||
'/app1/default/$anything'),
|
||||
('.*:https?://(.*\\.)?domain2.com:$method /', '/app2/default'),
|
||||
('.*:https?://(.*\\.)?domain2.com:$method /static/$anything', '/app2/static/$anything'),
|
||||
('.*:https?://(.*\\.)?domain2.com:$method /appadmin/$anything', '/app2/appadmin/$anything'),
|
||||
('.*:https?://(.*\\.)?domain2.com:$method /$anything', '/app2/default/$anything'),
|
||||
('.*:https?://(.*\\.)?domain2.com:$method /static/$anything',
|
||||
'/app2/static/$anything'),
|
||||
('.*:https?://(.*\\.)?domain2.com:$method /appadmin/$anything',
|
||||
'/app2/appadmin/$anything'),
|
||||
('.*:https?://(.*\\.)?domain2.com:$method /$anything',
|
||||
'/app2/default/$anything'),
|
||||
('.*:https?://(.*\\.)?domain3.com:$method /', '/app3/defcon3'),
|
||||
('.*:https?://(.*\\.)?domain3.com:$method /static/$anything', '/app3/static/$anything'),
|
||||
('.*:https?://(.*\\.)?domain3.com:$method /appadmin/$anything', '/app3/appadmin/$anything'),
|
||||
('.*:https?://(.*\\.)?domain3.com:$method /$anything', '/app3/defcon3/$anything'),
|
||||
('.*:https?://(.*\\.)?domain3.com:$method /static/$anything',
|
||||
'/app3/static/$anything'),
|
||||
('.*:https?://(.*\\.)?domain3.com:$method /appadmin/$anything',
|
||||
'/app3/appadmin/$anything'),
|
||||
('.*:https?://(.*\\.)?domain3.com:$method /$anything',
|
||||
'/app3/defcon3/$anything'),
|
||||
('/', '/welcome/default'),
|
||||
('/welcome/default/$anything', '/welcome/default/$anything'),
|
||||
('/welcome/$anything', '/welcome/default/$anything'),
|
||||
@@ -228,47 +269,69 @@ routes_out = [
|
||||
]
|
||||
'''
|
||||
load(data=data)
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1'),
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome/default/f/arg1'),
|
||||
"/welcome/default/f ['arg1']")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1/'),
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome/default/f/arg1/'),
|
||||
"/welcome/default/f ['arg1']")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//'),
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome/default/f/arg1//'),
|
||||
"/welcome/default/f ['arg1', '']")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/f//arg1'),
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome/default/f//arg1'),
|
||||
"/welcome/default/f ['', 'arg1']")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1/arg2'),
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome/default/f/arg1/arg2'),
|
||||
"/welcome/default/f ['arg1', 'arg2']")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//arg2'),
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome/default/f/arg1//arg2'),
|
||||
"/welcome/default/f ['arg1', '', 'arg2']")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//arg3/'),
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome/default/f/arg1//arg3/'),
|
||||
"/welcome/default/f ['arg1', '', 'arg3']")
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//arg3//'),
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome/default/f/arg1//arg3//'),
|
||||
"/welcome/default/f ['arg1', '', 'arg3', '']")
|
||||
|
||||
self.assertEqual(filter_url('http://domain.com/welcome/default/f', out=True), "/f")
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/welcome/default/f', out=True), "/f")
|
||||
self.assertEqual(regex_filter_out('/welcome/default/f'), "/f")
|
||||
self.assertEqual(str(URL(a='welcome', c='default', f='f', args=None)), "/f")
|
||||
self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['arg1'])), "/f/arg1")
|
||||
self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['arg1', ''])), "/f/arg1//")
|
||||
self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['arg1', '', 'arg3'])), "/f/arg1//arg3")
|
||||
self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['ar g'])), "/f/ar%20g")
|
||||
self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['årg'])), "/f/%C3%A5rg")
|
||||
self.assertEqual(str(URL(a='welcome', c='default', f='fünc')), "/f\xc3\xbcnc")
|
||||
self.assertEqual(
|
||||
str(URL(a='welcome', c='default', f='f', args=None)), "/f")
|
||||
self.assertEqual(str(
|
||||
URL(a='welcome', c='default', f='f', args=['arg1'])), "/f/arg1")
|
||||
self.assertEqual(str(URL(
|
||||
a='welcome', c='default', f='f', args=['arg1', ''])), "/f/arg1//")
|
||||
self.assertEqual(str(URL(a='welcome', c='default', f='f',
|
||||
args=['arg1', '', 'arg3'])), "/f/arg1//arg3")
|
||||
self.assertEqual(str(
|
||||
URL(a='welcome', c='default', f='f', args=['ar g'])), "/f/ar%20g")
|
||||
self.assertEqual(str(URL(
|
||||
a='welcome', c='default', f='f', args=['årg'])), "/f/%C3%A5rg")
|
||||
self.assertEqual(
|
||||
str(URL(a='welcome', c='default', f='fünc')), "/f\xc3\xbcnc")
|
||||
|
||||
def test_routes_anchor(self):
|
||||
'''
|
||||
Test URL with anchor
|
||||
'''
|
||||
self.assertEqual(str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
|
||||
self.assertEqual(
|
||||
str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
|
||||
load(data='')
|
||||
self.assertEqual(str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
|
||||
self.assertEqual(
|
||||
str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
|
||||
args = ['a1', 'a2']
|
||||
self.assertEqual(str(URL(a='a', c='c', f='f', args=args, anchor='anchor')),
|
||||
self.assertEqual(
|
||||
str(URL(a='a', c='c', f='f', args=args, anchor='anchor')),
|
||||
"/a/c/f/a1/a2#anchor")
|
||||
vars = dict(v1=1, v2=2)
|
||||
self.assertEqual(str(URL(a='a', c='c', f='f', vars=vars, anchor='anchor')),
|
||||
self.assertEqual(
|
||||
str(URL(a='a', c='c', f='f', vars=vars, anchor='anchor')),
|
||||
"/a/c/f?v1=1&v2=2#anchor")
|
||||
self.assertEqual(str(URL(a='a', c='c', f='f', args=args, vars=vars, anchor='anchor')),
|
||||
self.assertEqual(
|
||||
str(URL(
|
||||
a='a', c='c', f='f', args=args, vars=vars, anchor='anchor')),
|
||||
"/a/c/f/a1/a2?v1=1&v2=2#anchor")
|
||||
|
||||
data = r'''routes_out = [
|
||||
@@ -276,8 +339,9 @@ routes_out = [
|
||||
]'''
|
||||
load(data=data)
|
||||
self.assertEqual(str(URL(a='init', c='default', f='index')),
|
||||
"/")
|
||||
self.assertEqual(str(URL(a='init', c='default', f='index', anchor='anchor')),
|
||||
"/")
|
||||
self.assertEqual(
|
||||
str(URL(a='init', c='default', f='index', anchor='anchor')),
|
||||
"/init/default/index#anchor")
|
||||
|
||||
data = r'''routes_out = [
|
||||
@@ -285,8 +349,9 @@ routes_out = [
|
||||
]'''
|
||||
load(data=data)
|
||||
self.assertEqual(str(URL(a='init', c='default', f='index')),
|
||||
"/")
|
||||
self.assertEqual(str(URL(a='init', c='default', f='index', anchor='anchor')),
|
||||
"/")
|
||||
self.assertEqual(
|
||||
str(URL(a='init', c='default', f='index', anchor='anchor')),
|
||||
"/#anchor")
|
||||
|
||||
data = r'''routes_out = [
|
||||
@@ -294,13 +359,17 @@ routes_out = [
|
||||
]'''
|
||||
load(data=data)
|
||||
self.assertEqual(str(URL(a='init', c='default', f='index')),
|
||||
"/")
|
||||
self.assertEqual(str(URL(a='init', c='default', f='index', anchor='anchor')),
|
||||
"/")
|
||||
self.assertEqual(
|
||||
str(URL(a='init', c='default', f='index', anchor='anchor')),
|
||||
"/#anchor")
|
||||
query = dict(var='abc')
|
||||
self.assertEqual(str(URL(a='init', c='default', f='index', vars=query)),
|
||||
self.assertEqual(
|
||||
str(URL(a='init', c='default', f='index', vars=query)),
|
||||
"/?var=abc")
|
||||
self.assertEqual(str(URL(a='init', c='default', f='index', vars=query, anchor='anchor')),
|
||||
self.assertEqual(
|
||||
str(URL(a='init', c='default', f='index',
|
||||
vars=query, anchor='anchor')),
|
||||
"/?var=abc#anchor")
|
||||
|
||||
def test_routes_absolute(self):
|
||||
@@ -311,37 +380,46 @@ routes_out = [
|
||||
r = Storage()
|
||||
r.env = Storage()
|
||||
r.env.http_host = 'domain.com'
|
||||
r.env.wsgi_url_scheme = 'httpx' # distinguish incoming scheme
|
||||
r.env.wsgi_url_scheme = 'httpx' # distinguish incoming scheme
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f')), "/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', host=True)),
|
||||
"httpx://domain.com/a/c/f")
|
||||
"httpx://domain.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', host='host.com')),
|
||||
"httpx://host.com/a/c/f")
|
||||
"httpx://host.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True)),
|
||||
"httpx://domain.com/a/c/f")
|
||||
"httpx://domain.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=False)),
|
||||
"/a/c/f")
|
||||
"/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='https')),
|
||||
"https://domain.com/a/c/f")
|
||||
"https://domain.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='wss')),
|
||||
"wss://domain.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True, host=True)),
|
||||
"wss://domain.com/a/c/f")
|
||||
self.assertEqual(
|
||||
str(URL(r=r, a='a', c='c', f='f', scheme=True, host=True)),
|
||||
"httpx://domain.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='https', host=True)),
|
||||
self.assertEqual(
|
||||
str(URL(r=r, a='a', c='c', f='f', scheme='https', host=True)),
|
||||
"https://domain.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=False, host=True)),
|
||||
self.assertEqual(
|
||||
str(URL(r=r, a='a', c='c', f='f', scheme=False, host=True)),
|
||||
"httpx://domain.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True, host='host.com')),
|
||||
self.assertEqual(
|
||||
str(URL(r=r, a='a', c='c', f='f', scheme=True, host='host.com')),
|
||||
"httpx://host.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=False, host='host.com')),
|
||||
self.assertEqual(
|
||||
str(URL(r=r, a='a', c='c', f='f', scheme=False, host='host.com')),
|
||||
"httpx://host.com/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', port=1234)),
|
||||
"httpx://domain.com:1234/a/c/f")
|
||||
self.assertEqual(
|
||||
str(URL(r=r, a='a', c='c', f='f', scheme=True, port=1234)),
|
||||
"httpx://domain.com:1234/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True, port=1234)),
|
||||
"httpx://domain.com:1234/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', host='host.com', port=1234)),
|
||||
self.assertEqual(
|
||||
str(URL(r=r, a='a', c='c', f='f', host='host.com', port=1234)),
|
||||
"httpx://host.com:1234/a/c/f")
|
||||
self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='wss', host='host.com', port=1234)),
|
||||
self.assertEqual(
|
||||
str(URL(r=r, a='a', c='c', f='f', scheme='wss',
|
||||
host='host.com', port=1234)),
|
||||
"wss://host.com:1234/a/c/f")
|
||||
|
||||
def test_request_uri(self):
|
||||
@@ -354,13 +432,17 @@ routes_out = [
|
||||
]
|
||||
'''
|
||||
load(data=data)
|
||||
self.assertEqual(filter_url('http://domain.com/abc', env=True).request_uri,
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/abc', env=True).request_uri,
|
||||
'/init/default/abc')
|
||||
self.assertEqual(filter_url('http://domain.com/abc?def', env=True).request_uri,
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/abc?def', env=True).request_uri,
|
||||
'/init/default/abc?def')
|
||||
self.assertEqual(filter_url('http://domain.com/index/abc', env=True).request_uri,
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/index/abc', env=True).request_uri,
|
||||
"/init/default/index/abc")
|
||||
self.assertEqual(filter_url('http://domain.com/index/a%20bc', env=True).request_uri,
|
||||
self.assertEqual(
|
||||
filter_url('http://domain.com/index/a%20bc', env=True).request_uri,
|
||||
"/init/default/index/a bc")
|
||||
|
||||
|
||||
@@ -368,4 +450,3 @@ if __name__ == '__main__':
|
||||
setUpModule() # pre-2.7
|
||||
unittest.main()
|
||||
tearDownModule()
|
||||
|
||||
Reference in new issue
Block a user