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

better extension parsing, thanks Corne

Browse Source
This commit is contained in:
mdipierro
2012-06-28 09:56:53 -05:00
parent e2928706a6
commit ffae332ad3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-06-28 09:54:19) dev Version 2.00.0 (2012-06-28 09:56:50) dev
gluon/compileapp.py
+2 -2
View File
@@ -128,7 +128,7 @@ def LOAD(c=None, f='index', args=None, vars=None,
attr['_id']=target attr['_id']=target
request = current.request request = current.request
if '.' in f: if '.' in f:
f, extension = f.split('.',1) f, extension = f.rsplit('.',1)
if url or ajax: if url or ajax:
url = url or URL(request.application, c, f, r=request, url = url or URL(request.application, c, f, r=request,
args=args, vars=vars, extension=extension, args=args, vars=vars, extension=extension,
@@ -235,7 +235,7 @@ class LoadFactory(object):
attr['_id']=target attr['_id']=target
request = self.environment['request'] request = self.environment['request']
if '.' in f: if '.' in f:
f, extension = f.split('.',1) f, extension = f.rsplit('.',1)
if url or ajax: if url or ajax:
url = url or html.URL(request.application, c, f, r=request, url = url or html.URL(request.application, c, f, r=request,
args=args, vars=vars, extension=extension, args=args, vars=vars, extension=extension,
gluon/html.py
+1 -1
View File
@@ -275,7 +275,7 @@ def URL(
extension = None extension = None
if '.' in function: if '.' in function:
function, extension = function.split('.', 1) function, extension = function.rsplit('.', 1)
function2 = '%s.%s' % (function,extension or 'html') function2 = '%s.%s' % (function,extension or 'html')