Merge branch 'master' into cursor-tracking

Conflicts:
	rtv/content.py
This commit is contained in:
Michael Lazar
2016-04-19 23:49:37 -07:00
3 changed files with 42 additions and 8 deletions

View File

@@ -1,4 +1,30 @@
# -*- coding: utf-8 -*-
"""
________ __________________________
___ __ \__________ /_____ /__(_)_ /_
__ /_/ / _ \ __ /_ __ /__ /_ __/
_ _, _// __/ /_/ / / /_/ / _ / / /_
/_/ |_| \___/\__,_/ \__,_/ /_/ \__/
________ _____ ______
___ __/__________________ ______(_)____________ ___ /
__ / _ _ \_ ___/_ __ `__ \_ /__ __ \ __ `/_ /
_ / / __/ / _ / / / / / / _ / / / /_/ /_ /
/_/ \___//_/ /_/ /_/ /_//_/ /_/ /_/\__,_/ /_/
___ ______
__ | / /__(_)_______ ______________
__ | / /__ /_ _ \_ | /| / / _ \_ ___/
__ |/ / _ / / __/_ |/ |/ // __/ /
_____/ /_/ \___/____/|__/ \___//_/
(RTV)
"""
from __future__ import unicode_literals
from .__version__ import __version__
@@ -6,4 +32,4 @@ from .__version__ import __version__
__title__ = 'Reddit Terminal Viewer'
__author__ = 'Michael Lazar'
__license__ = 'The MIT License (MIT)'
__copyright__ = '(c) 2015 Michael Lazar'
__copyright__ = '(c) 2016 Michael Lazar'

View File

@@ -443,7 +443,6 @@ class SubredditContent(Content):
raise IndexError
else:
data = self.strip_praw_submission(submission)
#data['index'] = len(self._submission_data)
data['index'] = len(self._submission_data) + 1
# Add the post number to the beginning of the title
data['title'] = '{0}. {1}'.format(data['index'], data['title'])