##// END OF EJS Templates
python3: small fixes for .items() usage
super-admin -
r4964:09320311 default
parent child Browse files
Show More
@@ -43,24 +43,24 b' def integration_scope_choices(permission'
43 repo_choices = [
43 repo_choices = [
44 ('repo:%s' % repo_name, '/' + repo_name)
44 ('repo:%s' % repo_name, '/' + repo_name)
45 for repo_name, repo_perm
45 for repo_name, repo_perm
46 in permissions['repositories'].items()
46 in list(permissions['repositories'].items())
47 if repo_perm == 'repository.admin'
47 if repo_perm == 'repository.admin'
48 ]
48 ]
49 repogroup_choices = [
49 repogroup_choices = [
50 ('repogroup:%s' % repo_group_name, '/' + repo_group_name + '/ (child repos only)')
50 ('repogroup:%s' % repo_group_name, '/' + repo_group_name + '/ (child repos only)')
51 for repo_group_name, repo_group_perm
51 for repo_group_name, repo_group_perm
52 in permissions['repositories_groups'].items()
52 in list(permissions['repositories_groups'].items())
53 if repo_group_perm == 'group.admin'
53 if repo_group_perm == 'group.admin'
54 ]
54 ]
55 repogroup_recursive_choices = [
55 repogroup_recursive_choices = [
56 ('repogroup-recursive:%s' % repo_group_name, '/' + repo_group_name + '/ (recursive)')
56 ('repogroup-recursive:%s' % repo_group_name, '/' + repo_group_name + '/ (recursive)')
57 for repo_group_name, repo_group_perm
57 for repo_group_name, repo_group_perm
58 in permissions['repositories_groups'].items()
58 in list(permissions['repositories_groups'].items())
59 if repo_group_perm == 'group.admin'
59 if repo_group_perm == 'group.admin'
60 ]
60 ]
61 result.extend(
61 result.extend(
62 sorted(repogroup_recursive_choices + repogroup_choices + repo_choices,
62 sorted(repogroup_recursive_choices + repogroup_choices + repo_choices,
63 key=lambda (choice, label): choice.split(':', 1)[1]
63 key=lambda choice_label: choice_label[0].split(':', 1)[1]
64 )
64 )
65 )
65 )
66 return result
66 return result
General Comments 0
You need to be logged in to leave comments. Login now