Commit b2aad7b8 authored by Thomas Chaumeny's avatar Thomas Chaumeny Committed by Loic Bistuer
Browse files

Replaced set([foo, ...]) by {foo, ...} literals. Refs PR 3282. 

Thanks Collin Anderson for the review.
parent caf5cd7b

django/contrib/admin/views/main.py

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ class ChangeList(object): 
        # ordering fields so we can guarantee a deterministic order across all

        # database backends.

        pk_name = self.lookup_opts.pk.name

        if not (set(ordering) & set(['pk', '-pk', pk_name, '-' + pk_name])):

        if not (set(ordering) & {'pk', '-pk', pk_name, '-' + pk_name}):

            # The two sets do not intersect, meaning the pk isn't present. So

            # we add it.

            ordering.append('-pk')

django/contrib/auth/tests/test_auth_backends.py

+18 −18
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ class BaseModelBackendTest(object): 


        # reloading user to purge the _perm_cache

        user = self.UserModel._default_manager.get(pk=self.user.pk)

        self.assertEqual(user.get_all_permissions() == set(['auth.test']), True)

        self.assertEqual(user.get_group_permissions(), set([]))

        self.assertEqual(user.get_all_permissions() == {'auth.test'}, True)

        self.assertEqual(user.get_group_permissions(), set())

        self.assertEqual(user.has_module_perms('Group'), False)

        self.assertEqual(user.has_module_perms('auth'), True)
@@ -81,7 +81,7 @@ class BaseModelBackendTest(object): 
        perm = Permission.objects.create(name='test3', content_type=content_type, codename='test3')

        user.user_permissions.add(perm)

        user = self.UserModel._default_manager.get(pk=self.user.pk)

        self.assertEqual(user.get_all_permissions(), set(['auth.test2', 'auth.test', 'auth.test3']))

        self.assertEqual(user.get_all_permissions(), {'auth.test2', 'auth.test', 'auth.test3'})

        self.assertEqual(user.has_perm('test'), False)

        self.assertEqual(user.has_perm('auth.test'), True)

        self.assertEqual(user.has_perms(['auth.test2', 'auth.test3']), True)
@@ -91,9 +91,9 @@ class BaseModelBackendTest(object): 
        group.permissions.add(perm)

        user.groups.add(group)

        user = self.UserModel._default_manager.get(pk=self.user.pk)

        exp = set(['auth.test2', 'auth.test', 'auth.test3', 'auth.test_group'])

        exp = {'auth.test2', 'auth.test', 'auth.test3', 'auth.test_group'}

        self.assertEqual(user.get_all_permissions(), exp)

        self.assertEqual(user.get_group_permissions(), set(['auth.test_group']))

        self.assertEqual(user.get_group_permissions(), {'auth.test_group'})

        self.assertEqual(user.has_perms(['auth.test3', 'auth.test_group']), True)



        user = AnonymousUser()
@@ -108,9 +108,9 @@ class BaseModelBackendTest(object): 
        user.user_permissions.add(perm)



        self.assertEqual(user.has_perm('auth.test', 'object'), False)

        self.assertEqual(user.get_all_permissions('object'), set([]))

        self.assertEqual(user.get_all_permissions('object'), set())

        self.assertEqual(user.has_perm('auth.test'), True)

        self.assertEqual(user.get_all_permissions(), set(['auth.test']))

        self.assertEqual(user.get_all_permissions(), {'auth.test'})



    def test_anonymous_has_no_permissions(self):

        """
@@ -129,9 +129,9 @@ class BaseModelBackendTest(object): 
        user.groups.add(group)

        group.permissions.add(group_perm)



        self.assertEqual(backend.get_all_permissions(user), set(['auth.test_user', 'auth.test_group']))

        self.assertEqual(backend.get_user_permissions(user), set(['auth.test_user', 'auth.test_group']))

        self.assertEqual(backend.get_group_permissions(user), set(['auth.test_group']))

        self.assertEqual(backend.get_all_permissions(user), {'auth.test_user', 'auth.test_group'})

        self.assertEqual(backend.get_user_permissions(user), {'auth.test_user', 'auth.test_group'})

        self.assertEqual(backend.get_group_permissions(user), {'auth.test_group'})



        user.is_anonymous = lambda: True
@@ -156,9 +156,9 @@ class BaseModelBackendTest(object): 
        user.groups.add(group)

        group.permissions.add(group_perm)



        self.assertEqual(backend.get_all_permissions(user), set(['auth.test_user', 'auth.test_group']))

        self.assertEqual(backend.get_user_permissions(user), set(['auth.test_user', 'auth.test_group']))

        self.assertEqual(backend.get_group_permissions(user), set(['auth.test_group']))

        self.assertEqual(backend.get_all_permissions(user), {'auth.test_user', 'auth.test_group'})

        self.assertEqual(backend.get_user_permissions(user), {'auth.test_user', 'auth.test_group'})

        self.assertEqual(backend.get_group_permissions(user), {'auth.test_group'})



        user.is_active = False

        user.save()
@@ -367,14 +367,14 @@ class RowlevelBackendTest(TestCase): 
        self.assertEqual(self.user3.has_perms(['simple', 'advanced'], TestObj()), False)



    def test_get_all_permissions(self):

        self.assertEqual(self.user1.get_all_permissions(TestObj()), set(['simple']))

        self.assertEqual(self.user2.get_all_permissions(TestObj()), set(['simple', 'advanced']))

        self.assertEqual(self.user2.get_all_permissions(), set([]))

        self.assertEqual(self.user1.get_all_permissions(TestObj()), {'simple'})

        self.assertEqual(self.user2.get_all_permissions(TestObj()), {'simple', 'advanced'})

        self.assertEqual(self.user2.get_all_permissions(), set())



    def test_get_group_permissions(self):

        group = Group.objects.create(name='test_group')

        self.user3.groups.add(group)

        self.assertEqual(self.user3.get_group_permissions(TestObj()), set(['group_perm']))

        self.assertEqual(self.user3.get_group_permissions(TestObj()), {'group_perm'})





class AnonymousUserBackendTest(TestCase):
@@ -405,7 +405,7 @@ class AnonymousUserBackendTest(TestCase): 
        self.assertEqual(self.user1.has_module_perms("app2"), False)



    def test_get_all_permissions(self):

        self.assertEqual(self.user1.get_all_permissions(TestObj()), set(['anon']))

        self.assertEqual(self.user1.get_all_permissions(TestObj()), {'anon'})





@skipIfCustomUser

django/contrib/gis/db/backends/mysql/operations.py

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class MySQLOperations(DatabaseOperations, BaseSpatialOperations): 
        'within': 'MBRWithin',

    }



    gis_terms = set(geometry_functions) | set(['isnull'])

    gis_terms = set(geometry_functions) | {'isnull'}



    def geo_db_type(self, f):

        return f.geom_type

django/contrib/gis/db/backends/oracle/operations.py

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ class OracleOperations(DatabaseOperations, BaseSpatialOperations): 
    }

    geometry_functions.update(distance_functions)



    gis_terms = set(['isnull'])

    gis_terms = {'isnull'}

    gis_terms.update(geometry_functions)



    truncate_params = {'relate': None}

django/contrib/gis/db/backends/postgis/operations.py

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations): 
        }



        # Creating a dictionary lookup of all GIS terms for PostGIS.

        self.gis_terms = set(['isnull'])

        self.gis_terms = {'isnull'}

        self.gis_terms.update(self.geometry_operators)

        self.gis_terms.update(self.geometry_functions)