← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/auth/authenticate.py

  • Committer: William Grant
  • Date: 2009-07-30 08:50:35 UTC
  • mfrom: (1297 ivle)
  • mto: (1294.4.2 ui-the-third)
  • mto: This revision was merged to the branch mainline in revision 1353.
  • Revision ID: grantw@unimelb.edu.au-20090730085035-np5s9ghrgymmya8b
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/auth/authenticate.py
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(
97
 
                    "Your account is disabled. Please contact an "
98
 
                    "administrator if you believe this to be in error.")
 
96
                raise AuthError("Account is not valid.")
99
97
 
100
98
            return auth_result
101
99
        else: