clean up python2 syntax
parent
78458f6211
commit
64d62692d4
|
@ -30,11 +30,11 @@ admin_pw = 'changeme'
|
||||||
# LDAP attribute configuration
|
# LDAP attribute configuration
|
||||||
|
|
||||||
readable_names = {
|
readable_names = {
|
||||||
'commonname': u'Common Name',
|
'commonname': 'Common Name',
|
||||||
'givenname': u'Given Name',
|
'givenname': 'Given Name',
|
||||||
'gecos': u'GECOS (public name)',
|
'gecos': 'GECOS (public name)',
|
||||||
'surname': u'Surname',
|
'surname': 'Surname',
|
||||||
'loginshell': u'Shell',
|
'loginshell': 'Shell',
|
||||||
'telephonenumber': 'Phone Number',
|
'telephonenumber': 'Phone Number',
|
||||||
'mobiletelephonenumber': 'Mobile Number',
|
'mobiletelephonenumber': 'Mobile Number',
|
||||||
'sshpublickey': 'SSH Public Key',
|
'sshpublickey': 'SSH Public Key',
|
||||||
|
|
|
@ -28,11 +28,11 @@ def _passwd_kadmin(current, new):
|
||||||
def passwd_action():
|
def passwd_action():
|
||||||
current, new, confirm = (flask.request.form[n] for n in ('current', 'new', 'confirm'))
|
current, new, confirm = (flask.request.form[n] for n in ('current', 'new', 'confirm'))
|
||||||
if new != confirm:
|
if new != confirm:
|
||||||
flask.flash(u"New passwords don't match", category='danger')
|
flask.flash("New passwords don't match", category='danger')
|
||||||
return flask.render_template('passwd.html')
|
return flask.render_template('passwd.html')
|
||||||
|
|
||||||
if _passwd_kadmin(current, new):
|
if _passwd_kadmin(current, new):
|
||||||
flask.flash(u'Password changed', category='info')
|
flask.flash('Password changed', category='info')
|
||||||
else:
|
else:
|
||||||
flask.flash(u'Wrong password', category='danger')
|
flask.flash('Wrong password', category='danger')
|
||||||
return flask.render_template('passwd.html')
|
return flask.render_template('passwd.html')
|
||||||
|
|
|
@ -59,7 +59,7 @@ def attr_op(op, attrName, uid = None, success_redirect='/vcard',
|
||||||
if form.is_submitted():
|
if form.is_submitted():
|
||||||
for field, errors in form.errors.items():
|
for field, errors in form.errors.items():
|
||||||
for error in errors:
|
for error in errors:
|
||||||
flask.flash(u"Error in the {} field - {}".format(
|
flask.flash("Error in the {} field - {}".format(
|
||||||
getattr(form, field).label.text,
|
getattr(form, field).label.text,
|
||||||
error
|
error
|
||||||
), 'danger')
|
), 'danger')
|
||||||
|
|
Loading…
Reference in New Issue