[sagenb] 112/179: fix KeyError in user_manager.py

felix salfelder felix-guest at moszumanska.debian.org
Tue May 6 12:05:15 UTC 2014


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

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

commit 45bcc45d8b6888b839671e818448bf77d3217097
Author: P Purkayastha <ppurka at gmail.com>
Date:   Fri May 3 13:36:06 2013 +0800

    fix KeyError in user_manager.py
---
 sagenb/notebook/user_manager.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sagenb/notebook/user_manager.py b/sagenb/notebook/user_manager.py
index 994f17a..1ba94bd 100644
--- a/sagenb/notebook/user_manager.py
+++ b/sagenb/notebook/user_manager.py
@@ -94,7 +94,7 @@ class UserManager(object):
             sage: U.user('william')
             Traceback (most recent call last):
             ...
-            KeyError: "no user 'william'"
+            LookupError: "no user 'william'"
 
             sage: U.user('hello/')
             Traceback (most recent call last):
@@ -111,7 +111,7 @@ class UserManager(object):
         except AttributeError:
             pass
 
-        raise KeyError, "no user '%s'"%username
+        raise LookupError("no user '{}'".format(username))
 
     def valid_login_names(self):
         """
@@ -392,7 +392,7 @@ class SimpleUserManager(UserManager):
         elif username == 'guest':
             self.add_user('guest', '', '', account_type='guest', force=True)
             return self.users()[username]
-        raise KeyError("no user '{0}'".format(username))
+        raise LookupError("no user '{}'".format(username))
 
         
     def set_password(self, username, new_password, encrypt = True):
@@ -517,7 +517,7 @@ class ExtAuthUserManager(SimpleUserManager):
                     self.add_user(username, password='', email=email, account_type='user', external_auth=a, force=True)
                     return self.users()[username]
 
-        raise KeyError, "no user '%s'"%username
+        raise LookupError("no user '{}'".format(username))
 
     def _check_password(self, username, password):
         """
@@ -578,7 +578,7 @@ class OpenIDUserManager(ExtAuthUserManager):
         try:
             return self._openid[identity_url]
         except KeyError:
-            raise KeyError, "no openID identity '%s'" % identity_url
+            raise LookupError("no openID identity '{}'".format(identity_url))
 
     def create_new_openid(self, identity_url, username):
         """

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



More information about the debian-science-commits mailing list