diff --git a/rtv/objects.py b/rtv/objects.py index 50ac828..3bbf274 100644 --- a/rtv/objects.py +++ b/rtv/objects.py @@ -179,7 +179,7 @@ class LoadScreen(object): handled_exceptions = (RTVError, PRAWException, RequestException) if isinstance(e, handled_exceptions): # Pass the message straight through to the user - message = six.text_type(e).split('/n') if e else exc_name + message = six.text_type(e).split('/n') if str(e) else exc_name self._terminal.show_notification(message) return True elif isinstance(e, KeyboardInterrupt): diff --git a/tests/test_oauth.py b/tests/test_oauth.py index ac072cb..25332dc 100644 --- a/tests/test_oauth.py +++ b/tests/test_oauth.py @@ -77,8 +77,7 @@ def test_oauth_authorize_with_refresh_token(oauth, stdscr, refresh_token): exception = OAuthException('', '') oauth.reddit.refresh_access_information.side_effect = exception oauth.authorize() - message = 'Invalid OAuth data'.encode('utf-8') - stdscr.derwin().addstr.assert_called_with(1, 1, message) + assert isinstance(oauth.term.loader.exception, OAuthException) assert oauth.http_server is None @@ -149,8 +148,7 @@ def test_oauth_authorize(oauth, reddit, stdscr, refresh_token): exception = OAuthException('', '') oauth.reddit.get_access_information.side_effect = exception oauth.authorize() - message = 'Invalid OAuth data'.encode('utf-8') - stdscr.derwin().addstr.assert_called_with(1, 1, message) + assert isinstance(oauth.term.loader.exception, OAuthException) assert not oauth.config.save_refresh_token.called diff --git a/tests/test_objects.py b/tests/test_objects.py index f0aad55..2dda79e 100644 --- a/tests/test_objects.py +++ b/tests/test_objects.py @@ -53,7 +53,7 @@ def test_objects_load_screen_exception_handled(terminal, stdscr, ascii): assert not terminal.loader._is_running assert not terminal.loader._animator.is_alive() assert isinstance(terminal.loader.exception, requests.ConnectionError) - error_message = 'Connection Error'.encode('ascii' if ascii else 'utf-8') + error_message = 'ConnectionError'.encode('ascii' if ascii else 'utf-8') stdscr.subwin.addstr.assert_called_with(1, 1, error_message) @@ -152,7 +152,7 @@ def test_objects_load_screen_nested_complex(terminal, stdscr, ascii): assert terminal.loader.depth == 0 assert not terminal.loader._is_running assert not terminal.loader._animator.is_alive() - error_message = 'Connection Error'.encode('ascii' if ascii else 'utf-8') + error_message = 'ConnectionError'.encode('ascii' if ascii else 'utf-8') stdscr.subwin.addstr.assert_called_once_with(1, 1, error_message)