summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2019-02-09 19:18:48 +0500
committerTim Graham <timograham@gmail.com>2019-02-09 09:18:48 -0500
commit1933e56eca1ad17de7dd133bfb7cbee9858a75a3 (patch)
tree3dbc7a8fa58cba631591ebdfa22c687948fbb887 /django
parentb1a2ad69251053a5f1ce71ffa95b188c4a765388 (diff)
Removed uneeded generator expressions and list comprehensions.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/gis/utils/ogrinspect.py2
-rw-r--r--django/db/backends/mysql/operations.py2
-rw-r--r--django/forms/forms.py2
-rw-r--r--django/test/html.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/gis/utils/ogrinspect.py b/django/contrib/gis/utils/ogrinspect.py
index f04974f80d..8c83fd5a43 100644
--- a/django/contrib/gis/utils/ogrinspect.py
+++ b/django/contrib/gis/utils/ogrinspect.py
@@ -116,7 +116,7 @@ def ogrinspect(*args, **kwargs):
Note: Call the _ogrinspect() helper to do the heavy lifting.
"""
- return '\n'.join(s for s in _ogrinspect(*args, **kwargs))
+ return '\n'.join(_ogrinspect(*args, **kwargs))
def _ogrinspect(data_source, model_name, geom_name='geom', layer_key=0, srid=None,
diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py
index 43f4f748d4..50f85e0621 100644
--- a/django/db/backends/mysql/operations.py
+++ b/django/db/backends/mysql/operations.py
@@ -107,7 +107,7 @@ class DatabaseOperations(BaseDatabaseOperations):
except ValueError:
sql = field_name
else:
- format_str = ''.join([f for f in format[:i]] + [f for f in format_def[i:]])
+ format_str = ''.join(format[:i] + format_def[i:])
sql = "CAST(DATE_FORMAT(%s, '%s') AS DATETIME)" % (field_name, format_str)
return sql
diff --git a/django/forms/forms.py b/django/forms/forms.py
index 0c49a94432..dd562099ab 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -160,7 +160,7 @@ class BaseForm:
"Key '%s' not found in '%s'. Choices are: %s." % (
name,
self.__class__.__name__,
- ', '.join(sorted(f for f in self.fields)),
+ ', '.join(sorted(self.fields)),
)
)
if name not in self._bound_fields_cache:
diff --git a/django/test/html.py b/django/test/html.py
index 3b55b52861..8b064529b0 100644
--- a/django/test/html.py
+++ b/django/test/html.py
@@ -72,7 +72,7 @@ class Element:
return self.children == element.children
def __hash__(self):
- return hash((self.name, *(a for a in self.attributes)))
+ return hash((self.name, *self.attributes))
def _count(self, element, count=True):
if not isinstance(element, str):