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

appveyor.yml

@@ -10,10 +10,6 @@ environment:
       COVERAGE_PROCESS_START: gluon/tests/coverage.ini
       PYTHON_ARCH: "64"
 
-    - PYTHON: "C:/Python35"
-      COVERAGE_PROCESS_START: gluon/tests/coverage.ini
-      PYTHON_ARCH: "64"
-
     - PYTHON: "C:/Python36"
       COVERAGE_PROCESS_START: gluon/tests/coverage.ini
       PYTHON_ARCH: "64"

gluon/shell.py

@@ -241,13 +241,16 @@ def run(
         if not cron_job and not scheduler_job and \
             sys.stdin and not sys.stdin.name == '/dev/null':
             confirm = raw_input(
-                'application %s does not exist, create (y/n)?' % a)
+                'application %s does not exist, create (y/N)?' % a)
         else:
             logging.warn('application does not exist and will not be created')
             return
         if confirm.lower() in ('y', 'yes'):
             os.mkdir(adir)
             fileutils.create_app(adir)
+        else:
+            logging.warn('application folder does not exist and has not been created as requested')
+            return
 
     if force_migrate:
         c = 'appadmin' # Load all models (hack already used for appadmin controller)

gluon/sqlhtml.py

@@ -1501,7 +1501,7 @@ class SQLFORM(FORM):
             if readonly and not ignore_rw and not field.readable:
                 continue
 
-            if record:
+            if record and fieldname not in [x.name for x in extra_fields]:
                 default = record[fieldname]
             else:
                 default = field.default

web2py.py

@@ -19,6 +19,9 @@ else:
 # process -f (--folder) option
 if '-f' in sys.argv:
     fi = sys.argv.index('-f')
+    # maybe session2trash arg
+    if '-A' in sys.argv and  fi > sys.argv.index('-A'):
+        fi = None
 elif '--folder' in sys.argv:
     fi = sys.argv.index('--folder')
 else: