From 2d3ccfaba7bcc86c25cc8bbda5f03750a409b789 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 26 Aug 2014 14:24:07 -0500 Subject: [PATCH] removed epydoc and fixed a typo in pevious commit --- Makefile | 4 ++-- VERSION | 2 +- gluon/main.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7f979262..f03c3693 100644 --- a/Makefile +++ b/Makefile @@ -44,8 +44,8 @@ src: rm -f applications/admin/uploads/* rm -f applications/welcome/uploads/* rm -f applications/examples/uploads/* - ### make epydoc - make epydoc + ### NO MORE make epydoc + # make epydoc ### make welcome layout and appadmin the default cp applications/welcome/views/appadmin.html applications/admin/views cp applications/welcome/views/appadmin.html applications/examples/views diff --git a/VERSION b/VERSION index c76cc122..d609cd5e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.10.0-trunk+timestamp.2014.08.25.16.35.41 +Version 2.10.0-trunk+timestamp.2014.08.26.14.24.02 diff --git a/gluon/main.py b/gluon/main.py index e3a2546a..9e13058a 100644 --- a/gluon/main.py +++ b/gluon/main.py @@ -367,7 +367,7 @@ def wsgibase(environ, responder): ajax = x_req_with == 'xmlhttprequest', cid = env.http_web2py_component_element, is_local = (env.remote_addr in local_hosts and - request.client == env.remote_addr) + request.client == env.remote_addr), is_shell = cmd_opts and cmd_opts.shell, is_sheduler = cmd_opts and cmd_opts.scheduler, is_https = env.wsgi_url_scheme in HTTPS_SCHEMES or \