summaryrefslogtreecommitdiff
path: root/django/utils/log.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/utils/log.py
parentd228c1192ed59ab0114d9eba82ac99df611652d2 (diff)
Replaced `and...or...` constructs with PEP 308 conditional expressions.
Diffstat (limited to 'django/utils/log.py')
-rw-r--r--django/utils/log.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/log.py b/django/utils/log.py
index 2abf7701cb..6734a7261e 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -92,8 +92,8 @@ class AdminEmailHandler(logging.Handler):
request = record.request
subject = '%s (%s IP): %s' % (
record.levelname,
- (request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS
- and 'internal' or 'EXTERNAL'),
+ ('internal' if request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS
+ else 'EXTERNAL'),
record.getMessage()
)
filter = get_exception_reporter_filter(request)