Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions benchmarks/run_benchmarks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -130,16 +130,16 @@ 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)

@Timed("Get objects")
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
Expand Down
2 changes: 1 addition & 1 deletion extras.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion guardian/testapp/tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
14 changes: 7 additions & 7 deletions guardian/testapp/tests/test_decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)

Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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 = (
Expand Down
2 changes: 1 addition & 1 deletion guardian/testapp/tests/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
1 change: 0 additions & 1 deletion guardian/testapp/tests/test_shortcuts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down