From 75491fb2734994435a5c145204cdcf790b3a1e3f Mon Sep 17 00:00:00 2001
From: Tim Nyborg <tim.nyborg@gmail.com>
Date: Fri, 23 Aug 2019 12:25:11 +0100
Subject: [PATCH 1/3] python3 compatibility for JSONRPCError

Trying this again, now that I learned about gluon._compat
---
 gluon/contrib/simplejsonrpc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gluon/contrib/simplejsonrpc.py b/gluon/contrib/simplejsonrpc.py
index 0ffe8add..2769b09d 100644
--- a/gluon/contrib/simplejsonrpc.py
+++ b/gluon/contrib/simplejsonrpc.py
@@ -30,7 +30,7 @@ else:
     from io import StringIO
 import random
 import json
-
+from gluon._compat import basestring
 
 class JSONRPCError(RuntimeError):
     "Error object for remote procedure call fail"

From 1dec1b4358d271815a0fa8fbba8d466b1a9010f1 Mon Sep 17 00:00:00 2001
From: Mirko Galimberti <me@mirkogalimberti.com>
Date: Mon, 2 Sep 2019 13:50:39 +0200
Subject: [PATCH 2/3] Checks for user availability before accessing the
 registration key

---
 gluon/tools.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gluon/tools.py b/gluon/tools.py
index e6421b88..a6d79678 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -3171,12 +3171,12 @@ class Auth(AuthAPI):
                         formname='retrieve_password', dbio=False,
                         onvalidation=onvalidation, hideerror=self.settings.hideerror):
             user = table_user(email=form.vars.email)
-            key = user.registration_key
             if not user:
                 current.session.flash = \
                     self.messages.invalid_email
                 redirect(self.url(args=request.args))
-            elif key in ('pending', 'disabled', 'blocked') or (key or '').startswith('pending'):
+            key = user.registration_key
+            if key in ('pending', 'disabled', 'blocked') or (key or '').startswith('pending'):
                 current.session.flash = \
                     self.messages.registration_pending
                 redirect(self.url(args=request.args))

From d17572fb105b5a1aafb7c03aad8b87aeb9b7b016 Mon Sep 17 00:00:00 2001
From: Queen Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Thu, 5 Sep 2019 00:02:19 -0700
Subject: [PATCH 3/3] Don't set form in trap_form as ajax_page element

---
 applications/welcome/static/js/web2py.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js
index 22b9f253..8eaf54aa 100644
--- a/applications/welcome/static/js/web2py.js
+++ b/applications/welcome/static/js/web2py.js
@@ -335,7 +335,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();
                 });