dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor rewrite in rewrite.py

Browse Source
This commit is contained in:
mdipierro
2013-11-01 18:49:38 -05:00
parent b1631ae2b3
commit b619bd3db7
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.7.4-stable+timestamp.2013.11.01.18.06.35 Version 2.7.4-stable+timestamp.2013.11.01.18.48.46
gluon/rewrite.py
+2 -5
View File
@@ -41,9 +41,6 @@ regex_redirect = re.compile(r'(\d+)->(.*)')
regex_full_url = re.compile( regex_full_url = re.compile(
r'^(?P<scheme>http|https|HTTP|HTTPS)\://(?P<host>[^/]*)(?P<uri>.*)') r'^(?P<scheme>http|https|HTTP|HTTPS)\://(?P<host>[^/]*)(?P<uri>.*)')
regex_version = re.compile(r'^(_[\d]+\.[\d]+\.[\d]+)$') regex_version = re.compile(r'^(_[\d]+\.[\d]+\.[\d]+)$')
# pattern to replace spaces with underscore in URL
# also the html escaped variants '+' and '%20' are covered
regex_space = re.compile('(\+|\s|%20)+')
# pattern to find valid paths in url /application/controller/... # pattern to find valid paths in url /application/controller/...
# this could be: # this could be:
@@ -625,8 +622,8 @@ def regex_url_in(request, environ):
# serve if a static file # serve if a static file
# ################################################## # ##################################################
path = request.env.path_info.replace('\\', '/') or '/' path = urllib.unquote(request.env.path_info) or '/'
path = regex_space.sub('_', path) path = path.replace('\\', '/').replace(' ','_')
if path.endswith('/') and len(path) > 1: if path.endswith('/') and len(path) > 1:
path = path[:-1] path = path[:-1]
match = regex_url.match(path) match = regex_url.match(path)