Improve PEP8 test_html.py
This commit is contained in:
1 parent
b7a0f2043c
commit
983627daa4
1 file changed
+11
-8
@@ -264,7 +264,7 @@ class TestBareHelpers(unittest.TestCase):
|
|||||||
def testTHEAD(self):
|
def testTHEAD(self):
|
||||||
self.assertEqual(THEAD('<>', _a='1', _b='2').xml(),
|
self.assertEqual(THEAD('<>', _a='1', _b='2').xml(),
|
||||||
'<thead a="1" b="2"><tr><th><></th></tr></thead>')
|
'<thead a="1" b="2"><tr><th><></th></tr></thead>')
|
||||||
#self.assertEqual(THEAD(TRHEAD('<>'), _a='1', _b='2').xml(),
|
# self.assertEqual(THEAD(TRHEAD('<>'), _a='1', _b='2').xml(),
|
||||||
# '<thead a="1" b="2"><tr><th><></th></tr></thead>')
|
# '<thead a="1" b="2"><tr><th><></th></tr></thead>')
|
||||||
self.assertEqual(THEAD(TR('<>'), _a='1', _b='2').xml(),
|
self.assertEqual(THEAD(TR('<>'), _a='1', _b='2').xml(),
|
||||||
'<thead a="1" b="2"><tr><td><></td></tr></thead>')
|
'<thead a="1" b="2"><tr><td><></td></tr></thead>')
|
||||||
@@ -308,7 +308,7 @@ class TestBareHelpers(unittest.TestCase):
|
|||||||
# beware that the comparison is made on the XML repr
|
# beware that the comparison is made on the XML repr
|
||||||
self.assertEqual(XML('<h1>Hello<a data-hello="world">World</a></h1>', sanitize=True),
|
self.assertEqual(XML('<h1>Hello<a data-hello="world">World</a></h1>', sanitize=True),
|
||||||
XML('<h1>HelloWorld</h1>'))
|
XML('<h1>HelloWorld</h1>'))
|
||||||
#bug check for the sanitizer for closing no-close tags
|
# bug check for the sanitizer for closing no-close tags
|
||||||
self.assertEqual(XML('<p>Test</p><br/><p>Test</p><br/>', sanitize=True),
|
self.assertEqual(XML('<p>Test</p><br/><p>Test</p><br/>', sanitize=True),
|
||||||
XML('<p>Test</p><br /><p>Test</p><br />'))
|
XML('<p>Test</p><br /><p>Test</p><br />'))
|
||||||
|
|
||||||
@@ -343,14 +343,17 @@ class TestBareHelpers(unittest.TestCase):
|
|||||||
request.controller = 'c'
|
request.controller = 'c'
|
||||||
request.function = 'f'
|
request.function = 'f'
|
||||||
request.env = {}
|
request.env = {}
|
||||||
from globals import current
|
|
||||||
|
from globals import current # TODO: Check if this import can go at the top of the file with other imports
|
||||||
current.request = request
|
current.request = request
|
||||||
|
|
||||||
must_return = '/a/c/f'
|
must_return = '/a/c/f'
|
||||||
self.assertEqual(URL(), must_return)
|
self.assertEqual(URL(), must_return)
|
||||||
self.assertEqual(URL('f'), must_return)
|
self.assertEqual(URL('f'), must_return)
|
||||||
self.assertEqual(URL('c', 'f'), must_return)
|
self.assertEqual(URL('c', 'f'), must_return)
|
||||||
self.assertEqual(URL('a', 'c', 'f'), must_return)
|
self.assertEqual(URL('a', 'c', 'f'), must_return)
|
||||||
self.assertEqual(URL('a', 'c', 'f', extension='json'), '/a/c/f.json')
|
self.assertEqual(URL('a', 'c', 'f', extension='json'), '/a/c/f.json')
|
||||||
|
|
||||||
def weird():
|
def weird():
|
||||||
pass
|
pass
|
||||||
self.assertEqual(URL('a', 'c', weird), '/a/c/weird')
|
self.assertEqual(URL('a', 'c', weird), '/a/c/weird')
|
||||||
@@ -372,15 +375,15 @@ class TestBareHelpers(unittest.TestCase):
|
|||||||
current.session = Storage(auth=Storage(hmac_key='key'))
|
current.session = Storage(auth=Storage(hmac_key='key'))
|
||||||
self.assertEqual(URL(user_signature=True), '/a/c/f?_signature=c4aed53c08cff08f369dbf8b5ba51889430cf2c2')
|
self.assertEqual(URL(user_signature=True), '/a/c/f?_signature=c4aed53c08cff08f369dbf8b5ba51889430cf2c2')
|
||||||
# hash_vars combination
|
# hash_vars combination
|
||||||
rtn = URL('a','c','f', args=['x', 'y', 'z'], vars={'p' : (1,3), 'q' : 2}, hmac_key='key')
|
rtn = URL('a', 'c', 'f', args=['x', 'y', 'z'], vars={'p': (1, 3), 'q': 2}, hmac_key='key')
|
||||||
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=a32530f0d0caa80964bb92aad2bedf8a4486a31f')
|
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=a32530f0d0caa80964bb92aad2bedf8a4486a31f')
|
||||||
rtn = URL('a','c','f', args=['x', 'y', 'z'], vars={'p' : (1,3), 'q' : 2}, hmac_key='key', hash_vars=True)
|
rtn = URL('a', 'c', 'f', args=['x', 'y', 'z'], vars={'p': (1, 3), 'q': 2}, hmac_key='key', hash_vars=True)
|
||||||
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=a32530f0d0caa80964bb92aad2bedf8a4486a31f')
|
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=a32530f0d0caa80964bb92aad2bedf8a4486a31f')
|
||||||
rtn = URL('a','c','f', args=['x', 'y', 'z'], vars={'p' : (1,3), 'q' : 2}, hmac_key='key', hash_vars=False)
|
rtn = URL('a', 'c', 'f', args=['x', 'y', 'z'], vars={'p': (1, 3), 'q': 2}, hmac_key='key', hash_vars=False)
|
||||||
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=0b5a0702039992aad23c82794b8496e5dcd59a5b')
|
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=0b5a0702039992aad23c82794b8496e5dcd59a5b')
|
||||||
rtn = URL('a','c','f', args=['x', 'y', 'z'], vars={'p' : (1,3), 'q' : 2}, hmac_key='key', hash_vars=['p'])
|
rtn = URL('a', 'c', 'f', args=['x', 'y', 'z'], vars={'p': (1, 3), 'q': 2}, hmac_key='key', hash_vars=['p'])
|
||||||
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=5d01b982fd72b39674b012e0288071034e156d7a')
|
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=5d01b982fd72b39674b012e0288071034e156d7a')
|
||||||
rtn = URL('a','c','f', args=['x', 'y', 'z'], vars={'p' : (1,3), 'q' : 2}, hmac_key='key', hash_vars='p')
|
rtn = URL('a', 'c', 'f', args=['x', 'y', 'z'], vars={'p': (1, 3), 'q': 2}, hmac_key='key', hash_vars='p')
|
||||||
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=5d01b982fd72b39674b012e0288071034e156d7a')
|
self.assertEqual(rtn, '/a/c/f/x/y/z?p=1&p=3&q=2&_signature=5d01b982fd72b39674b012e0288071034e156d7a')
|
||||||
# test CRLF detection
|
# test CRLF detection
|
||||||
self.assertRaises(SyntaxError, URL, *['a\n', 'c', 'f'])
|
self.assertRaises(SyntaxError, URL, *['a\n', 'c', 'f'])
|
||||||
|
|||||||
Reference in new issue
Block a user