summaryrefslogtreecommitdiff
path: root/django/forms
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/forms
parentd228c1192ed59ab0114d9eba82ac99df611652d2 (diff)
Replaced `and...or...` constructs with PEP 308 conditional expressions.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/forms.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/forms.py b/django/forms/forms.py
index 2c173a45dc..0c598ac775 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -134,7 +134,7 @@ class BaseForm(object):
Subclasses may wish to override.
"""
- return self.prefix and ('%s-%s' % (self.prefix, field_name)) or field_name
+ return '%s-%s' % (self.prefix, field_name) if self.prefix else field_name
def add_initial_prefix(self, field_name):
"""