mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Replaced and...or... constructs with PEP 308 conditional expressions.

Browse Source
This commit is contained in:
Ramiro Morales
2013-05-26 23:47:50 -03:00
parent d228c1192e
commit 0fa8d43e74
25 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/middleware/common.py
View File

@@ -85,7 +85,7 @@ class CommonMiddleware(object):
return
if new_url[0]:
newurl = "%s://%s%s" % (
request.is_secure() and 'https' or 'http',
'https' if request.is_secure() else 'http',
new_url[0], urlquote(new_url[1]))
else:
newurl = urlquote(new_url[1])

2
django/middleware/locale.py
View File

@@ -49,7 +49,7 @@ class LocaleMiddleware(object):
if path_valid:
language_url = "%s://%s/%s%s" % (
request.is_secure() and 'https' or 'http',
'https' if request.is_secure() else 'http',
request.get_host(), language, request.get_full_path())
return HttpResponseRedirect(language_url)