Merge branch 'master' of github.com:web2py/web2py

gluon/console.py

@@ -266,6 +266,12 @@ web2py will attempt to run a GUI to ask for it when starting the web server
         '(default is %(default)s), see -S above. NOTE: when the APP_ENV '
         'argument of -S include a controller c automatic import of '
         'models is always enabled')
+    g.add_argument('--fake_migrate',
+                   default=False,
+                   action='store_true',
+                   help=
+                   'force DAL to fake migrate all tables; '
+                   'monkeypatch in the DAL class to force _fake_migrate=True')
     g.add_argument('--force_migrate', '--force-migrate',
                    default=False,
                    action='store_true', help=

gluon/contrib/markmin/markmin2latex.py

@@ -237,6 +237,7 @@ WRAPPER = """
 \\usepackage{graphicx}
 \\usepackage{grffile}
 \\usepackage[utf8x]{inputenc}
+\\usepackage{textgreek}
 \\definecolor{lg}{rgb}{0.9,0.9,0.9}
 \\definecolor{dg}{rgb}{0.3,0.3,0.3}
 \\def\\ft{\\small\\tt}

gluon/contrib/markmin/markmin2pdf.py

@@ -80,7 +80,7 @@ def latex2pdf(latex, pdflatex='pdflatex', passes=3):
             outfile.close()
         re_errors = re.compile('^\!(.*)$', re.M)
         re_warnings = re.compile('^LaTeX Warning\:(.*)$', re.M)
-        flog = open(logname)
+        flog = open(logname,encoding="utf-8")
         try:
             loglines = flog.read()
         finally:

gluon/shell.py

@@ -217,7 +217,8 @@ def run(
     python_code=None,
     cron_job=False,
     scheduler_job=False,
-    force_migrate=False):
+    force_migrate=False,
+    fake_migrate=False):
     """
     Start interactive shell or run Python script (startfile) in web2py
     controller environment. appname is formatted like:
@@ -248,6 +249,7 @@ def run(
             fileutils.create_app(adir)
 
     if force_migrate:
+        c = 'appadmin' # Load all models (hack already used for appadmin controller)
         import_models = True
         from gluon.dal import DAL
         orig_init = DAL.__init__
@@ -255,6 +257,7 @@ def run(
         def custom_init(*args, **kwargs):
             kwargs['migrate_enabled'] = True
             kwargs['migrate'] = True
+            kwargs['fake_migrate'] = fake_migrate
             logger.info('Forcing migrate_enabled=True')
             orig_init(*args, **kwargs)
 

gluon/tools.py

@@ -2638,9 +2638,7 @@ class Auth(AuthAPI):
                         # invalid login
                         session.flash = specific_error if self.settings.login_specify_error else self.messages.invalid_login
                         callback(onfail, None)
-                        if 'password' in request.post_vars:
+                        redirect(self.url(args=request.args, vars=request.get_vars),client_side=settings.client_side)
-                            del request.post_vars['password']
-                        redirect(self.url(args=request.args, vars=request.vars),client_side=settings.client_side)
 
             else:  # use a central authentication server
                 cas = settings.login_form

gluon/widget.py

@@ -741,7 +741,8 @@ def start():
         sys.argv = [options.run or ''] + options.args
         run(options.shell, plain=options.plain, bpython=options.bpython,
             import_models=options.import_models, startfile=options.run,
-            cron_job=options.cron_job, force_migrate=options.force_migrate)
+            cron_job=options.cron_job, force_migrate=options.force_migrate,
+            fake_migrate=options.fake_migrate)
         return
 
     # set size of cron thread pools

scripts/migrator.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 '''
 To use, e.g. python .\web2py.py -S APPNAME --force_migrate
+To use, e.g. python .\web2py.py -S APPNAME --force_migrate --fake_migrate
 '''
 
 import logging
@@ -31,5 +32,6 @@ for db_name in databases:
     for table_name in tables:
         # Force migration of lazy tables
         logger.debug("Ensuring migration of table '%s'", table_name)
-        db(db[table_name]).isempty()
+        table = db[table_name]
+        db(table).isempty()
     db.commit()