summaryrefslogtreecommitdiff
path: root/django/contrib/auth/forms.py
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2013-05-26 23:47:50 -0300
committerRamiro Morales <cramm0@gmail.com>2013-05-26 23:47:50 -0300
commit0fa8d43e742ee8b480d938a47836b5a3720c2677 (patch)
tree19212a58dfb62be483ba5e8e24602c8f4def0c36 /django/contrib/auth/forms.py
parentd228c1192ed59ab0114d9eba82ac99df611652d2 (diff)
Replaced `and...or...` constructs with PEP 308 conditional expressions.
Diffstat (limited to 'django/contrib/auth/forms.py')
-rw-r--r--django/contrib/auth/forms.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py
index 0e08d8ef31..edf2727b07 100644
--- a/django/contrib/auth/forms.py
+++ b/django/contrib/auth/forms.py
@@ -237,7 +237,7 @@ class PasswordResetForm(forms.Form):
'uid': int_to_base36(user.pk),
'user': user,
'token': token_generator.make_token(user),
- 'protocol': use_https and 'https' or 'http',
+ 'protocol': 'https' if use_https else 'http',
}
subject = loader.render_to_string(subject_template_name, c)
# Email subject *must not* contain newlines