removed epydoc and fixed a typo in pevious commit

2014-08-26 14:24:07 -05:00
parent 80d9722964
commit 2d3ccfaba7
3 changed files with 4 additions and 4 deletions
--- a/4
+++ b/4
@@ -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
--- a/2
+++ b/2
@@ -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
--- 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 \