diff --git a/ev-server/pagure_stream_server.py b/ev-server/pagure_stream_server.py index 2baa592..66f62aa 100644 --- a/ev-server/pagure_stream_server.py +++ b/ev-server/pagure_stream_server.py @@ -144,9 +144,8 @@ def get_obj_from_path(path): """ Return the Ticket or Request object based on the path provided. """ (username, namespace, reponame, objtype, objid) = _parse_path(path) - repo = pagure.lib.get_project( - pagure.SESSION, reponame, user=username, namespace=namespace) - + repo = pagure.get_authorized_project(pagure.SESSION, reponame, + user=username, namespace=namespace) if repo is None: raise PagureEvException("Project '%s' not found" % reponame) diff --git a/tests/test_pagure_flask_api_user.py b/tests/test_pagure_flask_api_user.py index 7ad67e9..f668e4f 100644 --- a/tests/test_pagure_flask_api_user.py +++ b/tests/test_pagure_flask_api_user.py @@ -426,7 +426,7 @@ class PagureFlaskApiUSertests(tests.Modeltests): api when the user only did one action. """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') now = datetime.datetime.utcnow() date = now.date().strftime('%Y-%m-%d') diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py index e04d64a..77522e0 100644 --- a/tests/test_pagure_flask_ui_app.py +++ b/tests/test_pagure_flask_ui_app.py @@ -1053,7 +1053,7 @@ class PagureFlaskApptests(tests.Modeltests): """Test the view_user_requests endpoint. """ # Create the PR tests.create_projects(self.session) - 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, @@ -1085,7 +1085,7 @@ class PagureFlaskApptests(tests.Modeltests): hook_token='aaabbbttt', ) self.session.add(item) - repo = pagure.lib.get_project( + repo = pagure.lib._get_project( self.session, 'test_fork', user='pingou') req = pagure.lib.new_pull_request( @@ -1123,7 +1123,7 @@ class PagureFlaskApptests(tests.Modeltests): """Test the view_user_issues endpoint when the user exists.""" # Create the issue tests.create_projects(self.session) - 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, @@ -1153,7 +1153,7 @@ class PagureFlaskApptests(tests.Modeltests): hook_token='aaabbbttt', ) self.session.add(item) - repo = pagure.lib.get_project(self.session, 'test_fork', user='foo') + repo = pagure.lib._get_project(self.session, 'test_fork', user='foo') msg = pagure.lib.new_issue( session=self.session, diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index bb47299..f0b649b 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -1511,7 +1511,7 @@ class PagureFlaskIssuestests(tests.Modeltests): 'Issue #1: Test issue - test - Pagure', output.data) - 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(issue.depending_text, []) self.assertEqual(issue.blocking_text, []) diff --git a/tests/test_pagure_flask_ui_priorities.py b/tests/test_pagure_flask_ui_priorities.py index 34a843f..b52c056 100644 --- a/tests/test_pagure_flask_ui_priorities.py +++ b/tests/test_pagure_flask_ui_priorities.py @@ -364,7 +364,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path), bare=True) # Start from scrach on priorities - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') self.assertEqual(repo.priorities, {}) user = tests.FakeUser() @@ -395,7 +395,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): self.assertIn('

Settings for test

', output.data) # Check the result of the action -- Priority recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} @@ -449,7 +449,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): self.assertNotIn('', output.data) # Check the result of the action -- Priority recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') self.assertEqual(repo.priorities, {}) diff --git a/tests/test_pagure_flask_ui_quick_reply.py b/tests/test_pagure_flask_ui_quick_reply.py index 58a9882..3df52b4 100644 --- a/tests/test_pagure_flask_ui_quick_reply.py +++ b/tests/test_pagure_flask_ui_quick_reply.py @@ -51,7 +51,7 @@ class PagureFlaskQuickReplytest(tests.Modeltests): self.admin = tests.FakeUser(username='pingou') self.user = tests.FakeUser(username='ralph') - self.repo = pagure.lib.get_project(self.session, 'test') + self.repo = pagure.lib._get_project(self.session, 'test') def disable_issues_and_pull_requests(self): """Disable both issues and pull requests.""" @@ -101,7 +101,7 @@ class PagureFlaskQuickReplytest(tests.Modeltests): self.assertIn(notice, output.data) def assertQuickReplies(self, quick_replies, project='test'): - repo = pagure.lib.get_project(self.session, project) + repo = pagure.lib._get_project(self.session, project) self.assertEqual(repo.quick_replies, quick_replies) def assertQuickReplyLinks(self, output): @@ -158,7 +158,7 @@ class PagureFlaskQuickReplytest(tests.Modeltests): def test_update_quick_replies_empty_to_reset(self): # Set some quick replies - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') repo.quick_replies = ['Ship it!', 'Nah.'] self.session.add(repo) self.session.commit() diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index 42df2a6..c731eda 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -2579,7 +2579,7 @@ index 0000000..60f7480 """ Test the update_custom_fields_from_json method of lib.git """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.lib._get_project(self.session, 'test') # Create issues to play with pagure.lib.new_issue( diff --git a/tests/test_pagure_lib_notify_email.py b/tests/test_pagure_lib_notify_email.py index 26371cd..ef40744 100644 --- a/tests/test_pagure_lib_notify_email.py +++ b/tests/test_pagure_lib_notify_email.py @@ -40,9 +40,9 @@ class PagureLibNotifyEmailtests(tests.Modeltests): self.user1 = pagure.lib.get_user(self.session, 'pingou') self.user2 = pagure.lib.get_user(self.session, 'foo') - self.project1 = pagure.lib.get_project(self.session, 'test') - self.project2 = pagure.lib.get_project(self.session, 'test2') - self.project3 = pagure.lib.get_project(self.session, 'test3', namespace='somenamespace') + self.project1 = pagure.lib._get_project(self.session, 'test') + self.project2 = pagure.lib._get_project(self.session, 'test2') + self.project3 = pagure.lib._get_project(self.session, 'test3', namespace='somenamespace') # Create a forked repo, should be project #4 # Not using fork_project as it tries to do a git clone @@ -56,7 +56,7 @@ class PagureLibNotifyEmailtests(tests.Modeltests): ) self.session.add(item) self.session.commit() - self.forkedproject = pagure.lib.get_project(self.session, 'test', user='foo') + self.forkedproject = pagure.lib._get_project(self.session, 'test', user='foo') # Report an issue on project #1 self.issue1 = pagure.lib.new_issue( diff --git a/tests/test_pagure_lib_watch_list.py b/tests/test_pagure_lib_watch_list.py index 70be7b8..bfddc0a 100644 --- a/tests/test_pagure_lib_watch_list.py +++ b/tests/test_pagure_lib_watch_list.py @@ -149,7 +149,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): email='bar@bar.com') self.session.add(item) - project = pagure.lib.get_project( + project = pagure.lib._get_project( self.session, 'test3', namespace='ns') msg = pagure.lib.add_user_to_project( session=self.session, @@ -233,7 +233,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User `bar` added to the group `foo`.') - project = pagure.lib.get_project( + project = pagure.lib._get_project( self.session, 'test3', namespace='ns') # Add group to project @@ -293,7 +293,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): email='bar@bar.com') self.session.add(item) - project = pagure.lib.get_project( + project = pagure.lib._get_project( self.session, 'test3', namespace='ns') msg = pagure.lib.add_user_to_project( session=self.session, @@ -361,7 +361,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): email='bar@bar.com') self.session.add(item) - project = pagure.lib.get_project( + project = pagure.lib._get_project( self.session, 'test3', namespace='ns') msg = pagure.lib.add_user_to_project( session=self.session, @@ -426,7 +426,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.session.add(item) # Set the user `bar` to watch the project - project = pagure.lib.get_project( + project = pagure.lib._get_project( self.session, 'test3', namespace='ns') msg = pagure.lib.update_watch_status( session=self.session, diff --git a/tests/test_stream_server.py b/tests/test_stream_server.py index 411df62..0db4ccb 100644 --- a/tests/test_stream_server.py +++ b/tests/test_stream_server.py @@ -49,8 +49,8 @@ class StreamingServerTests(tests.Modeltests): # Setup projects tests.create_projects(self.session) - self.repo = pagure.lib.get_project(self.session, 'test') - self.repo2 = pagure.lib.get_project(self.session, 'test2') + self.repo = pagure.lib._get_project(self.session, 'test') + self.repo2 = pagure.lib._get_project(self.session, 'test2') # Disable repo 2's issue tracker and PR tracker pagure.lib.update_project_settings(