Fixed #26125 -- Fixed E731 flake warnings.

10 files changed, 30 insertions, 18 deletions

diff --git a/tests/absolute_url_overrides/tests.py b/tests/absolute_url_overrides/tests.py
index 7187456112..6879283083 100644
--- a/tests/absolute_url_overrides/tests.py
+++ b/tests/absolute_url_overrides/tests.py
@@ -10,7 +10,8 @@ class AbsoluteUrlOverrideTests(SimpleTestCase):
         """
         get_absolute_url() functions as a normal method.
         """
-        get_absolute_url = lambda o: '/test-a/%s/' % o.pk
+        def get_absolute_url(o):
+            return '/test-a/%s/' % o.pk
         TestA = self._create_model_class('TestA', get_absolute_url)
 
         self.assertTrue(hasattr(TestA, 'get_absolute_url'))
@@ -21,7 +22,8 @@ class AbsoluteUrlOverrideTests(SimpleTestCase):
         """
         ABSOLUTE_URL_OVERRIDES should override get_absolute_url().
         """
-        get_absolute_url = lambda o: '/test-b/%s/' % o.pk
+        def get_absolute_url(o):
+            return '/test-b/%s/' % o.pk
         with self.settings(
             ABSOLUTE_URL_OVERRIDES={
                 'absolute_url_overrides.testb': lambda o: '/overridden-test-b/%s/' % o.pk,
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
index f59f87e6de..450ff1ffda 100644
--- a/tests/admin_inlines/tests.py
+++ b/tests/admin_inlines/tests.py
@@ -729,8 +729,9 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
             reverse('admin:admin_inlines_holder4_add')))
 
         inline_id = '#inner4stacked_set-group'
-        rows_length = lambda: len(self.selenium.find_elements_by_css_selector(
-            '%s .dynamic-inner4stacked_set' % inline_id))
+
+        def rows_length():
+            return len(self.selenium.find_elements_by_css_selector('%s .dynamic-inner4stacked_set' % inline_id))
         self.assertEqual(rows_length(), 3)
 
         add_button = self.selenium.find_element_by_link_text(
@@ -745,8 +746,9 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
             reverse('admin:admin_inlines_holder4_add')))
 
         inline_id = '#inner4stacked_set-group'
-        rows_length = lambda: len(self.selenium.find_elements_by_css_selector(
-            '%s .dynamic-inner4stacked_set' % inline_id))
+
+        def rows_length():
+            return len(self.selenium.find_elements_by_css_selector('%s .dynamic-inner4stacked_set' % inline_id))
         self.assertEqual(rows_length(), 3)
 
         add_button = self.selenium.find_element_by_link_text(
diff --git a/tests/admin_utils/tests.py b/tests/admin_utils/tests.py
index 694c529b76..01ec6702cc 100644
--- a/tests/admin_utils/tests.py
+++ b/tests/admin_utils/tests.py
@@ -111,7 +111,8 @@ class UtilsTests(SimpleTestCase):
             def get_admin_value(self, obj):
                 return ADMIN_METHOD
 
-        simple_function = lambda obj: SIMPLE_FUNCTION
+        def simple_function(obj):
+            return SIMPLE_FUNCTION
 
         site_obj = Site(domain=SITE_NAME)
         article = Article(
diff --git a/tests/flatpages_tests/test_templatetags.py b/tests/flatpages_tests/test_templatetags.py
index 994491e1a0..dbe1446988 100644
--- a/tests/flatpages_tests/test_templatetags.py
+++ b/tests/flatpages_tests/test_templatetags.py
@@ -141,7 +141,8 @@ class FlatpageTemplateTagTests(TestCase):
 
     def test_parsing_errors(self):
         "There are various ways that the flatpages template tag won't parse"
-        render = lambda t: Template(t).render(Context())
+        def render(t):
+            return Template(t).render(Context())
 
         self.assertRaises(TemplateSyntaxError, render,
                           "{% load flatpages %}{% get_flatpages %}")
diff --git a/tests/forms_tests/tests/test_fields.py b/tests/forms_tests/tests/test_fields.py
index 1bab912cfc..45545cdb48 100644
--- a/tests/forms_tests/tests/test_fields.py
+++ b/tests/forms_tests/tests/test_fields.py
@@ -1173,7 +1173,8 @@ class FieldsTests(SimpleTestCase):
         )
 
     def test_choicefield_callable(self):
-        choices = lambda: [('J', 'John'), ('P', 'Paul')]
+        def choices():
+            return [('J', 'John'), ('P', 'Paul')]
         f = ChoiceField(choices=choices)
         self.assertEqual('J', f.clean('J'))
 
diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py
index 203f25406a..bc1f3aacce 100644
--- a/tests/lookup/tests.py
+++ b/tests/lookup/tests.py
@@ -141,7 +141,8 @@ class LookupTests(TestCase):
     def test_values(self):
         # values() returns a list of dictionaries instead of object instances --
         # and you can specify which fields you want to retrieve.
-        identity = lambda x: x
+        def identity(x):
+            return x
         self.assertQuerysetEqual(Article.objects.values('headline'),
             [
                 {'headline': 'Article 5'},
@@ -276,7 +277,8 @@ class LookupTests(TestCase):
         # returned as a list of tuples, rather than a list of dictionaries.
         # Within each tuple, the order of the elements is the same as the order
         # of fields in the values_list() call.
-        identity = lambda x: x
+        def identity(x):
+            return x
         self.assertQuerysetEqual(Article.objects.values_list('headline'),
             [
                 ('Article 5',),
diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py
index bf96f05048..202f7511cd 100644
--- a/tests/middleware/tests.py
+++ b/tests/middleware/tests.py
@@ -707,12 +707,11 @@ class GZipMiddlewareTest(SimpleTestCase):
         """
         Compression is performed on FileResponse.
         """
-        open_file = lambda: open(__file__, 'rb')
-        with open_file() as file1:
+        with open(__file__, 'rb') as file1:
             file_resp = FileResponse(file1)
             file_resp['Content-Type'] = 'text/html; charset=UTF-8'
             r = GZipMiddleware().process_response(self.req, file_resp)
-            with open_file() as file2:
+            with open(__file__, 'rb') as file2:
                 self.assertEqual(self.decompress(b''.join(r)), file2.read())
             self.assertEqual(r.get('Content-Encoding'), 'gzip')
             self.assertIsNot(r.file_to_stream, file1)
diff --git a/tests/model_meta/tests.py b/tests/model_meta/tests.py
index 1dbfca0c8e..cfae4736fa 100644
--- a/tests/model_meta/tests.py
+++ b/tests/model_meta/tests.py
@@ -68,7 +68,8 @@ class DataTests(OptionsBaseTests):
             self.assertEqual([f.attname for f in fields], expected_result)
 
     def test_local_fields(self):
-        is_data_field = lambda f: isinstance(f, Field) and not isinstance(f, related.ManyToManyField)
+        def is_data_field(f):
+            return isinstance(f, Field) and not isinstance(f, related.ManyToManyField)
 
         for model, expected_result in TEST_RESULTS['local_fields'].items():
             fields = model._meta.local_fields
@@ -101,7 +102,8 @@ class M2MTests(OptionsBaseTests):
 
 
 class RelatedObjectsTests(OptionsBaseTests):
-    key_name = lambda self, r: r[0]
+    def key_name(self, r):
+        return r[0]
 
     def test_related_objects(self):
         result_key = 'get_all_related_objects_with_model'
diff --git a/tests/test_client/tests.py b/tests/test_client/tests.py
index ccddf76cf1..d8e0b9d6f0 100644
--- a/tests/test_client/tests.py
+++ b/tests/test_client/tests.py
@@ -690,7 +690,8 @@ class CustomTestClientTest(SimpleTestCase):
         self.assertEqual(hasattr(self.client, "i_am_customized"), True)
 
 
-_generic_view = lambda request: HttpResponse(status=200)
+def _generic_view(request):
+    return HttpResponse(status=200)
 
 
 @override_settings(ROOT_URLCONF='test_client.urls')
diff --git a/tests/utils_tests/test_datastructures.py b/tests/utils_tests/test_datastructures.py
index 99f7a1d05f..d151f12bb5 100644
--- a/tests/utils_tests/test_datastructures.py
+++ b/tests/utils_tests/test_datastructures.py
@@ -126,7 +126,8 @@ class ImmutableListTests(SimpleTestCase):
 class DictWrapperTests(SimpleTestCase):
 
     def test_dictwrapper(self):
-        f = lambda x: "*%s" % x
+        def f(x):
+            return "*%s" % x
         d = DictWrapper({'a': 'a'}, f, 'xx_')
         self.assertEqual(
             "Normal: %(a)s. Modified: %(xx_a)s" % d,