From cb3de825f2600bf0881804ca2ab72c5428229291 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 11 Mar 2013 14:38:04 -0500 Subject: [PATCH] /examples/default/version/raw --- VERSION | 2 +- applications/examples/controllers/default.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 0413134b..afff5d40 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.2-stable+timestamp.2013.03.11.14.27.56 +Version 2.4.2-stable+timestamp.2013.03.11.14.37.09 diff --git a/applications/examples/controllers/default.py b/applications/examples/controllers/default.py index 95c491e1..90443cb8 100644 --- a/applications/examples/controllers/default.py +++ b/applications/examples/controllers/default.py @@ -74,17 +74,15 @@ def license(): filename = os.path.join(request.env.gluon_parent, 'LICENSE') return response.render(dict(license=MARKMIN(read_file(filename)))) - def version(): + if request.args(0)=='raw': + return request.env.web2py_version from gluon.fileutils import parse_version (a, b, c, pre_release, build) = parse_version(request.env.web2py_version) return 'Version %i.%i.%i (%.4i-%.2i-%.2i %.2i:%.2i:%.2i) %s' % ( a,b,c,build.year,build.month,build.day, build.hour,build.minute,build.second,pre_release) -def raw_version(): - return request.env.web2py_version - @cache('examples', time_expire=cache_expire) def examples(): return response.render()