提交: 1c5e1064d1e582647f5dab23a5e5a7f3b3eef1c7 - allura (git)

allura

Commit MetaInfo

• 修訂: 1c5e1064d1e582647f5dab23a5e5a7f3b3eef1c7 (tree)
• 時間: 2011-04-30 02:08:36
• 作者: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#1831] update with[out]_trailing_slash to give HTTPMovedPermanently rather than HTTPFound

Signed-off-by: Rick Copeland <[e-mail]>

Change Summary

• modified: Allura/tg/decorators.py
• modified: Allura/tg/util.py

差異

--- a/Allura/tg/decorators.py
+++ b/Allura/tg/decorators.py
@@ -3,6 +3,7 @@ from formencode import schema
 import ew.render
 
 from .tg_globals import c, request, response
+from .util import moved
 
 class _tg_deco(object):
     def __init__(self, *args, **kwargs):
@@ -21,20 +22,18 @@ def override_template(func, template):
     c.override_template = template
 
 def without_trailing_slash(func):
-    from tg import redirect
     def _check_path(params):
         if request.method != 'GET': return
         if request.path.endswith('/'):
-            redirect(request.url.replace(request.path, request.path[:-1], 1))
+            moved(request.url.replace(request.path, request.path[:-1], 1))
     before_validate(_check_path)(func)
     return func
 
 def with_trailing_slash(func):
-    from tg import redirect
     def _check_path(params):
         if request.method != 'GET': return
         if not request.path.endswith('/'):
-            redirect(request.url.replace(request.path, request.path + '/', 1))
+            moved(request.url.replace(request.path, request.path + '/', 1))
     before_validate(_check_path)(func)
     return func
 

--- a/Allura/tg/util.py
+++ b/Allura/tg/util.py
@@ -43,6 +43,10 @@ def redirect(*args, **kwargs):
     found = exc.HTTPFound(location=url(*args, **kwargs))
     raise found.exception
 
+def moved(*args, **kwargs):
+    moved = exc.HTTPMovedPermanently(location=url(*args, **kwargs))
+    raise moved.exception
+
 def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
     """
     Returns a bytestring version of 's', encoded as specified in 'encoding'.