Merge pull request #33 from ragreener1/master

Fixed issue #23
This commit is contained in:
michael-lazar
2015-03-10 15:47:24 -07:00
2 changed files with 30 additions and 11 deletions

View File

@@ -7,6 +7,8 @@ from .errors import SubmissionURLError, SubredditNameError
from .utils import curses_session, load_config, HELP
from .subreddit import SubredditPage
from .submission import SubmissionPage
import locale
import rtv.content
# Debugging
# import logging
@@ -21,9 +23,9 @@ EPILOG = """
Controls
-----
RTV currently supports browsing both subreddits and individual submissions.
In each mode the controls are slightly different. In subreddit mode you can
browse through the top submissions on either the front page or a specific
subreddit. In submission mode you can view the self text for a submission and
In each mode the controls are slightly different. In subreddit mode you can
browse through the top submissions on either the front page or a specific
subreddit. In submission mode you can view the self text for a submission and
browse comments.
"""
@@ -36,9 +38,11 @@ def main():
formatter_class=argparse.RawDescriptionHelpFormatter)
parser.add_argument('-s', dest='subreddit', help='subreddit name')
parser.add_argument('-l', dest='link', help='full link to a submission')
parser.add_argument('--force-ascii', dest='force_ascii',
help='forces ascii (disables unicode)', action='store_true')
group = parser.add_argument_group(
'authentication (optional)',
'authentication (optional)',
'Authenticating allows you to view your customized front page. '
'If only the username is given, the password will be prompted '
'securely.')
@@ -56,6 +60,10 @@ def main():
if args.subreddit is None:
args.subreddit = 'front'
if args.force_ascii:
rtv.content.is_utf8 = False
locale.setlocale(locale.LC_ALL, '')
try:
reddit = praw.Reddit(user_agent='desktop:https://github.com/michael-lazar/rtv:(by /u/civilization_phaze_3)')
reddit.config.decode_html_entities = True
@@ -73,7 +81,7 @@ def main():
page.loop()
except InvalidUserPass:
print('Invalid password for username: {}'.format(args.username))
print('Invalid password for username: {}'.format(args.username))
except KeyboardInterrupt:
return