Commit eda12cee authored by Tim Graham's avatar Tim Graham
Browse files

Removed redundant list() calls.

parent c2bc1cef

django/db/models/query_utils.py

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ def deferred_class_factory(model, attrs): 
    # class won't be created (we get an exception). Therefore, we generate

    # the name using the passed in attrs. It's OK to reuse an existing class

    # object if the attrs are identical.

    name = "%s_Deferred_%s" % (model.__name__, '_'.join(sorted(list(attrs))))

    name = "%s_Deferred_%s" % (model.__name__, '_'.join(sorted(attrs)))

    name = utils.truncate_name(name, 80, 32)



    try:

tests/httpwrappers/tests.py

+4 −4
Original line number Diff line number Diff line
@@ -140,13 +140,13 @@ class QueryDictTests(unittest.TestCase): 
            self.assertTrue(q.has_key('foo'))

        self.assertIn('foo', q)



        self.assertListEqual(sorted(list(six.iteritems(q))),

        self.assertListEqual(sorted(six.iteritems(q)),

                             [('foo', 'another'), ('name', 'john')])

        self.assertListEqual(sorted(list(six.iterlists(q))),

        self.assertListEqual(sorted(six.iterlists(q)),

                             [('foo', ['bar', 'baz', 'another']), ('name', ['john'])])

        self.assertListEqual(sorted(list(six.iterkeys(q))),

        self.assertListEqual(sorted(six.iterkeys(q)),

                             ['foo', 'name'])

        self.assertListEqual(sorted(list(six.itervalues(q))),

        self.assertListEqual(sorted(six.itervalues(q)),

                             ['another', 'john'])



        q.update({'foo': 'hello'})

tests/utils_tests/test_datastructures.py

+3 −3
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ class MultiValueDictTests(SimpleTestCase): 
        self.assertEqual(d.get('name'), 'Simon')

        self.assertEqual(d.getlist('name'), ['Adrian', 'Simon'])

        self.assertEqual(

            sorted(list(six.iteritems(d))),

            sorted(six.iteritems(d)),

            [('name', 'Simon'), ('position', 'Developer')]

        )



        self.assertEqual(

            sorted(list(six.iterlists(d))),

            sorted(six.iterlists(d)),

            [('name', ['Adrian', 'Simon']), ('position', ['Developer'])]

        )
@@ -52,7 +52,7 @@ class MultiValueDictTests(SimpleTestCase): 


        d.setlist('lastname', ['Holovaty', 'Willison'])

        self.assertEqual(d.getlist('lastname'), ['Holovaty', 'Willison'])

        self.assertEqual(sorted(list(six.itervalues(d))),

        self.assertEqual(sorted(six.itervalues(d)),

                         ['Developer', 'Simon', 'Willison'])



    def test_appendlist(self):