From 83f8bcbecbca3f8708395d8cd1ee85dacceca456 Mon Sep 17 00:00:00 2001 From: Farhaan Bukhsh Date: Apr 14 2017 10:32:37 +0000 Subject: Change of get_project to _get_project --- diff --git a/pagure/api/ci/jenkins.py b/pagure/api/ci/jenkins.py index 5cc0c87..1309bf6 100644 --- a/pagure/api/ci/jenkins.py +++ b/pagure/api/ci/jenkins.py @@ -44,7 +44,7 @@ def jenkins_ci_notification( """ - project = pagure.lib.get_project( + project = pagure.lib._get_project( SESSION, repo, user=username, namespace=namespace) if not project: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOPROJECT) diff --git a/pagure/api/fork.py b/pagure/api/fork.py index 0d450cd..c009e8a 100644 --- a/pagure/api/fork.py +++ b/pagure/api/fork.py @@ -123,8 +123,7 @@ def api_pull_request_views(repo, username=None, namespace=None): """ - repo = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) + repo = pagure.get_authorized_project(SESSION, repo, user=username, namespace=namespace) if repo is None: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOPROJECT) @@ -249,8 +248,7 @@ def api_pull_request_view(repo, requestid, username=None, namespace=None): """ - repo = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) + repo = pagure.get_authorized_project(SESSION, repo, user=username, namespace=namespace) if repo is None: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOPROJECT) @@ -308,8 +306,7 @@ def api_pull_request_merge(repo, requestid, username=None, namespace=None): """ # noqa output = {} - repo = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) + repo = pagure.get_authorized_project(SESSION, repo, user=username, namespace=namespace) if repo is None: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOPROJECT) @@ -395,8 +392,7 @@ def api_pull_request_close(repo, requestid, username=None, namespace=None): """ # noqa output = {} - repo = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) + repo = pagure.get_authorized_project(SESSION, repo, user=username, namespace=namespace) if repo is None: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOPROJECT) @@ -498,8 +494,7 @@ def api_pull_request_add_comment( } """ # noqa - repo = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) + repo = pagure.get_authorized_project(SESSION, repo, user=username, namespace=namespace) output = {} @@ -642,8 +637,7 @@ def api_pull_request_add_flag(repo, requestid, username=None, namespace=None): } """ # noqa - repo = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) + repo = pagure.get_authorized_project(SESSION, repo, user=username, namespace=namespace) output = {} diff --git a/pagure/api/project.py b/pagure/api/project.py index 52d993a..9c794a7 100644 --- a/pagure/api/project.py +++ b/pagure/api/project.py @@ -51,8 +51,7 @@ def api_git_tags(repo, username=None, namespace=None): } """ - repo = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) + repo = pagure.lib._get_project(SESSION, repo, user=username, namespace=namespace) if repo is None: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOPROJECT) @@ -393,8 +392,7 @@ def api_fork_project(): username = form.username.data or None namespace = form.namespace.data.strip() or None - repo = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) + repo = pagure.lib._get_project(SESSION, repo, user=username, namespace=namespace) if repo is None: raise pagure.exceptions.APIError( 404, error_code=APIERROR.ENOPROJECT) diff --git a/pagure/hooks/files/default_hook.py b/pagure/hooks/files/default_hook.py index 33f3c8b..a91f755 100755 --- a/pagure/hooks/files/default_hook.py +++ b/pagure/hooks/files/default_hook.py @@ -38,8 +38,7 @@ def run_as_post_receive_hook(): print('user:', username) print('namespace:', namespace) - project = pagure.lib.get_project( - pagure.SESSION, repo, user=username, namespace=namespace) + project = pagure.lib._get_project(pagure.SESSION, repo, user=username, namespace=namespace) for line in sys.stdin: if pagure.APP.config.get('HOOK_DEBUG', False): diff --git a/pagure/hooks/files/fedmsg_hook.py b/pagure/hooks/files/fedmsg_hook.py index 0497b51..44aa754 100755 --- a/pagure/hooks/files/fedmsg_hook.py +++ b/pagure/hooks/files/fedmsg_hook.py @@ -55,7 +55,7 @@ for line in sys.stdin.readlines(): project_name = pagure.lib.git.get_repo_name(abspath) username = pagure.lib.git.get_username(abspath) namespace = pagure.lib.git.get_repo_namespace(abspath) - project = pagure.lib.get_project( + project = pagure.lib._get_project( pagure.SESSION, project_name, username, namespace=namespace) if not project: project = project_name diff --git a/pagure/hooks/files/pagure_force_commit_hook.py b/pagure/hooks/files/pagure_force_commit_hook.py index dd57bfb..6377340 100755 --- a/pagure/hooks/files/pagure_force_commit_hook.py +++ b/pagure/hooks/files/pagure_force_commit_hook.py @@ -33,8 +33,7 @@ def run_as_pre_receive_hook(): print 'user: ', username print 'namspaces:', namespace - repo = pagure.lib.get_project( - pagure.SESSION, reponame, user=username, namespace=namespace) + repo = pagure.lib._get_project(pagure.SESSION, reponame, user=username, namespace=namespace) if not repo: print 'Unknown repo %s of username: %s in namespace %s' % ( reponame, username, namespace) diff --git a/pagure/hooks/files/rtd_hook.py b/pagure/hooks/files/rtd_hook.py index 163aa69..7554e03 100755 --- a/pagure/hooks/files/rtd_hook.py +++ b/pagure/hooks/files/rtd_hook.py @@ -35,8 +35,7 @@ def run_as_post_receive_hook(): print 'user: ', username print 'namespace:', namespace - repo = pagure.lib.get_project( - pagure.SESSION, reponame, user=username, namespace=namespace) + repo = pagure.lib._get_project(pagure.SESSION, reponame, user=username, namespace=namespace) if not repo: print 'Unknown repo %s of username: %s' % (reponame, username) sys.exit(1) diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index f7770a9..3b3d323 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2088,7 +2088,7 @@ def search_projects( return query.all() -def get_project(session, name, user=None, namespace=None): +def _get_project(session, name, user=None, namespace=None): '''Get a project from the database ''' query = session.query( @@ -3663,7 +3663,7 @@ def is_watching(session, user, reponame, repouser=None, namespace=None): if watcher: return watcher.watch - project = pagure.lib.get_project( + project = pagure.lib._get_project( session, reponame, user=repouser, namespace=namespace) if not project: diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 4172180..da53627 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -411,8 +411,7 @@ def get_project_from_json( project_user = None if jsondata.get('parent'): project_user = user.username - project = pagure.lib.get_project( - session, name, user=project_user, namespace=namespace) + project = pagure.lib._get_project(session, name, user=project_user, namespace=namespace) if not project: parent = None @@ -451,8 +450,7 @@ def get_project_from_json( ) session.commit() - project = pagure.lib.get_project( - session, name, user=user.username, namespace=namespace) + project = pagure.lib._get_project(session, name, user=user.username, namespace=namespace) tags = jsondata.get('tags', None) if tags: @@ -529,8 +527,7 @@ def update_ticket_from_git( """ - repo = pagure.lib.get_project( - session, reponame, user=username, namespace=namespace) + repo = pagure.lib._get_project(session, reponame, user=username, namespace=namespace) if not repo: raise pagure.exceptions.PagureException( 'Unknown repo %s of username: %s in namespace: %s' % ( @@ -707,8 +704,7 @@ def update_request_from_git( """ - repo = pagure.lib.get_project( - session, reponame, user=username, namespace=namespace) + repo = pagure.lib._get_project(session, reponame, user=username, namespace=namespace) if not repo: raise pagure.exceptions.PagureException( 'Unknown repo %s of username: %s in namespace: %s' % ( diff --git a/pagure/lib/link.py b/pagure/lib/link.py index f6fb84b..c56ed54 100644 --- a/pagure/lib/link.py +++ b/pagure/lib/link.py @@ -57,7 +57,7 @@ def get_relation(session, reponame, username, namespace, text, ''' - repo = pagure.lib.get_project( + repo = pagure.lib._get_project( session, reponame, user=username, namespace=namespace) if not repo: return [] diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py index ccb765f..be86526 100644 --- a/pagure/pfmarkdown.py +++ b/pagure/pfmarkdown.py @@ -316,8 +316,7 @@ def makeExtension(*arg, **kwargs): def _issue_exists(user, namespace, repo, idx): """ Utility method checking if a given issue exists. """ - repo_obj = pagure.lib.get_project( - pagure.SESSION, name=repo, user=user, namespace=namespace) + repo_obj = pagure.lib._get_project(pagure.SESSION, name=repo, user=user, namespace=namespace) if not repo_obj: return False @@ -332,8 +331,7 @@ def _issue_exists(user, namespace, repo, idx): def _pr_exists(user, namespace, repo, idx): """ Utility method checking if a given PR exists. """ - repo_obj = pagure.lib.get_project( - pagure.SESSION, name=repo, user=user, namespace=namespace) + repo_obj = pagure.lib._get_project(pagure.SESSION, name=repo, user=user, namespace=namespace) if not repo_obj: return False diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index bdada35..a8fce8b 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -889,7 +889,7 @@ def fork_project(repo, username=None, namespace=None): if not form.validate_on_submit(): flask.abort(400) - if pagure.lib.get_project( + if pagure.lib._get_project( SESSION, repo.name, user=flask.g.fas_user.username, namespace=namespace): return flask.redirect(flask.url_for( @@ -1254,7 +1254,7 @@ def fork_edit_file( if not form.validate_on_submit(): flask.abort(400) - if pagure.lib.get_project( + if pagure.lib._get_project( SESSION, repo.name, user=flask.g.fas_user.username): flask.flash('You had already forked this project') return flask.redirect(flask.url_for( diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index f1c04ac..c4abfab 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -3048,7 +3048,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -3063,7 +3063,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Check subscribtion before - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual( pagure.lib.get_watch_list(self.session, issue), @@ -3092,7 +3092,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual( pagure.lib.get_watch_list(self.session, issue), @@ -3120,7 +3120,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): {'message': 'You are now watching this issue'} ) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual( pagure.lib.get_watch_list(self.session, issue), @@ -3137,7 +3137,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): {'message': 'You are no longer watching this issue'} ) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual( pagure.lib.get_watch_list(self.session, issue), diff --git a/tests/test_pagure_flask_api_user.py b/tests/test_pagure_flask_api_user.py index b427636..7ad67e9 100644 --- a/tests/test_pagure_flask_api_user.py +++ b/tests/test_pagure_flask_api_user.py @@ -255,8 +255,8 @@ class PagureFlaskApiUSertests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') + forked_repo = pagure.lib._get_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py index 5ca5d64..3817f4c 100644 --- a/tests/test_pagure_flask_docs.py +++ b/tests/test_pagure_flask_docs.py @@ -141,7 +141,7 @@ class PagureFlaskDocstests(tests.Modeltests): docs. """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') tests.create_projects_git(os.path.join(self.path, 'docs')) output = self.app.get('/test/docs') diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index 7464448..95d621f 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -2192,7 +2192,7 @@ index 0000000..2a552bb self.session.commit() # Get fork project - project = pagure.lib.get_project(self.session, 'test', 'foo') + project = pagure.lib._get_project(self.session, 'test', 'foo') # Pull-requests and issue-trackers are off for forks # lib function is not used here so mannually turning them off diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py index b97469c..60dcc99 100644 --- a/tests/test_pagure_flask_ui_roadmap.py +++ b/tests/test_pagure_flask_ui_roadmap.py @@ -405,7 +405,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn(u'

Settings for test

', output.data) self.assertIn(u'Milestones updated', output.data) # Check the result of the action -- Milestones recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') self.assertEqual( repo.milestones, { diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index 632484d..075b1ea 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -1837,8 +1837,7 @@ class PagureLibtests(tests.Modeltests): projects = pagure.lib.search_projects(self.session) self.assertEqual(len(projects), 1) - repo = pagure.lib.get_project( - self.session, 'testproject', namespace='foonamespace') + repo = pagure.lib._get_project(self.session, 'testproject', namespace='foonamespace') gitrepo = os.path.join(gitfolder, repo.path) docrepo = os.path.join(docfolder, repo.path) ticketrepo = os.path.join(ticketfolder, repo.path) @@ -1946,9 +1945,7 @@ class PagureLibtests(tests.Modeltests): # Fork a fork - repo = pagure.lib.get_project( - self.session, 'testproject', - namespace='foonamespace', user='foo') + repo = pagure.lib._get_project(self.session, 'testproject', user='foo', namespace='foonamespace') msg = pagure.lib.fork_project( session=self.session, @@ -3364,9 +3361,8 @@ class PagureLibtests(tests.Modeltests): self.test_new_pull_request() # create PR#2 to project pingou/test - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project( - self.session, 'test', user='pingou') + repo = pagure.lib._get_project(self.session, 'test') + forked_repo = pagure.lib._get_project(self.session, 'test', user='pingou') req = pagure.lib.new_pull_request( requestid=2, session=self.session, diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index 0113ee2..42df2a6 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -1988,9 +1988,8 @@ index 0000000..60f7480 tests.create_projects(self.session) tests.create_projects_git(os.path.join(self.path, 'repos')) - repo = pagure.lib.get_project(self.session, 'test') - namespaced_repo = pagure.lib.get_project( - self.session, 'test3', namespace='somenamespace') + repo = pagure.lib._get_project(self.session, 'test') + namespaced_repo = pagure.lib._get_project(self.session, 'test3', namespace='somenamespace') # Before self.assertEqual(len(repo.requests), 0) diff --git a/tests/test_pagure_lib_git_get_tags_objects.py b/tests/test_pagure_lib_git_get_tags_objects.py index 3acf7a5..27932db 100644 --- a/tests/test_pagure_lib_git_get_tags_objects.py +++ b/tests/test_pagure_lib_git_get_tags_objects.py @@ -65,7 +65,7 @@ class PagureLibGitGetTagstests(tests.Modeltests): """ Test the get_git_tags_objects method of pagure.lib.git. """ tests.create_projects(self.session) tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.lib._get_project(self.session, 'test') # Case 1 - Empty repo with no tags exp = [] diff --git a/tests/test_pagure_lib_notify.py b/tests/test_pagure_lib_notify.py index 99ad3ce..24115ee 100644 --- a/tests/test_pagure_lib_notify.py +++ b/tests/test_pagure_lib_notify.py @@ -189,7 +189,7 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Create the PR - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=repo, diff --git a/webhook-server/pagure-webhook-server.py b/webhook-server/pagure-webhook-server.py index 2b35227..4644867 100644 --- a/webhook-server/pagure-webhook-server.py +++ b/webhook-server/pagure-webhook-server.py @@ -134,7 +134,7 @@ def handle_messages(): log.info( 'Searching %s/%s/%s' % (username, namespace, projectname)) session = pagure.lib.create_session(pagure.APP.config['DB_URL']) - project = pagure.lib.get_project( + project = pagure.lib._get_project( session=session, name=projectname, user=username, namespace=namespace) if not project: