From 933e3df9d333aadc610c1616d4b9c2b6f8b8a210 Mon Sep 17 00:00:00 2001
From: Jim Steil <jim@steilonline.com>
Date: Fri, 1 May 2020 14:33:40 -0500
Subject: [PATCH 1/2] 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 <jim@steilonline.com>
Date: Wed, 6 May 2020 08:03:01 -0500
Subject: [PATCH 2/2] 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"