PEP8 fixes.

This commit is contained in:
yackob03 2013-10-08 11:29:42 -04:00
parent 427b745f2f
commit 6a038bb24e
7 changed files with 56 additions and 45 deletions

View file

@ -41,7 +41,7 @@ def create_confirm_email_code(user):
def confirm_user_email(code): def confirm_user_email(code):
code = EmailConfirmation.get(EmailConfirmation.code == code, code = EmailConfirmation.get(EmailConfirmation.code == code,
EmailConfirmation.email_confirm == True) EmailConfirmation.email_confirm is True)
user = code.user user = code.user
user.verified = True user.verified = True
@ -96,14 +96,15 @@ def get_token(code):
return AccessToken.get(AccessToken.code == code) return AccessToken.get(AccessToken.code == code)
def get_visible_repositories(username=None, include_public=True, limit=None, sort=False): def get_visible_repositories(username=None, include_public=True, limit=None,
sort=False):
if not username and not include_public: if not username and not include_public:
return [] return []
query = Repository.select().distinct().join(Visibility) query = Repository.select().distinct().join(Visibility)
or_clauses = [] or_clauses = []
if include_public: if include_public:
or_clauses.append((Visibility.name == 'public')); or_clauses.append((Visibility.name == 'public'))
if username: if username:
with_perms = query.switch(Repository).join(RepositoryPermission, with_perms = query.switch(Repository).join(RepositoryPermission,
@ -123,6 +124,7 @@ def get_visible_repositories(username=None, include_public=True, limit=None, sor
return query return query
def get_matching_repositories(repo_term, username=None): def get_matching_repositories(repo_term, username=None):
namespace_term = repo_term namespace_term = repo_term
name_term = repo_term name_term = repo_term

View file

@ -102,6 +102,7 @@ def create_repo_api():
@app.route('/api/find/repository', methods=['GET']) @app.route('/api/find/repository', methods=['GET'])
def match_repos_api(): def match_repos_api():
prefix = request.args.get('query', '') prefix = request.args.get('query', '')
def repo_view(repo): def repo_view(repo):
return { return {
'namespace': repo.namespace, 'namespace': repo.namespace,
@ -109,7 +110,10 @@ def match_repos_api():
'description': repo.description 'description': repo.description
} }
username = current_user.db_user.username if current_user.is_authenticated() else None username = None
if current_user.is_authenticated():
username = current_user.db_user.username
matching = model.get_matching_repositories(prefix, username) matching = model.get_matching_repositories(prefix, username)
response = { response = {
'repositories': [repo_view(repo) for repo in matching] 'repositories': [repo_view(repo) for repo in matching]
@ -141,10 +145,14 @@ def list_repos_api():
include_private = include_private == 'true' include_private = include_private == 'true'
sort = sort == 'true' sort = sort == 'true'
username = current_user.db_user.username if current_user.is_authenticated() and include_private else None username = None
repos = [repo_view(repo) if current_user.is_authenticated() and include_private:
for repo in model.get_visible_repositories( username = current_user.db_user.username
username, limit = limit, include_public = include_public, sort = sort)]
repo_query = model.get_visible_repositories(username, limit=limit,
include_public=include_public,
sort=sort)
repos = [repo_view(repo) for repo in repo_query]
response = { response = {
'repositories': repos 'repositories': repos
} }
@ -170,7 +178,8 @@ def update_repo_api(namespace, repository):
abort(404) abort(404)
@app.route('/api/repository/<path:repository>/changevisibility', methods=['POST']) @app.route('/api/repository/<path:repository>/changevisibility',
methods=['POST'])
@api_login_required @api_login_required
@parse_repository_name @parse_repository_name
def change_repo_visibility_api(namespace, repository): def change_repo_visibility_api(namespace, repository):
@ -422,4 +431,4 @@ def get_subscription():
return jsonify({ return jsonify({
'plan': 'free', 'plan': 'free',
'usedPrivateRepos': private_repos, 'usedPrivateRepos': private_repos,
}); })

View file

@ -184,8 +184,8 @@ def put_image_checksum(namespace, repository, image_id):
@set_cache_headers @set_cache_headers
def get_image_json(namespace, repository, image_id, headers): def get_image_json(namespace, repository, image_id, headers):
permission = ReadRepositoryPermission(namespace, repository) permission = ReadRepositoryPermission(namespace, repository)
if (not permission.can() and not if not permission.can() and not model.repository_is_public(namespace,
model.repository_is_public(namespace, repository)): repository):
abort(403) abort(403)
try: try:
@ -214,8 +214,8 @@ def get_image_json(namespace, repository, image_id, headers):
@set_cache_headers @set_cache_headers
def get_image_ancestry(namespace, repository, image_id, headers): def get_image_ancestry(namespace, repository, image_id, headers):
permission = ReadRepositoryPermission(namespace, repository) permission = ReadRepositoryPermission(namespace, repository)
if (not permission.can() and not if not permission.can() and not model.repository_is_public(namespace,
model.repository_is_public(namespace, repository)): repository):
abort(403) abort(403)
try: try:

View file

@ -60,7 +60,7 @@ def common_login(db_user):
identity=Identity(db_user.username, 'username')) identity=Identity(db_user.username, 'username'))
return True return True
else: else:
logger.debug('User could not be logged in, inactive?.'); logger.debug('User could not be logged in, inactive?.')
return False return False