From 97bb26d452ce7d461bdf56274bb17a67771c09c6 Mon Sep 17 00:00:00 2001 From: Nico Zanferrari Date: Sun, 26 Apr 2020 22:14:36 +0200 Subject: [PATCH 1/6] Fix errors with unwanted new app folder Replying 'no' or ENTER when asked for the creation of a missing app folder was not properly managed. It gives IOError on Mac and unwanted behaviour on Win --- gluon/shell.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gluon/shell.py b/gluon/shell.py index 92b6334b..276473f9 100644 --- a/gluon/shell.py +++ b/gluon/shell.py @@ -248,6 +248,9 @@ def run( 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) From 9ffce59ddb3adcfa57bf79f9a64021f74f6ac748 Mon Sep 17 00:00:00 2001 From: Nico Zanferrari Date: Mon, 27 Apr 2020 10:20:11 +0200 Subject: [PATCH 2/6] Update shell.py --- gluon/shell.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/shell.py b/gluon/shell.py index 276473f9..20d58de3 100644 --- a/gluon/shell.py +++ b/gluon/shell.py @@ -241,7 +241,7 @@ 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 From 933e3df9d333aadc610c1616d4b9c2b6f8b8a210 Mon Sep 17 00:00:00 2001 From: Jim Steil Date: Fri, 1 May 2020 14:33:40 -0500 Subject: [PATCH 3/6] Proposed fix for issue 2315 --- gluon/sqlhtml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index c0fb955e..5c82c17c 100644 --- a/gluon/sqlhtml.py +++ b/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 From 64c42f758073fa64e0d744be5b5290b016e54880 Mon Sep 17 00:00:00 2001 From: Jim Steil Date: Wed, 6 May 2020 08:03:01 -0500 Subject: [PATCH 4/6] Update appveyor.yml Removed Python 3.5 checks per Leonel's recommendation --- appveyor.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a8918b2f..937db675 100644 --- a/appveyor.yml +++ b/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" From 44f2860d588e008e53758c68af5ca333291f1d5c Mon Sep 17 00:00:00 2001 From: Jim Steil Date: Wed, 6 May 2020 08:25:07 -0500 Subject: [PATCH 5/6] Update appveyor.yml Removed Python 3.5 per Leonel's recommendation --- appveyor.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a8918b2f..937db675 100644 --- a/appveyor.yml +++ b/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" From 2a758d3936dad6c59545acb2786089719a762951 Mon Sep 17 00:00:00 2001 From: valq7711 Date: Thu, 14 May 2020 03:10:00 +0300 Subject: [PATCH 6/6] fix CL-args processing (-f maybe session2trash arg) --- web2py.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web2py.py b/web2py.py index 875642da..5c8c91c6 100755 --- a/web2py.py +++ b/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: