PEP8 fixes.

This commit is contained in:
yackob03 2013-09-27 20:03:07 -04:00
parent 32581c0621
commit a0adffdc8e
4 changed files with 27 additions and 13 deletions

View file

@ -64,8 +64,9 @@ def match_repos_api(prefix):
'description': repo.description,
}
repos = [repo_view(repo) for repo in model.get_matching_repositories(prefix) if
ReadRepositoryPermission(repo.namespace, repo.name).can()]
matching = model.get_matching_repositories(prefix)
repos = [repo_view(repo) for repo in matching
if ReadRepositoryPermission(repo.namespace, repo.name).can()]
response = {
'repositories': repos
}
@ -98,7 +99,7 @@ def list_repos_api():
@parse_repository_name
def update_repo_api(namespace, repository):
permission = ModifyRepositoryPermission(namespace, repository)
if permission.can():
if permission.can():
repo = model.get_repository(namespace, repository)
if repo:
values = request.get_json()
@ -107,7 +108,7 @@ def update_repo_api(namespace, repository):
return jsonify({
'success': True
})
abort(404)
@ -124,7 +125,7 @@ def image_view(image):
@parse_repository_name
def get_repo_api(namespace, repository):
logger.debug('Get repo: %s/%s' % (namespace, repository))
def tag_view(tag):
image = model.get_tag_image(namespace, repository, tag.name)
if not image:
@ -136,7 +137,7 @@ def get_repo_api(namespace, repository):
}
permission = ReadRepositoryPermission(namespace, repository)
if permission.can():
if permission.can():
repo = model.get_repository(namespace, repository)
if repo:
tags = model.list_repository_tags(namespace, repository)
@ -162,14 +163,15 @@ def role_view(repo_perm_obj):
}
@app.route('/api/repository/<path:repository>/tag/<tag>/images', methods=['GET'])
@app.route('/api/repository/<path:repository>/tag/<tag>/images',
methods=['GET'])
@login_required
@parse_repository_name
def list_tag_images(namespace, repository, tag):
permission = ReadRepositoryPermission(namespace, repository)
if permission.can():
images = model.get_tag_images(namespace, repository, tag)
return jsonify({
'images': [image_view(image) for image in images]
})
@ -186,7 +188,7 @@ def list_repo_permissions(namespace, repository):
repo_perms = model.get_all_repo_users(namespace, repository)
return jsonify({
'permissions': {repo_perm.user.username: role_view(repo_perm)
'permissions': {repo_perm.user.username: role_view(repo_perm)
for repo_perm in repo_perms}
})
@ -234,6 +236,7 @@ def change_permissions(namespace, repository, username):
abort(403) # Permission denied
@app.route('/api/repository/<path:repository>/permissions/<username>',
methods=['DELETE'])
@login_required