gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaked exception wording.

Browse Source
This commit is contained in:
Michael Lazar
2015-12-08 01:09:56 -08:00
parent 9d2a6af826
commit cefdfb3290
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtv/objects.py
View File

@@ -116,6 +116,7 @@ class LoadScreen(object):
(praw.errors.OAuthException, 'Not logged in'), (praw.errors.OAuthException, 'Not logged in'),
(praw.errors.OAuthScopeRequired, 'Not logged in'), (praw.errors.OAuthScopeRequired, 'Not logged in'),
(praw.errors.LoginRequired, 'Not logged in'), (praw.errors.LoginRequired, 'Not logged in'),
(praw.errors.InvalidCaptcha, 'Error, captcha required'),
(praw.errors.PRAWException, '{0.__class__.__name__}'), (praw.errors.PRAWException, '{0.__class__.__name__}'),
(requests.exceptions.RequestException, '{0.__class__.__name__}'), (requests.exceptions.RequestException, '{0.__class__.__name__}'),
] ]

4
rtv/page.py
View File

@@ -184,7 +184,7 @@ class Page(object):
prompt = 'Are you sure you want to delete this? (y/n): ' prompt = 'Are you sure you want to delete this? (y/n): '
if not self.term.prompt_y_or_n(prompt): if not self.term.prompt_y_or_n(prompt):
self.term.show_notification('Aborted') self.term.show_notification('Canceled')
return return
with self.term.loader('Deleting', delay=0): with self.term.loader('Deleting', delay=0):
@@ -220,7 +220,7 @@ class Page(object):
text = self.term.open_editor(info) text = self.term.open_editor(info)
if text == content: if text == content:
self.term.show_notification('Aborted') self.term.show_notification('Canceled')
return return
with self.term.loader('Editing', delay=0): with self.term.loader('Editing', delay=0):

2
rtv/submission.py
View File

@@ -104,7 +104,7 @@ class SubmissionPage(Page):
comment = self.term.open_editor(comment_info) comment = self.term.open_editor(comment_info)
if not comment: if not comment:
self.term.show_notification('Aborted') self.term.show_notification('Canceled')
return return
with self.term.loader('Posting', delay=0): with self.term.loader('Posting', delay=0):

2
rtv/subreddit.py
View File

@@ -121,7 +121,7 @@ class SubredditPage(Page):
submission_info = docs.SUBMISSION_FILE.format(name=name) submission_info = docs.SUBMISSION_FILE.format(name=name)
text = self.term.open_editor(submission_info) text = self.term.open_editor(submission_info)
if not text or '\n' not in text: if not text or '\n' not in text:
self.term.show_notification('Aborted') self.term.show_notification('Canceled')
return return
title, content = text.split('\n', 1) title, content = text.split('\n', 1)

2
rtv/terminal.py
View File

@@ -303,7 +303,7 @@ class Terminal(object):
# If it blocks or returns an error, something went wrong. # If it blocks or returns an error, something went wrong.
try: try:
start = time.time() start = time.time()
while time.time() - start < 5: while time.time() - start < 10:
code = p.poll() code = p.poll()
if code == 0: if code == 0:
break # Success break # Success

2
tests/test_subreddit.py
View File

@@ -142,7 +142,7 @@ def test_subreddit_post(subreddit_page, terminal, reddit, refresh_token):
with mock.patch.object(terminal, 'open_editor'): with mock.patch.object(terminal, 'open_editor'):
terminal.open_editor.return_value = 'title' terminal.open_editor.return_value = 'title'
subreddit_page.controller.trigger('c') subreddit_page.controller.trigger('c')
text = "Aborted".encode('utf-8') text = 'Canceled'.encode('utf-8')
terminal.stdscr.subwin.addstr.assert_called_with(1, 1, text) terminal.stdscr.subwin.addstr.assert_called_with(1, 1, text)
# Post a fake submission # Post a fake submission