diff --git a/bdfr/connector.py b/bdfr/connector.py index e04d9efe..61ed8f4e 100644 --- a/bdfr/connector.py +++ b/bdfr/connector.py @@ -414,7 +414,9 @@ def check_subreddit_status(subreddit: praw.models.Subreddit): try: assert subreddit.id except prawcore.NotFound: - raise errors.BulkDownloaderException(f'Source {subreddit.display_name} does not exist or cannot be found') + raise errors.BulkDownloaderException(f"Source {subreddit.display_name} cannot be found") + except prawcore.Redirect: + raise errors.BulkDownloaderException(f"Source {subreddit.display_name} does not exist") except prawcore.Forbidden: raise errors.BulkDownloaderException(f'Source {subreddit.display_name} is private and cannot be scraped') diff --git a/tests/test_connector.py b/tests/test_connector.py index 3a10757f..e928000d 100644 --- a/tests/test_connector.py +++ b/tests/test_connector.py @@ -447,7 +447,8 @@ def test_check_user_existence_banned( @pytest.mark.reddit @pytest.mark.parametrize(('test_subreddit_name', 'expected_message'), ( ('donaldtrump', 'cannot be found'), - ('submitters', 'private and cannot be scraped') + ('submitters', 'private and cannot be scraped'), + ('lhnhfkuhwreolo', 'does not exist') )) def test_check_subreddit_status_bad(test_subreddit_name: str, expected_message: str, reddit_instance: praw.Reddit): test_subreddit = reddit_instance.subreddit(test_subreddit_name)