remove useless imports.

Add support for freeIPA ldap auth

.travis.yml

@@ -1,27 +1,22 @@
 language: python
 
 sudo: required
-
 cache: pip
-
-dist: "xenial"
+dist: "bionic"
 
 services:
   - mysql
+  - redis-server
 
 python:
   - '2.7'
-  - '3.5'
   - '3.6'
-  - '3.6-dev'
   - '3.7'
-  - '3.7-dev'
   - 'pypy3.5'
 
 matrix:
   allow_failures:
-    - python: '3.6-dev'
-    - python: '3.7-dev'
+    - python: 'pypy3.5'
 
 install:
   - pip install -e .
@@ -29,6 +24,7 @@ install:
 before_script:
   - pip install coverage
   - pip install codecov
+  - pip install redis
 
 before_install:
   - mysql -e 'create database pydal;'

CHANGELOG

@@ -1,5 +1,26 @@
-## 2.18.1-2.18.4
-- pydal 19.02
+## 2.19.0
+- new command line options (Thanks Paolo Pastori)
+
+OLD NAME                   NEW NAME
+==================         ==================
+--debug                     --log_level
+--nogui                     --no_gui
+--ssl_private_key           --server_key
+--ssl_certificate           --server_cert
+--minthreads                --min_threads
+--maxthreads                --max_threads
+--profiler                  --profiler_dir
+--run-cron                  --with_cron
+--softcron                  --soft_cron
+--cron                      --cron_run
+--cronjob *                 --cron_job *
+--test                      --run_doctests
+                            --add_options
+                            --interface
+                            --crontab
+
+## 2.18.1-2.18.5
+- pydal 19.04
 - made template its own module (Yet Another Template Language)
 - improved python 3.4-3.7 support
 - better regular expressions

Makefile

@@ -19,11 +19,11 @@ clean:
 	find applications/welcome/ -name '.*' -exec rm -f {} \; 
 	find . -name '*.pyc' -exec rm -f {} \;
 tests:
-	python web2py.py --run_system_tests
+	python web2py.py --verbose --run_system_tests
 coverage:
 	coverage erase --rcfile=gluon/tests/coverage.ini
 	export COVERAGE_PROCESS_START=gluon/tests/coverage.ini
-	python web2py.py --run_system_tests --with_coverage
+	python web2py.py --verbose --run_system_tests --with_coverage
 	coverage combine --rcfile=gluon/tests/coverage.ini
 	sleep 1
 	coverage html --rcfile=gluon/tests/coverage.ini
@@ -45,7 +45,7 @@ rmfiles:
 	rm -rf applications/examples/uploads/* 
 src:
 	### Use semantic versioning
-	echo 'Version 2.18.4-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.18.5-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	# make rmfiles

VERSION

@@ -1 +1 @@
-Version 2.18.4-stable+timestamp.2019.03.12.22.20.22
+Version 2.18.5-stable+timestamp.2019.04.07.21.13.59

applications/admin/controllers/appadmin.py

@@ -30,7 +30,7 @@ except:
 
 if request.is_https:
     session.secure()
-elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1") and \
+elif (remote_addr not in hosts) and (remote_addr != '127.0.0.1') and \
     (request.function != 'manage'):
     raise HTTP(200, T('appadmin is disabled because insecure channel'))
 
@@ -46,7 +46,7 @@ if request.function == 'manage':
                                       auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
     if not (gluon.fileutils.check_credentials(request) or auth.has_membership(manager_role)):
-        raise HTTP(403, "Not authorized")
+        raise HTTP(403, 'Not authorized')
     menu = False
 elif (request.application == 'admin' and not session.authorized) or \
         (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
@@ -182,7 +182,7 @@ def select():
     db = get_database(request)
     dbname = request.args[0]
     try:
-        is_imap = db._uri.startswith("imap://")
+        is_imap = db._uri.startswith('imap://')
     except (KeyError, AttributeError, TypeError):
         is_imap = False
     regex = re.compile(r'(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
@@ -224,15 +224,15 @@ def select():
     session.last_orderby = orderby
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
-                _name='query', _value=request.vars.query or '', _class="form-control",
+                _name='query', _value=request.vars.query or '', _class='form-control',
                 requires=IS_NOT_EMPTY(
-                    error_message=T("Cannot be empty")))), TR(T('Update:'),
+                    error_message=T('Cannot be empty')))), TR(T('Update:'),
                 INPUT(_name='update_check', _type='checkbox',
                 value=False), INPUT(_style='width:400px',
                 _name='update_fields', _value=request.vars.update_fields
-                                    or '', _class="form-control")), TR(T('Delete:'), INPUT(_name='delete_check',
+                                    or '', _class='form-control')), TR(T('Delete:'), INPUT(_name='delete_check',
                 _class='delete', _type='checkbox', value=False), ''),
-                TR('', '', INPUT(_type='submit', _value=T('submit'), _class="btn btn-primary"))),
+                TR('', '', INPUT(_type='submit', _value=T('Submit'), _class='btn btn-primary'))),
                 _action=URL(r=request, args=request.args))
 
     tb = None
@@ -254,8 +254,8 @@ def select():
 
             if is_imap:
                 fields = [db[table][name] for name in
-                    ("id", "uid", "created", "to",
-                     "sender", "subject")]
+                    ('id', 'uid', 'created', 'to',
+                     'sender', 'subject')]
             if orderby:
                 rows = db(query, ignore_common_filters=True).select(
                               *fields, limitby=(start, stop),
@@ -271,10 +271,10 @@ def select():
     # begin handle upload csv
     csv_table = table or request.vars.table
     if csv_table:
-        formcsv = FORM(str(T('or import from csv file')) + " ",
+        formcsv = FORM(str(T('or import from csv file')) + ' ',
                        INPUT(_type='file', _name='csvfile'),
                        INPUT(_type='hidden', _value=csv_table, _name='table'),
-                       INPUT(_type='submit', _value=T('import'), _class="btn btn-primary"))
+                       INPUT(_type='submit', _value=T('import'), _class='btn btn-primary'))
     else:
         formcsv = None
     if formcsv and formcsv.process().accepted:
@@ -356,26 +356,26 @@ def state():
 def ccache():
     if is_gae:
         form = FORM(
-            P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")))
+            P(TAG.BUTTON(T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')))
     else:
         cache.ram.initialize()
         cache.disk.initialize()
 
         form = FORM(
             P(TAG.BUTTON(
-                T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+                T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')),
             P(TAG.BUTTON(
-                T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+                T('Clear RAM'), _type='submit', _name='ram', _value='ram')),
             P(TAG.BUTTON(
-                T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+                T('Clear DISK'), _type='submit', _name='disk', _value='disk')),
         )
 
     if form.accepts(request.vars, session):
-        session.flash = ""
+        session.flash = ''
         if is_gae:
             if request.vars.yes:
                 cache.ram.clear()
-                session.flash += T("Cache Cleared")
+                session.flash += T('Cache Cleared')
         else:
             clear_ram = False
             clear_disk = False
@@ -387,10 +387,10 @@ def ccache():
                 clear_disk = True
             if clear_ram:
                 cache.ram.clear()
-                session.flash += T("Ram Cleared")
+                session.flash += T('Ram Cleared')
             if clear_disk:
                 cache.disk.clear()
-                session.flash += T("Disk Cleared")
+                session.flash += T('Disk Cleared')
         redirect(URL(r=request))
 
     try:
@@ -436,7 +436,7 @@ def ccache():
             gae_stats['ratio'] = ((gae_stats['hits'] * 100) /
                 (gae_stats['hits'] + gae_stats['misses']))
         except ZeroDivisionError:
-            gae_stats['ratio'] = T("?")
+            gae_stats['ratio'] = T('?')
         gae_stats['oldest'] = GetInHMS(time.time() - gae_stats['oldest_item_age'])
         total.update(gae_stats)
     else:
@@ -502,7 +502,7 @@ def ccache():
             TR(TD(B(T('Key'))), TD(B(T('Time in Cache (h:m:s)')))),
             *[TR(TD(k[0]), TD('%02d:%02d:%02d' % k[1])) for k in keys],
             **dict(_class='cache-keys',
-                   _style="border-collapse: separate; border-spacing: .5em;"))
+                   _style='border-collapse: separate; border-spacing: .5em;'))
 
     if not is_gae:
         ram['keys'] = key_table(ram['keys'])
@@ -536,26 +536,26 @@ def table_template(table):
     # This is horribe HTML but the only one graphiz understands
     rows = []
     cellpadding = 4
-    color = "#000000"
-    bgcolor = "#FFFFFF"
-    face = "Helvetica"
-    face_bold = "Helvetica Bold"
+    color = '#000000'
+    bgcolor = '#FFFFFF'
+    face = 'Helvetica'
+    face_bold = 'Helvetica Bold'
     border = 0
 
     rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor),
                            _colspan=3, _cellpadding=cellpadding,
-                           _align="center", _bgcolor=color)))
+                           _align='center', _bgcolor=color)))
     for row in db[table]:
         rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold),
-                              _align="left", _cellpadding=cellpadding,
+                              _align='left', _cellpadding=cellpadding,
                               _border=border),
                        TD(FONT(row.type, _color=color, _face=face),
-                               _align="left", _cellpadding=cellpadding,
+                               _align='left', _cellpadding=cellpadding,
                                _border=border),
                        TD(FONT(types(row), _color=color, _face=face),
-                               _align="center", _cellpadding=cellpadding,
+                               _align='center', _cellpadding=cellpadding,
                                _border=border)))
-    return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
+    return '< %s >' % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
                                           _cellborder=0, _cellspacing=0)
                              ).xml()
 
@@ -632,15 +632,15 @@ def hooks():
                 if len(functions):
                     method_hooks.append({'name': op, 'functions':functions})
             if len(method_hooks):
-                tables.append({'name': "%s.%s" % (db_str, t), 'slug': IS_SLUG()("%s.%s" % (db_str,t))[0], 'method_hooks':method_hooks})
+                tables.append({'name': '%s.%s' % (db_str, t), 'slug': IS_SLUG()('%s.%s' % (db_str,t))[0], 'method_hooks':method_hooks})
     # Render
     ul_main = UL(_class='nav nav-list')
     for t in tables:
         ul_main.append(A(t['name'], _onclick="collapse('a_%s')" % t['slug']))
-        ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
+        ul_t = UL(_class='nav nav-list', _id='a_%s' % t['slug'], _style='display:none')
         for op in t['method_hooks']:
             ul_t.append(LI(op['name']))
-            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
+            ul_t.append(UL([LI(A(f['funcname'], _class='editor_filelink', _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main
 
@@ -650,11 +650,11 @@ def hooks():
 # ###########################################################
 
 def d3_graph_model():
-    """ See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    ''' See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
     and also the app_admin bg_graph_model function
 
-    Create a list of table dicts, called "nodes"
-    """
+    Create a list of table dicts, called 'nodes'
+    '''
 
     nodes = []
     links = []
@@ -670,10 +670,10 @@ def d3_graph_model():
                 elif f_type == 'string':
                     disp = field.length
                 elif f_type == 'id':
-                    disp = "PK"
+                    disp = 'PK'
                 elif f_type.startswith('reference') or \
                     f_type.startswith('list:reference'):
-                    disp = "FK"
+                    disp = 'FK'
                 else:
                     disp = ' '
                 fields.append(dict(name=field.name, type=field.type, disp=disp))
@@ -685,7 +685,7 @@ def d3_graph_model():
 
                     links.append(dict(source=tablename, target = referenced_table))
 
-            nodes.append(dict(name=tablename, type="table", fields = fields))
+            nodes.append(dict(name=tablename, type='table', fields = fields))
 
     # d3 v4 allows individual modules to be specified.  The complete d3 library is included below.
     response.files.append(URL('admin','static','js/d3.min.js'))

applications/admin/controllers/default.py

@@ -166,9 +166,9 @@ def check_version():
     new_version, version = check_new_version(request.env.web2py_version,
                                              WEB2PY_VERSION_URL)
 
-    if new_version == -1:
+    if new_version in (-1, -2):
         return A(T('Unable to check for upgrades'), _href=WEB2PY_URL)
-    elif new_version != True:
+    elif not new_version:
         return A(T('web2py is up to date'), _href=WEB2PY_URL)
     elif platform.system().lower() in ('windows', 'win32', 'win64') and os.path.exists("web2py.exe"):
         return SPAN('You should upgrade to %s' % version.split('(')[0])
@@ -814,8 +814,11 @@ def edit():
 
     if len(request.args) > 2 and request.args[1] == 'controllers':
         controller = (request.args[2])[:-3]
-        functions = find_exposed_functions(data)
-        functions = functions and sorted(functions) or []
+        try:
+            functions = find_exposed_functions(data)
+            functions = functions and sorted(functions) or []
+        except SyntaxError as err:
+            functions = ['SyntaxError:Line:%d' % err.lineno]
     else:
         (controller, functions) = (None, None)
 
@@ -1117,7 +1120,7 @@ def design():
     defines = {}
     for m in models:
         data = safe_read(apath('%s/models/%s' % (app, m), r=request))
-        defines[m] = regex_tables.findall(data)
+        defines[m] = re.findall(REGEX_DEFINE_TABLE, data, re.MULTILINE)
         defines[m].sort()
 
     # Get all controllers
@@ -1127,8 +1130,11 @@ def design():
     functions = {}
     for c in controllers:
         data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
-        items = find_exposed_functions(data)
-        functions[c] = items and sorted(items) or []
+        try:
+            items = find_exposed_functions(data)
+            functions[c] = items and sorted(items) or []
+        except SyntaxError as err:
+            functions[c] = ['SyntaxError:Line:%d' % err.lineno]
 
     # Get all views
     views = sorted(
@@ -1138,12 +1144,12 @@ def design():
     include = {}
     for c in views:
         data = safe_read(apath('%s/views/%s' % (app, c), r=request))
-        items = regex_extend.findall(data)
+        items = re.findall(REGEX_EXTEND, data, re.MULTILINE)
 
         if items:
             extend[c] = items[0][1]
 
-        items = regex_include.findall(data)
+        items = re.findall(REGEX_INCLUDE, data)
         include[c] = [i[1] for i in items]
 
     # Get all modules
@@ -1265,8 +1271,11 @@ def plugin():
     functions = {}
     for c in controllers:
         data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
-        items = find_exposed_functions(data)
-        functions[c] = items and sorted(items) or []
+        try:
+            items = find_exposed_functions(data)
+            functions[c] = items and sorted(items) or []
+        except SyntaxError as err:
+            functions[c] = ['SyntaxError:Line:%d' % err.lineno]
 
     # Get all views
     views = sorted(
@@ -1276,11 +1285,11 @@ def plugin():
     include = {}
     for c in views:
         data = safe_read(apath('%s/views/%s' % (app, c), r=request))
-        items = regex_extend.findall(data)
+        items = re.findall(REGEX_EXTEND, data, re.MULTILINE)
         if items:
             extend[c] = items[0][1]
 
-        items = regex_include.findall(data)
+        items = re.findall(REGEX_INCLUDE, data)
         include[c] = [i[1] for i in items]
 
     # Get all modules

applications/admin/models/0_imports.py

@@ -25,6 +25,5 @@ from gluon.utils import md5_hash
 from gluon.fileutils import listdir, cleanpath, up
 from gluon.fileutils import tar, tar_compiled, untar, fix_newlines
 from gluon.languages import findT, update_all_languages
-from gluon.myregex import *
 from gluon.restricted import *
 from gluon.compileapp import compile_application, remove_compiled_application

applications/admin/settings.cfg

@@ -1,9 +1,12 @@
-[DEFAULT]
-
 [editor]
-theme = web2py
-editor = default
+theme = twilight
+editor = sublime
 closetag = true
+tabwidth = 4
+highlightline = true
+linenumbers = true
+codefolding = false
+indentwithtabs = false
 
 [editor_sessions]
 welcome = welcome/models/db.py,welcome/controllers/default.py,welcome/views/default/index.html

applications/admin/static/js/web2py.js

@@ -284,6 +284,7 @@
                 var redirect = xhr.getResponseHeader('web2py-redirect-location');
                 if (redirect !== null) {
                     window.location = redirect;
+                    window.location.reload(); // Force reload even with anchors
                 }
                 /* run this here only if this Ajax request is NOT for a web2py component. */
                 if (xhr.getResponseHeader('web2py-component-content') === null) {

applications/admin/views/default.mobile/plugin.html

@@ -38,19 +38,19 @@ def file_upload_form(location):
               INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY()),
               INPUT(_type="hidden",_name="location",_value=location),
               INPUT(_type="hidden",_name="sender",_value=URL('design/'+app)),
-              INPUT(_type="submit",_value=T("submit")),_action=URL('upload_file'))
+              INPUT(_type="submit",_value=T("Submit")),_action=URL('upload_file'))
     return form
 def file_create_form(location):
     form=FORM(T("create file with filename:")," ",
               INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY()),
               INPUT(_type="hidden",_name="location",_value=location),
               INPUT(_type="hidden",_name="sender",_value=URL('design/'+app)),
-              INPUT(_type="submit",_value=T("submit")),_action=URL('create_file'))
+              INPUT(_type="submit",_value=T("Submit")),_action=URL('create_file'))
     return form
 def upload_plugin_form(app):
     form=FORM(T("upload plugin file:")," ",
               INPUT(_type="file",_name="pluginfile"),
-              INPUT(_type="submit",_value=T("submit")))
+              INPUT(_type="submit",_value=T("Submit")))
     return form
 def deletefile(arglist):
     return A_delete(SPAN(T('Delete')), _href=URL('delete',args=arglist,vars=dict(sender=request.function+'/'+app)))

applications/admin/views/default/editor_settings.html

@@ -6,7 +6,7 @@
       return files
 }}
 {{themes = [f[:-4] for f in listfiles('admin', "static/codemirror/theme", regexp='.*\.css$' )]}}
-{{editors = ['default', 'vim', 'emacs']}}
+{{editors = ['default', 'vim', 'emacs', 'sublime']}}
 
 <form id="editor_settings_form" class="form-horizontal" action="">
 	<div class="control-group">
@@ -27,7 +27,7 @@
 	</div>
 	<div class="control-group">
 		<label class="control-label" for="tabwidth">{{=T('Tab width (# characters)')}}</label>
-		<div class="controls">{{=SELECT(range(1,9, 1), value=editor_settings['tabwidth'], _name="tabwidth" )}}</div>
+		<div class="controls">{{=SELECT(list(range(1,9, 1)), value=editor_settings['tabwidth'], _name="tabwidth" )}}</div>
 	</div>
 	<div class="control-group">
 		<label class="control-label" for="indentwithtabs">{{=T('Indent with tabs')}}</label>

applications/admin/views/default/plugin.html

@@ -24,7 +24,7 @@ def file_upload_form(location):
               INPUT(_type="hidden",_name="location",_value=location),
               INPUT(_type="hidden",_name="token",_value=session.token),
               INPUT(_type="hidden",_name="sender",_value=URL('design/'+app)),
-              INPUT(_type="submit",_value=T("submit")),_action=URL('upload_file'))
+              INPUT(_type="submit",_value=T("Submit")),_action=URL('upload_file'))
     return form
 def file_create_form(location):
     form=FORM(T("create file with filename:")," ",
@@ -32,7 +32,7 @@ def file_create_form(location):
               INPUT(_type="hidden",_name="location",_value=location),
               INPUT(_type="hidden",_name="token",_value=session.token),
               INPUT(_type="hidden",_name="sender",_value=URL('design/'+app)),
-              INPUT(_type="submit",_value=T("submit")),_action=URL('create_file'))
+              INPUT(_type="submit",_value=T("Submit")),_action=URL('create_file'))
     return form
 def deletefile(arglist):
 	return A(TAG[''](IMG(_src=URL('static', 'images/delete_icon.png')), 

applications/examples/controllers/appadmin.py

@@ -30,7 +30,7 @@ except:
 
 if request.is_https:
     session.secure()
-elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1") and \
+elif (remote_addr not in hosts) and (remote_addr != '127.0.0.1') and \
     (request.function != 'manage'):
     raise HTTP(200, T('appadmin is disabled because insecure channel'))
 
@@ -46,7 +46,7 @@ if request.function == 'manage':
                                       auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
     if not (gluon.fileutils.check_credentials(request) or auth.has_membership(manager_role)):
-        raise HTTP(403, "Not authorized")
+        raise HTTP(403, 'Not authorized')
     menu = False
 elif (request.application == 'admin' and not session.authorized) or \
         (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
@@ -182,7 +182,7 @@ def select():
     db = get_database(request)
     dbname = request.args[0]
     try:
-        is_imap = db._uri.startswith("imap://")
+        is_imap = db._uri.startswith('imap://')
     except (KeyError, AttributeError, TypeError):
         is_imap = False
     regex = re.compile(r'(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
@@ -224,15 +224,15 @@ def select():
     session.last_orderby = orderby
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
-                _name='query', _value=request.vars.query or '', _class="form-control",
+                _name='query', _value=request.vars.query or '', _class='form-control',
                 requires=IS_NOT_EMPTY(
-                    error_message=T("Cannot be empty")))), TR(T('Update:'),
+                    error_message=T('Cannot be empty')))), TR(T('Update:'),
                 INPUT(_name='update_check', _type='checkbox',
                 value=False), INPUT(_style='width:400px',
                 _name='update_fields', _value=request.vars.update_fields
-                                    or '', _class="form-control")), TR(T('Delete:'), INPUT(_name='delete_check',
+                                    or '', _class='form-control')), TR(T('Delete:'), INPUT(_name='delete_check',
                 _class='delete', _type='checkbox', value=False), ''),
-                TR('', '', INPUT(_type='submit', _value=T('submit'), _class="btn btn-primary"))),
+                TR('', '', INPUT(_type='submit', _value=T('Submit'), _class='btn btn-primary'))),
                 _action=URL(r=request, args=request.args))
 
     tb = None
@@ -254,8 +254,8 @@ def select():
 
             if is_imap:
                 fields = [db[table][name] for name in
-                    ("id", "uid", "created", "to",
-                     "sender", "subject")]
+                    ('id', 'uid', 'created', 'to',
+                     'sender', 'subject')]
             if orderby:
                 rows = db(query, ignore_common_filters=True).select(
                               *fields, limitby=(start, stop),
@@ -271,10 +271,10 @@ def select():
     # begin handle upload csv
     csv_table = table or request.vars.table
     if csv_table:
-        formcsv = FORM(str(T('or import from csv file')) + " ",
+        formcsv = FORM(str(T('or import from csv file')) + ' ',
                        INPUT(_type='file', _name='csvfile'),
                        INPUT(_type='hidden', _value=csv_table, _name='table'),
-                       INPUT(_type='submit', _value=T('import'), _class="btn btn-primary"))
+                       INPUT(_type='submit', _value=T('import'), _class='btn btn-primary'))
     else:
         formcsv = None
     if formcsv and formcsv.process().accepted:
@@ -356,26 +356,26 @@ def state():
 def ccache():
     if is_gae:
         form = FORM(
-            P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")))
+            P(TAG.BUTTON(T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')))
     else:
         cache.ram.initialize()
         cache.disk.initialize()
 
         form = FORM(
             P(TAG.BUTTON(
-                T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+                T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')),
             P(TAG.BUTTON(
-                T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+                T('Clear RAM'), _type='submit', _name='ram', _value='ram')),
             P(TAG.BUTTON(
-                T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+                T('Clear DISK'), _type='submit', _name='disk', _value='disk')),
         )
 
     if form.accepts(request.vars, session):
-        session.flash = ""
+        session.flash = ''
         if is_gae:
             if request.vars.yes:
                 cache.ram.clear()
-                session.flash += T("Cache Cleared")
+                session.flash += T('Cache Cleared')
         else:
             clear_ram = False
             clear_disk = False
@@ -387,10 +387,10 @@ def ccache():
                 clear_disk = True
             if clear_ram:
                 cache.ram.clear()
-                session.flash += T("Ram Cleared")
+                session.flash += T('Ram Cleared')
             if clear_disk:
                 cache.disk.clear()
-                session.flash += T("Disk Cleared")
+                session.flash += T('Disk Cleared')
         redirect(URL(r=request))
 
     try:
@@ -436,7 +436,7 @@ def ccache():
             gae_stats['ratio'] = ((gae_stats['hits'] * 100) /
                 (gae_stats['hits'] + gae_stats['misses']))
         except ZeroDivisionError:
-            gae_stats['ratio'] = T("?")
+            gae_stats['ratio'] = T('?')
         gae_stats['oldest'] = GetInHMS(time.time() - gae_stats['oldest_item_age'])
         total.update(gae_stats)
     else:
@@ -502,7 +502,7 @@ def ccache():
             TR(TD(B(T('Key'))), TD(B(T('Time in Cache (h:m:s)')))),
             *[TR(TD(k[0]), TD('%02d:%02d:%02d' % k[1])) for k in keys],
             **dict(_class='cache-keys',
-                   _style="border-collapse: separate; border-spacing: .5em;"))
+                   _style='border-collapse: separate; border-spacing: .5em;'))
 
     if not is_gae:
         ram['keys'] = key_table(ram['keys'])
@@ -536,26 +536,26 @@ def table_template(table):
     # This is horribe HTML but the only one graphiz understands
     rows = []
     cellpadding = 4
-    color = "#000000"
-    bgcolor = "#FFFFFF"
-    face = "Helvetica"
-    face_bold = "Helvetica Bold"
+    color = '#000000'
+    bgcolor = '#FFFFFF'
+    face = 'Helvetica'
+    face_bold = 'Helvetica Bold'
     border = 0
 
     rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor),
                            _colspan=3, _cellpadding=cellpadding,
-                           _align="center", _bgcolor=color)))
+                           _align='center', _bgcolor=color)))
     for row in db[table]:
         rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold),
-                              _align="left", _cellpadding=cellpadding,
+                              _align='left', _cellpadding=cellpadding,
                               _border=border),
                        TD(FONT(row.type, _color=color, _face=face),
-                               _align="left", _cellpadding=cellpadding,
+                               _align='left', _cellpadding=cellpadding,
                                _border=border),
                        TD(FONT(types(row), _color=color, _face=face),
-                               _align="center", _cellpadding=cellpadding,
+                               _align='center', _cellpadding=cellpadding,
                                _border=border)))
-    return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
+    return '< %s >' % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
                                           _cellborder=0, _cellspacing=0)
                              ).xml()
 
@@ -632,15 +632,15 @@ def hooks():
                 if len(functions):
                     method_hooks.append({'name': op, 'functions':functions})
             if len(method_hooks):
-                tables.append({'name': "%s.%s" % (db_str, t), 'slug': IS_SLUG()("%s.%s" % (db_str,t))[0], 'method_hooks':method_hooks})
+                tables.append({'name': '%s.%s' % (db_str, t), 'slug': IS_SLUG()('%s.%s' % (db_str,t))[0], 'method_hooks':method_hooks})
     # Render
     ul_main = UL(_class='nav nav-list')
     for t in tables:
         ul_main.append(A(t['name'], _onclick="collapse('a_%s')" % t['slug']))
-        ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
+        ul_t = UL(_class='nav nav-list', _id='a_%s' % t['slug'], _style='display:none')
         for op in t['method_hooks']:
             ul_t.append(LI(op['name']))
-            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
+            ul_t.append(UL([LI(A(f['funcname'], _class='editor_filelink', _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main
 
@@ -650,11 +650,11 @@ def hooks():
 # ###########################################################
 
 def d3_graph_model():
-    """ See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    ''' See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
     and also the app_admin bg_graph_model function
 
-    Create a list of table dicts, called "nodes"
-    """
+    Create a list of table dicts, called 'nodes'
+    '''
 
     nodes = []
     links = []
@@ -670,10 +670,10 @@ def d3_graph_model():
                 elif f_type == 'string':
                     disp = field.length
                 elif f_type == 'id':
-                    disp = "PK"
+                    disp = 'PK'
                 elif f_type.startswith('reference') or \
                     f_type.startswith('list:reference'):
-                    disp = "FK"
+                    disp = 'FK'
                 else:
                     disp = ' '
                 fields.append(dict(name=field.name, type=field.type, disp=disp))
@@ -685,7 +685,7 @@ def d3_graph_model():
 
                     links.append(dict(source=tablename, target = referenced_table))
 
-            nodes.append(dict(name=tablename, type="table", fields = fields))
+            nodes.append(dict(name=tablename, type='table', fields = fields))
 
     # d3 v4 allows individual modules to be specified.  The complete d3 library is included below.
     response.files.append(URL('admin','static','js/d3.min.js'))

applications/examples/views/default/documentation.html

@@ -3,7 +3,7 @@
 <div>
   {{=get_content('main')}}
   <center>
-    <iframe src="//player.vimeo.com/hubnut/album/3016728?color=ff6600&amp;background=ffffff&amp;slideshow=1&amp;video_title=1&amp;video_byline=1" width="400" height="300" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+    <iframe src="https://player.vimeo.com/video/104800778?color=ff6600&amp;background=ffffff&amp;slideshow=1&amp;video_title=1&amp;video_byline=1" width="400" height="300" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
   </center>
   {{=get_content('official')}}
   {{=get_content('community')}}

applications/examples/views/default/download.html

@@ -9,7 +9,8 @@
   <table class="twothirds">
     <thead>
       <tr>
-        <th>For Normal Users</th>
+        <th>For Normal Users (Py3)</th>
+        <th>For Legacy Users (Py2)</th>
         <th>For Testers</th>
         <th>For Developers</th>
       </tr>
@@ -17,10 +18,13 @@
     <tbody>
       <tr>
         <td>
-          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win.zip">For Windows</a>
+          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win.zip">Windows binaries</a>
         </td>
         <td>
-          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_win.zip">For Windows</a>
+          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_win_py2.zip">Windows binaries</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_win.zip">Windows binaries</a>
         </td>
         <td>
           <a class="btn btn180 rounded red" href="http://github.com/web2py/web2py/">Git Repository</a>
@@ -28,17 +32,25 @@
       </tr>
       <tr>
         <td>
-          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx.zip">For Mac</a>
+          <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx.zip">Mac binaries</a>
         </td>
         <td>
-          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_osx.zip">For Mac</a>
+          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_osx_py2.zip">Mac binaries</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_osx.zip">Mac binaries</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded" href="http://mdipierro.github.io/web2py/web2py_manual_5th.pdf">Manual</a>
         </td>
-        <td></td>
       </tr>
       <tr>
         <td>
           <a class="btn btn180 rounded green" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_src.zip">Source Code</a>
         </td>
+        <td>
+          <a class="btn btn180 rounded" href="https://mdipierro.pythonanywhere.com/examples/static/web2py_src.zip">Source Code</a>
+        </td>
         <td>
           <a class="btn btn180 rounded yellow" href="https://mdipierro.pythonanywhere.com/examples/static/nightly/web2py_src.zip">Source Code</a>
         </td>
@@ -48,7 +60,8 @@
       </tr>
       <tr>
         <td>
-          <a class="btn btn180 rounded green" href="http://mdipierro.github.io/web2py/web2py_manual_5th.pdf">Manual</a>
+        </td>
+        <td>
         </td>
         <td>
           <a class="btn btn180 rounded" href="https://github.com/web2py/web2py/releases">Change Log</a>
@@ -62,13 +75,19 @@
 </center>
 
 <p style="text-align:left;">
-  The source code version works on Windows and most Unix systems, including <b>Linux</b>,  <b>BSD</b> and  <b>Mac</b> . It requires Python 2.6 (no more supported),  Python 2.7 (stable) or Python 3.5+ (recommended for new projects) already installed on your system.
-  There are also binary packages for Windows and Mac OS X. They include the Python 2.7 interpreter so you do not need to have it pre-installed.
+  The source code version works on Windows and most Unix systems, including <b>Linux</b>,  <b>BSD</b> and  <b>Mac</b> . It requires Python 3.5+ (recommended for new projects) 
+  or Python 2.7+ (stable, for use with legacy apps) already installed on your system.
+</p>
+<p style="text-align:left;">
+  There are also binary packages for Windows and MacOs. They include the Python interpreter version 3.7.4 or 2.7.16, so you do not need to have it pre-installed.
 </p>
 
 <h3>Instructions</h3>
-<p>With the binary packages, after download, just unzip it and then click on web2py.exe (windows) or web2py.app (osx).
-  If you prefer to run it from source with your own Python interpreter alreay installed, type:</p>
+<p>With the binary packages, after download, just unzip it and then click on web2py.exe (Windows) or web2py (MacOs).</p>
+<p>Note that on recent MacOs versions (10.12+) you could face problems in running the binary App program, due to the last changes to the security settings. 
+In this case, press the 'control' key + click on downloaded file and then 'open' it (confirm the warnings). Finally move the program in Applications and run it from there.
+</p>
+<p> If you prefer to run it from source with your own Python interpreter already installed, type:</p>
 {{=CODE("python web2py.py", language=None, counter='>', _class='boxCode')}}
 <p>or for more info type:</p>
 {{=CODE("python web2py.py -h", language=None, counter='>', _class='boxCode')}}

applications/welcome/controllers/appadmin.py

@@ -30,7 +30,7 @@ except:
 
 if request.is_https:
     session.secure()
-elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1") and \
+elif (remote_addr not in hosts) and (remote_addr != '127.0.0.1') and \
     (request.function != 'manage'):
     raise HTTP(200, T('appadmin is disabled because insecure channel'))
 
@@ -46,7 +46,7 @@ if request.function == 'manage':
                                       auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
     if not (gluon.fileutils.check_credentials(request) or auth.has_membership(manager_role)):
-        raise HTTP(403, "Not authorized")
+        raise HTTP(403, 'Not authorized')
     menu = False
 elif (request.application == 'admin' and not session.authorized) or \
         (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
@@ -182,7 +182,7 @@ def select():
     db = get_database(request)
     dbname = request.args[0]
     try:
-        is_imap = db._uri.startswith("imap://")
+        is_imap = db._uri.startswith('imap://')
     except (KeyError, AttributeError, TypeError):
         is_imap = False
     regex = re.compile(r'(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
@@ -224,15 +224,15 @@ def select():
     session.last_orderby = orderby
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
-                _name='query', _value=request.vars.query or '', _class="form-control",
+                _name='query', _value=request.vars.query or '', _class='form-control',
                 requires=IS_NOT_EMPTY(
-                    error_message=T("Cannot be empty")))), TR(T('Update:'),
+                    error_message=T('Cannot be empty')))), TR(T('Update:'),
                 INPUT(_name='update_check', _type='checkbox',
                 value=False), INPUT(_style='width:400px',
                 _name='update_fields', _value=request.vars.update_fields
-                                    or '', _class="form-control")), TR(T('Delete:'), INPUT(_name='delete_check',
+                                    or '', _class='form-control')), TR(T('Delete:'), INPUT(_name='delete_check',
                 _class='delete', _type='checkbox', value=False), ''),
-                TR('', '', INPUT(_type='submit', _value=T('submit'), _class="btn btn-primary"))),
+                TR('', '', INPUT(_type='submit', _value=T('Submit'), _class='btn btn-primary'))),
                 _action=URL(r=request, args=request.args))
 
     tb = None
@@ -254,8 +254,8 @@ def select():
 
             if is_imap:
                 fields = [db[table][name] for name in
-                    ("id", "uid", "created", "to",
-                     "sender", "subject")]
+                    ('id', 'uid', 'created', 'to',
+                     'sender', 'subject')]
             if orderby:
                 rows = db(query, ignore_common_filters=True).select(
                               *fields, limitby=(start, stop),
@@ -271,10 +271,10 @@ def select():
     # begin handle upload csv
     csv_table = table or request.vars.table
     if csv_table:
-        formcsv = FORM(str(T('or import from csv file')) + " ",
+        formcsv = FORM(str(T('or import from csv file')) + ' ',
                        INPUT(_type='file', _name='csvfile'),
                        INPUT(_type='hidden', _value=csv_table, _name='table'),
-                       INPUT(_type='submit', _value=T('import'), _class="btn btn-primary"))
+                       INPUT(_type='submit', _value=T('import'), _class='btn btn-primary'))
     else:
         formcsv = None
     if formcsv and formcsv.process().accepted:
@@ -356,26 +356,26 @@ def state():
 def ccache():
     if is_gae:
         form = FORM(
-            P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")))
+            P(TAG.BUTTON(T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')))
     else:
         cache.ram.initialize()
         cache.disk.initialize()
 
         form = FORM(
             P(TAG.BUTTON(
-                T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+                T('Clear CACHE?'), _type='submit', _name='yes', _value='yes')),
             P(TAG.BUTTON(
-                T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+                T('Clear RAM'), _type='submit', _name='ram', _value='ram')),
             P(TAG.BUTTON(
-                T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+                T('Clear DISK'), _type='submit', _name='disk', _value='disk')),
         )
 
     if form.accepts(request.vars, session):
-        session.flash = ""
+        session.flash = ''
         if is_gae:
             if request.vars.yes:
                 cache.ram.clear()
-                session.flash += T("Cache Cleared")
+                session.flash += T('Cache Cleared')
         else:
             clear_ram = False
             clear_disk = False
@@ -387,10 +387,10 @@ def ccache():
                 clear_disk = True
             if clear_ram:
                 cache.ram.clear()
-                session.flash += T("Ram Cleared")
+                session.flash += T('Ram Cleared')
             if clear_disk:
                 cache.disk.clear()
-                session.flash += T("Disk Cleared")
+                session.flash += T('Disk Cleared')
         redirect(URL(r=request))
 
     try:
@@ -436,7 +436,7 @@ def ccache():
             gae_stats['ratio'] = ((gae_stats['hits'] * 100) /
                 (gae_stats['hits'] + gae_stats['misses']))
         except ZeroDivisionError:
-            gae_stats['ratio'] = T("?")
+            gae_stats['ratio'] = T('?')
         gae_stats['oldest'] = GetInHMS(time.time() - gae_stats['oldest_item_age'])
         total.update(gae_stats)
     else:
@@ -502,7 +502,7 @@ def ccache():
             TR(TD(B(T('Key'))), TD(B(T('Time in Cache (h:m:s)')))),
             *[TR(TD(k[0]), TD('%02d:%02d:%02d' % k[1])) for k in keys],
             **dict(_class='cache-keys',
-                   _style="border-collapse: separate; border-spacing: .5em;"))
+                   _style='border-collapse: separate; border-spacing: .5em;'))
 
     if not is_gae:
         ram['keys'] = key_table(ram['keys'])
@@ -536,26 +536,26 @@ def table_template(table):
     # This is horribe HTML but the only one graphiz understands
     rows = []
     cellpadding = 4
-    color = "#000000"
-    bgcolor = "#FFFFFF"
-    face = "Helvetica"
-    face_bold = "Helvetica Bold"
+    color = '#000000'
+    bgcolor = '#FFFFFF'
+    face = 'Helvetica'
+    face_bold = 'Helvetica Bold'
     border = 0
 
     rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor),
                            _colspan=3, _cellpadding=cellpadding,
-                           _align="center", _bgcolor=color)))
+                           _align='center', _bgcolor=color)))
     for row in db[table]:
         rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold),
-                              _align="left", _cellpadding=cellpadding,
+                              _align='left', _cellpadding=cellpadding,
                               _border=border),
                        TD(FONT(row.type, _color=color, _face=face),
-                               _align="left", _cellpadding=cellpadding,
+                               _align='left', _cellpadding=cellpadding,
                                _border=border),
                        TD(FONT(types(row), _color=color, _face=face),
-                               _align="center", _cellpadding=cellpadding,
+                               _align='center', _cellpadding=cellpadding,
                                _border=border)))
-    return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
+    return '< %s >' % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
                                           _cellborder=0, _cellspacing=0)
                              ).xml()
 
@@ -632,15 +632,15 @@ def hooks():
                 if len(functions):
                     method_hooks.append({'name': op, 'functions':functions})
             if len(method_hooks):
-                tables.append({'name': "%s.%s" % (db_str, t), 'slug': IS_SLUG()("%s.%s" % (db_str,t))[0], 'method_hooks':method_hooks})
+                tables.append({'name': '%s.%s' % (db_str, t), 'slug': IS_SLUG()('%s.%s' % (db_str,t))[0], 'method_hooks':method_hooks})
     # Render
     ul_main = UL(_class='nav nav-list')
     for t in tables:
         ul_main.append(A(t['name'], _onclick="collapse('a_%s')" % t['slug']))
-        ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
+        ul_t = UL(_class='nav nav-list', _id='a_%s' % t['slug'], _style='display:none')
         for op in t['method_hooks']:
             ul_t.append(LI(op['name']))
-            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
+            ul_t.append(UL([LI(A(f['funcname'], _class='editor_filelink', _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main
 
@@ -650,11 +650,11 @@ def hooks():
 # ###########################################################
 
 def d3_graph_model():
-    """ See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
+    ''' See https://www.facebook.com/web2py/posts/145613995589010 from Bruno Rocha
     and also the app_admin bg_graph_model function
 
-    Create a list of table dicts, called "nodes"
-    """
+    Create a list of table dicts, called 'nodes'
+    '''
 
     nodes = []
     links = []
@@ -670,10 +670,10 @@ def d3_graph_model():
                 elif f_type == 'string':
                     disp = field.length
                 elif f_type == 'id':
-                    disp = "PK"
+                    disp = 'PK'
                 elif f_type.startswith('reference') or \
                     f_type.startswith('list:reference'):
-                    disp = "FK"
+                    disp = 'FK'
                 else:
                     disp = ' '
                 fields.append(dict(name=field.name, type=field.type, disp=disp))
@@ -685,7 +685,7 @@ def d3_graph_model():
 
                     links.append(dict(source=tablename, target = referenced_table))
 
-            nodes.append(dict(name=tablename, type="table", fields = fields))
+            nodes.append(dict(name=tablename, type='table', fields = fields))
 
     # d3 v4 allows individual modules to be specified.  The complete d3 library is included below.
     response.files.append(URL('admin','static','js/d3.min.js'))

applications/welcome/languages/pt-br.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 {
+'!=': '!=',
 '!langcode!': 'pt-br',
 '!langname!': 'Português (do Brasil)',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" é uma expressão opcional como "campo1=\'novovalor\'". Você não pode atualizar ou apagar os resultados de um JOIN',
+'%(nrows)s records found': '%(nrows)s registros encontrados',
 '%s %%{row} deleted': '%s linha apagadas',
 '%s %%{row} updated': '%s linha atualizadas',
 '%s selected': '%s selecionado',
@@ -12,6 +14,13 @@
 '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
 '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** items, **%(bytes)s** %%{byte(bytes)}',
 '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '**not available** (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
+'+ And': '+ E',
+'+ Or': '+ Ou',
+'<': '<',
+'<=': '<=',
+'=': '=',
+'>': '>',
+'>=': '>=',
 '?': '?',
 '@markmin\x01(**%.0d MB**)': '(**%.0d MB**)',
 '@markmin\x01**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}': '**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}',
@@ -22,23 +31,28 @@
 '@markmin\x01Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '@markmin\x01Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
-'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Number of entries: **%s**': 'Número de entradas: **%s**',
 '@markmin\x01RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)': '``**not available**``:red (requires the Python [[guppy http://pypi.python.org/pypi/guppy/ popup]] library)',
-'A new password was emailed to you': 'A new password was emailed to you',
+'A new password was emailed to you': 'Uma nova senha foi enviada por email para você',
 'About': 'Sobre',
 'Access Control': 'Controle de Acesso',
+'Add Record': 'Novo Registro',
+'Add record to database': 'Adicionar registro ao banco de dados',
+'Add this to the search as an AND term': 'Adicionar à pesquisa como um termo E',
+'Add this to the search as an OR term': 'Adicionar à pesquisa como um termo OU',
 'admin': 'admin',
 'Administrative Interface': 'Interface Administrativa',
 'Administrative interface': 'Interface administrativa',
 'Ajax Recipes': 'Receitas de Ajax',
 'An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
-'API Example': 'API Example',
+'API Example': 'Exmplo de API',
 'appadmin is disabled because insecure channel': 'Administração desativada porque o canal não é seguro',
-'Apply changes': 'Apply changes',
+'Apply changes': 'Aplicar Mudanças',
 'Are you sure you want to delete this object?': 'Você tem certeza que quer apagar este objeto?',
-'Authentication code': 'Authentication code',
+'Authentication code': 'Código de autenticação',
 'Available Databases and Tables': 'Bancos de dados e tabelas disponíveis',
+'Back': 'Voltar',
 'Buy this book': 'Compre o livro',
 "Buy web2py's book": 'Compre o livro do web2py',
 'cache': 'cache',
@@ -48,19 +62,27 @@
 'Cache Keys': 'Chaves de cache',
 'Cannot be empty': 'Não pode estar vazio',
 'change password': 'mudar senha',
-'Change Password': 'Change Password',
-'Change password': 'Change password',
+'Change Password': 'Trocar Senhar',
+'Change password': 'Trocar senha',
 'Check to delete': 'Marque para apagar',
+'Clear': 'Limpar',
 'Clear CACHE?': 'Limpar CACHE?',
 'Clear DISK': 'Limpar DISCO',
 'Clear RAM': 'Limpar memória RAM',
 'Click on the link %(link)s to reset your password': 'Click on the link %(link)s to reset your password',
 'Client IP': 'IP do cliente',
+'Close': 'Fechar',
+'Comma-separated export including columns not shown; fields from other tables are exported as raw values for faster export': 'Comma-separated export including columns not shown; fields from other tables are exported as raw values for faster export',
+'Comma-separated export of visible columns. Fields from other tables are exported as they appear on-screen but this may be slow for many rows': 'Comma-separated export of visible columns. Fields from other tables are exported as they appear on-screen but this may be slow for many rows',
 'Community': 'Comunidade',
 'Components and Plugins': 'Componentes e Plugins',
 'Config.ini': 'Config.ini',
+'Confirm Password': 'Confirme a Senha',
+'contains': 'contém',
 'Controller': 'Controlador',
 'Copyright': 'Copyright',
+'CSV': 'CSV',
+'CSV (hidden cols)': 'CSV (col. ocultas)',
 'Current request': 'Requisição atual',
 'Current response': 'Resposta atual',
 'Current session': 'Sessão atual',
@@ -68,9 +90,10 @@
 'data uploaded': 'dados enviados',
 'Database': 'banco de dados',
 'Database %s select': 'Selecionar banco de dados %s',
-'Database Administration (appadmin)': 'Database Administration (appadmin)',
+'Database Administration (appadmin)': 'Administração de Banco de Dados (appadmin)',
 'db': 'bd',
 'DB Model': 'Modelo BD',
+'Delete': 'Excluir',
 'Delete:': 'Apagar:',
 'Demo': 'Demo',
 'Deployment Recipes': 'Receitas de deploy',
@@ -91,50 +114,57 @@
 'edit profile': 'editar perfil',
 'Edit This App': 'Editar esta aplicação',
 'Email and SMS': 'Email e SMS',
-'Email sent': 'Email sent',
-'Email verification': 'Email verification',
-'Email verified': 'Email verified',
+'Email sent': 'Email enviado',
+'Email verification': 'Verificação de email',
+'Email verified': 'Email verificado',
 'Enter an integer between %(min)g and %(max)g': 'Informe um valor inteiro entre %(min)g e %(max)g',
 'Errors': 'Erros',
 'export as csv file': 'exportar como um arquivo csv',
+'Export:': 'Exportar:',
 'FAQ': 'Perguntas frequentes',
 'First name': 'Nome',
 'Forms and Validators': 'Formulários e Validadores',
 'Free Applications': 'Aplicações gratuitas',
-'Function disabled': 'Function disabled',
-'Graph Model': 'Graph Model',
+'Function disabled': 'Função desabilitada',
+'Graph Model': 'Modelo em Grafo',
 'Grid Example': 'Exemplo de Grade',
-'Group %(group_id)s created': 'Group %(group_id)s created',
-'Group %(group_id)s deleted': 'Group %(group_id)s deleted',
+'Group %(group_id)s created': 'Grupo %(group_id)s criado',
+'Group %(group_id)s deleted': 'Grupo %(group_id)s excluído',
 'Group ID': 'ID do Grupo',
-'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
+'Group uniquely assigned to user %(id)s': 'Gurpo unicamente atribuído ao usuário %(id)s',
 'Groups': 'Grupos',
 'Hello World': 'Olá Mundo',
-'Helping web2py': 'Helping web2py',
+'Helping web2py': 'Ajudando web2py',
 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})': 'Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})',
 'Home': 'Principal',
 'How did you get here?': 'Como você chegou aqui?',
+'HTML': 'HTML',
+'HTML export of visible columns': 'HTML exportar colunas visíveis',
+'Id': 'Id',
 'import': 'importar',
 'Import/Export': 'Importar/Exportar',
+'in': 'em',
 'Incorrect code. {0} more attempt(s) remaining.': 'Incorrect code. {0} more attempt(s) remaining.',
 'Index': 'Início',
 'insert new': 'inserir novo',
 'insert new %s': 'inserir novo %s',
-'Insufficient privileges': 'Insufficient privileges',
+'Insufficient privileges': 'Privilégios insuficientes',
 'Internal State': 'Estado Interno',
 'Introduction': 'Introdução',
 'Invalid email': 'Email inválido',
-'Invalid key': 'Invalid key',
-'Invalid login': 'Invalid login',
-'Invalid password': 'Invalid password',
+'Invalid key': 'Chave inválida',
+'Invalid login': 'Login Inválido',
+'Invalid password': 'Senha inválida',
 'Invalid Query': 'Consulta Inválida',
 'invalid request': 'requisição inválida',
-'Invalid reset password': 'Invalid reset password',
-'Invalid user': 'Invalid user',
-'Invalid username': 'Invalid username',
-'Invitation to join %(site)s': 'Invitation to join %(site)s',
+'Invalid reset password': 'Recriação de senha inválida',
+'Invalid user': 'Usuário inválido',
+'Invalid username': 'Nome de usuário inválido',
+'Invitation to join %(site)s': 'Convite para entrar %(site)s',
+'JSON': 'JSON',
+'JSON export of visible columns': 'JSON exportar colunas visíveis',
 'Key': 'Chave',
-'Key verified': 'Key verified',
+'Key verified': 'Chave verificada',
 'Last name': 'Sobrenome',
 'Layout': 'Layout',
 'Layout Plugins': 'Plugins de Layout',
@@ -142,13 +172,13 @@
 'Live chat': 'Chat ao vivo',
 'Live Chat': 'Chat ao vivo',
 'Log In': 'Entrar',
-'Logged in': 'Logged in',
-'Logged out': 'Logged out',
+'Logged in': 'Conectado',
+'Logged out': 'Desconectado',
 'login': 'Entrar',
 'Login': 'Entrar',
-'Login disabled by administrator': 'Login disabled by administrator',
+'Login disabled by administrator': 'Login desabilitado pelo administrador',
 'logout': 'Sair',
-'Logout': 'Logout',
+'Logout': 'Sair',
 'Lost Password': 'Esqueceu sua senha?',
 'lost password?': 'esqueceu sua senha?',
 'Lost your password?': 'Esqueceu sua senha?',
@@ -160,16 +190,19 @@
 'Menu Model': 'Modelo de Menu',
 'My Sites': 'Meus sites',
 'Name': 'Nome',
-'New password': 'New password',
+'New password': 'Nova senha',
 'New Record': 'Novo Registro',
 'new record inserted': 'novo registro inserido',
+'New Search': 'Nova pesquisa',
 'next %s rows': 'próximas %s ´linhas',
 'next 100 rows': 'próximas 100 linhas',
 'No databases in this application': 'Não há bancos de dados nesta aplicação',
+'No records found': 'Não foram encontrados registros',
+'not in': 'não está em',
 'Number of entries: **%s**': 'Número de entradas: **%s**',
 'Object or table name': 'Nome do objeto do da tabela',
-'Old password': 'Old password',
-'Online book': 'Online book',
+'Old password': 'Senha antiga',
+'Online book': 'Livro online',
 'Online examples': 'Exemplos online',
 'or import from csv file': 'ou importar de um arquivo csv',
 'Origin': 'Origem',
@@ -177,66 +210,71 @@
 'Other Recipes': 'Outras Receitas',
 'Overview': 'Visão Geral',
 'Password': 'Senha',
-'Password changed': 'Password changed',
-"Password fields don't match": "Password fields don't match",
-'Password reset': 'Password reset',
-'Password retrieve': 'Password retrieve',
-'Permission': 'Permission',
-'Permissions': 'Permissions',
-'please input your password again': 'please input your password again',
+'Password changed': 'Senha trocada',
+"Password fields don't match": 'Senhas não conferem',
+'Password reset': 'Recriar senha',
+'Password retrieve': 'Recuperar senha',
+'Permission': 'Permissão',
+'Permissions': 'Permissões',
+'please input your password again': 'por favor digite a senha novamente',
 'Plugins': 'Plugins',
 'Powered by': 'Desenvolvido com',
 'Preface': 'Prefácio',
 'previous %s rows': '%s linhas anteriores',
 'previous 100 rows': '100 linhas anteriores',
-'Profile': 'Profile',
-'Profile updated': 'Profile updated',
+'Profile': 'Perfil',
+'Profile updated': 'Perfil atualizado',
 'pygraphviz library not found': 'biblioteca pygraphviz não encontrada',
 'Python': 'Python',
 'Query:': 'Consulta:',
 'Quick Examples': 'Exemplos rápidos',
 'RAM': 'RAM',
-'RAM Cache Keys': 'RAM Cache Keys',
+'RAM Cache Keys': 'Chaves de Cache RAM ',
 'Ram Cleared': 'Ram Limpa',
 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.': 'RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.',
 'Recipes': 'Receitas',
 'Record': 'Registro',
-'Record %(id)s created': 'Record %(id)s created',
-'Record %(id)s deleted': 'Record %(id)s deleted',
-'Record %(id)s read': 'Record %(id)s read',
-'Record %(id)s updated': 'Record %(id)s updated',
-'Record Created': 'Record Created',
-'Record Deleted': 'Record Deleted',
+'Record %(id)s created': 'Registro %(id)s criado',
+'Record %(id)s deleted': 'Registro %(id)s excluído',
+'Record %(id)s read': 'Registro %(id)s lido',
+'Record %(id)s updated': 'Registro %(id)s atualizado',
+'Record Created': 'Registro Criado',
+'Record Deleted': 'Registro Excluído',
 'record does not exist': 'registro não existe',
 'Record ID': 'ID do Registro',
 'Record id': 'id do registro',
-'Record Updated': 'Record Updated',
-'register': 'Registre-se',
-'Register': 'Registre-se',
-'Registration identifier': 'Idenficador de registro',
-'Registration is pending approval': 'Registration is pending approval',
-'Registration key': 'Chave de registro',
-'Registration needs verification': 'Registration needs verification',
-'Registration successful': 'Registration successful',
+'Record Updated': 'Registro Atualizado',
+'register': 'Cadastre-se',
+'Register': 'Cadastre-se',
+'Registration identifier': 'Idenficador de Cadastro',
+'Registration is pending approval': 'Aprovação de cadastro pendente',
+'Registration key': 'Chave de cadastro',
+'Registration needs verification': 'Cadastro necessita verficação',
+'Registration successful': 'Cadastro finalizado',
 'Remember me (for 30 days)': 'Mantenha-me logado (por 30 dias)',
-'Request reset password': 'Request reset password',
+'Request reset password': 'Requerer recriação de senha',
 'Reset Password key': 'Resetar chave de senha',
 'Resources': 'Recursos',
 'Role': 'Papel',
-'Roles': 'Roles',
+'Roles': 'Papéis',
 'Rows in Table': 'Linhas na tabela',
 'Rows selected': 'Linhas selecionadas',
 'Save model as...': 'Salvar modelo como...',
+'Search': 'Pesquisar',
 'Semantic': 'Semântico',
 'Services': 'Serviço',
 'Sign Up': 'Cadastrar',
 'Sign up': 'Cadastrar',
 'Size of cache:': 'Tamanho do cache:',
+'Spreadsheet-optimised export of tab-separated content including hidden columns. May be slow': 'Spreadsheet-optimised export of tab-separated content including hidden columns. May be slow',
+'Spreadsheet-optimised export of tab-separated content, visible columns only. May be slow.': 'Spreadsheet-optimised export of tab-separated content, visible columns only. May be slow.',
+'Start building a new search': 'Comerçar um nova pesquisa',
+'starts with': 'começa com',
 'state': 'estado',
 'Statistics': 'Estatísticas',
 'Stylesheet': 'Folha de estilo',
 'submit': 'enviar',
-'Submit': 'Submit',
+'Submit': 'Enviar',
 'Support': 'Suporte',
 'Sure you want to delete this object?': 'Está certo(a) que deseja apagar este objeto?',
 'Table': 'Tabela',
@@ -252,31 +290,33 @@
 'Time in Cache (h:m:s)': 'Tempo em Cache (h:m:s)',
 'Timestamp': 'Timestamp',
 'Traceback': 'Traceback',
+'TSV (Spreadsheets)': 'TSV (Planilhas)',
+'TSV (Spreadsheets, hidden cols)': 'TSV (Planilhas, col. ocultas)',
 'Twitter': 'Twitter',
-'Two-step Login Authentication Code': 'Two-step Login Authentication Code',
+'Two-step Login Authentication Code': 'Código de Autenticação de Login em Dois Fatores',
 'unable to parse csv file': 'não foi possível analisar arquivo csv',
-'Unable to send email': 'Unable to send email',
+'Unable to send email': 'Não foi possível enviar email',
 'Update:': 'Atualizar:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, e ~(...)  para NOT para construir consultas mais complexas.',
-'User': 'User',
+'User': 'Usuário',
 'User %(id)s is impersonating %(other_id)s': 'User %(id)s is impersonating %(other_id)s',
-'User %(id)s Logged-in': 'User %(id)s Logged-in',
-'User %(id)s Logged-out': 'User %(id)s Logged-out',
-'User %(id)s Password changed': 'User %(id)s Password changed',
-'User %(id)s Password reset': 'User %(id)s Password reset',
-'User %(id)s Password retrieved': 'User %(id)s Password retrieved',
-'User %(id)s Profile updated': 'User %(id)s Profile updated',
-'User %(id)s Registered': 'User %(id)s Registered',
-'User %(id)s Username retrieved': 'User %(id)s Username retrieved',
-'User %(id)s Verification email sent': 'User %(id)s Verification email sent',
-'User %(id)s verified registration key': 'User %(id)s verified registration key',
+'User %(id)s Logged-in': 'Usuário %(id)s entrou',
+'User %(id)s Logged-out': 'Usuário %(id)s saiu',
+'User %(id)s Password changed': 'Usuário %(id)s trocou a senha',
+'User %(id)s Password reset': 'Usuário %(id)s recirar a senha',
+'User %(id)s Password retrieved': 'Usuário %(id)s Recuperou a senha',
+'User %(id)s Profile updated': 'Usuário %(id)s Atualizou perfil',
+'User %(id)s Registered': 'Usuário %(id)s Cadastrou-se',
+'User %(id)s Username retrieved': 'Usuário %(id)s Recuperou nome de usuário',
+'User %(id)s Verification email sent': 'Usuário %(id)s Email de verificação enviado',
+'User %(id)s verified registration key': 'Usuário %(id)s chave de cadastro verificada',
 'User ID': 'ID do Usuário',
 'User Voice': 'Opinião dos usuários',
-'Username': 'Username',
-'Username already taken': 'Username already taken',
-'Username retrieve': 'Username retrieve',
-'Users': 'Users',
-'Verify Password': 'Verify Password',
+'Username': 'Nome de Usuário',
+'Username already taken': 'Nome de usuário já existe',
+'Username retrieve': 'Recuperar nome de usuário',
+'Users': 'Usuários',
+'Verify Password': 'Verificar Senha',
 'Videos': 'Vídeos',
 'View': 'Visualização',
 'Web2py': 'Web2py',
@@ -286,15 +326,17 @@
 'Welcome to web2py': 'Bem-vindo ao web2py',
 'Welcome to web2py!': 'Bem-vindo ao web2py!',
 'Which called the function %s located in the file %s': 'Que chamou a função %s localizada no arquivo %s',
-'Wiki Example': 'Wiki Example',
+'Wiki Example': 'Exmplo de Wiki',
 'Working...': 'Trabalhando...',
+'XML': 'XML',
+'XML export of columns shown': 'XML exportar colunas visíveis',
 'You are successfully running web2py': 'Você está executando o web2py com sucesso',
 'You are successfully running web2py.': 'Você está executando o web2py com sucesso.',
 'You can modify this application and adapt it to your needs': 'Você pode modificar esta aplicação e adaptá-la às suas necessidades',
 'You have been invited to join %(site)s, click %(link)s to complete the process': 'You have been invited to join %(site)s, click %(link)s to complete the process',
 'You visited the url %s': 'Você acessou a url %s',
-'Your password is: %(password)s': 'Your password is: %(password)s',
-'Your temporary login code is {0}': 'Your temporary login code is {0}',
-'Your username is: %(username)s': 'Your username is: %(username)s',
-'Your username was emailed to you': 'Your username was emailed to you',
+'Your password is: %(password)s': 'Sua senha é: %(password)s',
+'Your temporary login code is {0}': 'Seu código temporário de login é {0}',
+'Your username is: %(username)s': 'Seu nome de usuário é: %(username)s',
+'Your username was emailed to you': 'Seu nome de usuário foi enviado por email para você',
 }

applications/welcome/static/js/web2py.js

@@ -283,7 +283,11 @@
             doc.ajaxSuccess(function (e, xhr) {
                 var redirect = xhr.getResponseHeader('web2py-redirect-location');
                 if (redirect !== null) {
-                    window.location = redirect;
+                    if (!redirect.endsWith('#')) {
+                        window.location.href = redirect;
+                    } else {
+                        window.location.reload();
+                    }
                 }
                 /* run this here only if this Ajax request is NOT for a web2py component. */
                 if (xhr.getResponseHeader('web2py-component-content') === null) {
@@ -335,7 +339,7 @@
                     } else {
                         formData = form.serialize(); // Fallback for older browsers.
                     }
-                    web2py.ajax_page('post', url, formData, target, form);
+                    web2py.ajax_page('post', url, formData, target);
 
                     e.preventDefault();
                 });
@@ -367,6 +371,24 @@
                     'data': data,
                     'processData': !isFormData,
                     'contentType': contentType,
+                    'xhr': function() {
+                        var xhr = new window.XMLHttpRequest();
+
+                        xhr.upload.addEventListener("progress", function(evt) {
+                            if (evt.lengthComputable) {
+                                var percentComplete = evt.loaded / evt.total;
+                                percentComplete = parseInt(percentComplete * 100);
+                                web2py.fire(element, 'w2p:uploadProgress', [percentComplete], target);
+
+                                if (percentComplete === 100) {
+                                    web2py.fire(element, 'w2p:uploadComplete', [], target);
+                                }
+
+                            }
+                        }, false);
+
+                        return xhr;
+                    },
                     'beforeSend': function (xhr, settings) {
                         xhr.setRequestHeader('web2py-component-location', document.location);
                         xhr.setRequestHeader('web2py-component-element', target);

appveyor.yml

@@ -1,4 +1,8 @@
 build: false
+before_build:
+  - choco install redis-64
+  - redis-server --service-install
+  - redis-server --service-start
 
 environment:
   matrix:
@@ -26,7 +30,7 @@ init:
 
 install:
   - python -m ensurepip
-  - pip install codecov
+  - pip install codecov redis
   - git submodule update --init --recursive
   # Check that we have the expected version and architecture for Python
   - "python --version"

docker/alpine/web2py-rocket-ssl/Dockerfile

@@ -19,4 +19,4 @@ WORKDIR /web2py
 
 EXPOSE 443
 
-CMD python /web2py/web2py.py --nogui --no-banner -a 'a' -c web2py.crt -k web2py.key -i 0.0.0.0 -p 443
+CMD python /web2py/web2py.py --no_gui --no_banner -a 'a' -k web2py.key -c web2py.crt -i 0.0.0.0 -p 443

docker/alpine/web2py-rocket/Dockerfile

@@ -24,4 +24,4 @@ WORKDIR /home/web2py/web2py
 
 EXPOSE 8000
 
-CMD . /home/web2py/bin/activate && python /home/web2py/web2py/web2py.py --nogui --no-banner -a 'a' -i 0.0.0.0 -p 8000
+CMD . /home/web2py/bin/activate && python /home/web2py/web2py/web2py.py --no_gui --no_banner -a 'a' -i 0.0.0.0 -p 8000