[sagenb] 163/179: catch LookupError from openid creation

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit 832b6517a1759c8733cfdf38b3c3e748b5f89361
Author: Punarbasu Purkayastha <ppurka at gmail.com>
Date:   Wed Dec 25 14:53:16 2013 +0800

    catch LookupError from openid creation
---
 flask_version/base.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/flask_version/base.py b/flask_version/base.py
index 5e879aa..e0417fc 100755
--- a/flask_version/base.py
+++ b/flask_version/base.py
@@ -238,7 +238,7 @@ def create_or_login(resp):
         username = g.notebook.user_manager().get_username_from_openid(resp.identity_url)
         session['username'] = g.username = username
         session.modified = True
-    except KeyError:
+    except (KeyError, LookupError):
         session['openid_response'] = resp
         session.modified = True
         return redirect(url_for('set_profiles'))
@@ -298,26 +298,26 @@ def set_profiles():
                         parse_dict['challenge_html'] = chal.html(error_code = err_code)
                     else:
                         parse_dict['challenge_invalid'] = True
-                    raise ValueError
+                    raise ValueError("Invalid challenge")
                 else:
                     parse_dict['challenge_missing'] = True
-                    raise ValueError
+                    raise ValueError("Missing challenge")
 
             if not is_valid_username(username):
                 parse_dict['username_invalid'] = True
-                raise ValueError
+                raise ValueError("Invalid username")
             if g.notebook.user_manager().user_exists(username):
                 parse_dict['username_taken'] = True
-                raise ValueError
+                raise ValueError("Pre-existing username")
             if not is_valid_email(request.form.get('email')):
                 parse_dict['email_invalid'] = True
-                raise ValueError
+                raise ValueError("Invalid email")
             try:
                 new_user = User(username, '', email = resp.email, account_type='user')
                 g.notebook.user_manager().add_user_object(new_user)
-            except ValueError:
+            except ValueError as msg:
                 parse_dict['creation_error'] = True
-                raise ValueError
+                raise ValueError("Error in creating user\n%s"%msg)
             g.notebook.user_manager().create_new_openid(resp.identity_url, username)
             session['username'] = g.username = username
             session.modified = True

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git