~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/auth/authenticate.py

  • Committer: William Grant
  • Date: 2010-07-27 10:44:14 UTC
  • mto: This revision was merged to the branch mainline in revision 1824.
  • Revision ID: grantw@unimelb.edu.au-20100727104414-meuycir4c0dqbpe2
Update schema, add missing UNIQUE constraint, and update sample data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
93
93
 
94
94
            # Don't allow login if it is expired or disabled.
95
95
            if auth_result.state == 'disabled' or auth_result.account_expired:
96
 
                raise AuthError("Account is not valid.")
 
96
                raise AuthError(
 
97
                    "Your account is disabled. Please contact an "
 
98
                    "administrator if you believe this to be in error.")
97
99
 
98
100
            return auth_result
99
101
        else: