diff --git a/benchmarks/run_benchmarks.py b/benchmarks/run_benchmarks.py index 9dd17fbf..bbd47e22 100644 --- a/benchmarks/run_benchmarks.py +++ b/benchmarks/run_benchmarks.py @@ -119,7 +119,7 @@ def create_objects(self): def grant_perms(self): ids = range(1, self.objects_count) for user in User.objects.iterator(): - for x in xrange(self.objects_with_perms_count): + for _ in xrange(self.objects_with_perms_count): obj = self.Model.objects.get(id=random.choice(ids)) self.grant_perm(user, obj, self.perm) @@ -130,7 +130,7 @@ def grant_perm(self, user, obj, perm): def check_perms(self): ids = range(1, self.objects_count) for user in User.objects.iterator(): - for x in xrange(self.objects_with_perms_count): + for _ in xrange(self.objects_with_perms_count): obj = self.Model.objects.get(id=random.choice(ids)) self.check_perm(user, obj, self.perm) @@ -138,8 +138,8 @@ def check_perms(self): def get_objects(self): ctype = ContentType.objects.get_for_model(self.Model) ids = range(1, self.users_count) - for user in User.objects.iterator(): - for x in xrange(self.objects_with_perms_count): + for _ in User.objects.iterator(): + for _ in xrange(self.objects_with_perms_count): filters = {'user': random.choice(ids), 'permission__codename__in': [self.perm], 'content_type': ctype diff --git a/extras.py b/extras.py index 62f417a9..e5a6eb04 100644 --- a/extras.py +++ b/extras.py @@ -71,7 +71,7 @@ def run(self): guardiandir = os.path.join(thisdir, 'guardian') warns = 0 # Define top-level directories - for topdir, dirnames, filenames in os.walk(guardiandir): + for topdir, _, filenames in os.walk(guardiandir): paths = (os.path.join(topdir, f) for f in filenames if f .endswith('.py')) for path in paths: diff --git a/guardian/testapp/tests/test_core.py b/guardian/testapp/tests/test_core.py index b343f8e4..ca559454 100644 --- a/guardian/testapp/tests/test_core.py +++ b/guardian/testapp/tests/test_core.py @@ -34,7 +34,7 @@ def test_create_anonymous_user(self): class ObjectPermissionTestCase(TestCase): def setUp(self): - self.group, created = Group.objects.get_or_create(name='jackGroup') + self.group, _ = Group.objects.get_or_create(name='jackGroup') self.user, created = User.objects.get_or_create(username='jack') self.user.groups.add(self.group) self.ctype = ContentType.objects.create( diff --git a/guardian/testapp/tests/test_decorators.py b/guardian/testapp/tests/test_decorators.py index c1de6de1..ee43d067 100644 --- a/guardian/testapp/tests/test_decorators.py +++ b/guardian/testapp/tests/test_decorators.py @@ -224,7 +224,7 @@ def dummy_view(request): def test_user_has_access(self): perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') + joe, _ = User.objects.get_or_create(username='joe') assign_perm(perm, self.user, obj=joe) request = self._get_request(self.user) @@ -256,7 +256,7 @@ class Meta: app_label = User._meta.app_label __metaclass__ = TestMeta - joe, created = ProxyUser.objects.get_or_create(username='joe') + joe, _ = ProxyUser.objects.get_or_create(username='joe') assign_perm(perm, self.user, obj=joe) request = self._get_request(self.user) @@ -272,7 +272,7 @@ def dummy_view(request, username): def test_user_has_obj_access_even_if_we_also_check_for_global(self): perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') + joe, _ = User.objects.get_or_create(username='joe') assign_perm(perm, self.user, obj=joe) request = self._get_request(self.user) @@ -288,7 +288,7 @@ def dummy_view(request, username): def test_user_has_no_obj_perm_access(self): perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') + _, _ = User.objects.get_or_create(username='joe') request = self._get_request(self.user) @@ -302,7 +302,7 @@ def dummy_view(request, username): def test_user_has_global_perm_access_but_flag_not_set(self): perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') + _, _ = User.objects.get_or_create(username='joe') assign_perm(perm, self.user) request = self._get_request(self.user) @@ -317,7 +317,7 @@ def dummy_view(request, username): def test_user_has_global_perm_access(self): perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') + _, _ = User.objects.get_or_create(username='joe') assign_perm(perm, self.user) request = self._get_request(self.user) @@ -335,7 +335,7 @@ def test_model_lookup(self): request = self._get_request(self.user) perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') + joe, _ = User.objects.get_or_create(username='joe') assign_perm(perm, self.user, obj=joe) models = ( diff --git a/guardian/testapp/tests/test_other.py b/guardian/testapp/tests/test_other.py index c45c280c..eda6dd8c 100644 --- a/guardian/testapp/tests/test_other.py +++ b/guardian/testapp/tests/test_other.py @@ -119,7 +119,7 @@ class GroupPermissionTests(TestDataMixin, TestCase): def setUp(self): super().setUp() self.user = User.objects.get(username='jack') - self.group, created = Group.objects.get_or_create(name='jackGroup') + self.group, _ = Group.objects.get_or_create(name='jackGroup') self.user.groups.add(self.group) self.ctype = ContentType.objects.create( model='bar', app_label='fake-for-guardian-tests') diff --git a/guardian/testapp/tests/test_shortcuts.py b/guardian/testapp/tests/test_shortcuts.py index 035a6f42..a213a847 100644 --- a/guardian/testapp/tests/test_shortcuts.py +++ b/guardian/testapp/tests/test_shortcuts.py @@ -893,7 +893,6 @@ def test_groups_perms(self): def test_has_global_permission_only(self): group_names = ['group1', 'group2', 'group3'] - groups = [Group.objects.create(name=name) for name in group_names] # global permission to change any group perm = 'auth.change_group'