Fix syntax error manifesting as ValueError
modified: make_post_sell/tests/test_sanitize_html.py modified: make_post_sell/views/__init__.py modified: make_post_sell/views/coupon.py
This commit is contained in:
parent
7f1ec29786
commit
aa27d1afad
3 changed files with 5 additions and 22 deletions
|
|
@ -24,7 +24,7 @@ class SanitizeHtml(unittest.TestCase, object):
|
|||
def test_default_tag_acl(self):
|
||||
tag_acl = default_tag_acl()
|
||||
self.assertFalse(tag_acl)
|
||||
self.assertEquals(len(tag_acl.keys()), 0)
|
||||
self.assertEqual(len(tag_acl.keys()), 0)
|
||||
|
||||
def test_complex_cleaner_tag_acl(self):
|
||||
tag_acl = {
|
||||
|
|
|
|||
|
|
@ -2,24 +2,8 @@ from pyramid.httpexceptions import HTTPFound
|
|||
|
||||
|
||||
def get_referer_or_home(request):
|
||||
"""return referer or safe_redirect or '/'"""
|
||||
return (
|
||||
request.referer
|
||||
if request.referer is not None
|
||||
# else request.app.get("safe_redirect", "/")
|
||||
else "/"
|
||||
)
|
||||
|
||||
|
||||
def get_join_or_log_in_route_uri(request, return_to=""):
|
||||
query = None
|
||||
if return_to:
|
||||
query = {"return-to":return_to}
|
||||
return request.route_url(
|
||||
"join-or-log-in",
|
||||
_query=query,
|
||||
)
|
||||
|
||||
"""return referer or or '/'"""
|
||||
return request.referer if request.referer is not None else "/"
|
||||
|
||||
# view decorator.
|
||||
def user_required(
|
||||
|
|
@ -38,10 +22,9 @@ def user_required(
|
|||
return_to = ""
|
||||
if return_to_route_name:
|
||||
return_to = request.route_url(return_to_route_name)
|
||||
return HTTPFound(get_join_or_log_in_route_uri(request, return_to))
|
||||
return HTTPFound(get_referer_or_home(request))
|
||||
|
||||
return inner
|
||||
|
||||
return wrapped
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ def get_coupon_from_matchdict(request):
|
|||
|
||||
|
||||
@view_config(route_name="coupons", renderer="coupons.j2")
|
||||
@shop_owner_required
|
||||
@shop_owner_required()
|
||||
def coupons(request):
|
||||
return {
|
||||
"coupons": request.shop.coupons.all()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue