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

Upped mac indent level from 4 to 8.

Browse Source
This commit is contained in:
Michael Lazar
2015-04-17 20:39:59 -07:00
parent 5146244c26
commit 7d48890f43
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtv/__main__.py
View File

@@ -97,14 +97,15 @@ def main():
config.unicode = args.unicode config.unicode = args.unicode
# Squelch SSL warnings for Ubuntu
logging.captureWarnings(True)
if args.log: if args.log:
logging.basicConfig(level=logging.DEBUG, filename=args.log) logging.basicConfig(level=logging.DEBUG, filename=args.log)
logging.captureWarnings(True)
try: try:
print('Connecting...') print('Connecting...')
reddit = praw.Reddit(user_agent=AGENT) reddit = praw.Reddit(user_agent=AGENT)
reddit.config.decode_html_entities = True reddit.config.decode_html_entities = False
if args.username: if args.username:
# PRAW will prompt for password if it is None # PRAW will prompt for password if it is None
reddit.login(args.username, args.password) reddit.login(args.username, args.password)

14
rtv/content.py
View File

@@ -43,8 +43,16 @@ class BaseContent(object):
retval = [] retval = []
while stack: while stack:
item = stack.pop(0) item = stack.pop(0)
if not isinstance(item, praw.objects.MoreComments): if isinstance(item, praw.objects.MoreComments):
if item.count == 0:
# MoreComments item count should never be zero, but if it
# is then discard the MoreComment object. Need to look into
# this further.
continue
else:
if item._replies is None: if item._replies is None:
# Attach children MoreComment replies to parents
# https://github.com/praw-dev/praw/issues/391
item._replies = [stack.pop(0)] item._replies = [stack.pop(0)]
nested = getattr(item, 'replies', None) nested = getattr(item, 'replies', None)
if nested: if nested:
@@ -122,7 +130,7 @@ class SubmissionContent(BaseContent):
list for repeat access. list for repeat access.
""" """
def __init__(self, submission, loader, indent_size=2, max_indent_level=4): def __init__(self, submission, loader, indent_size=2, max_indent_level=8):
self.indent_size = indent_size self.indent_size = indent_size
self.max_indent_level = max_indent_level self.max_indent_level = max_indent_level
@@ -135,7 +143,7 @@ class SubmissionContent(BaseContent):
self._comment_data = [self.strip_praw_comment(c) for c in comments] self._comment_data = [self.strip_praw_comment(c) for c in comments]
@classmethod @classmethod
def from_url(cls, reddit, url, loader, indent_size=2, max_indent_level=4): def from_url(cls, reddit, url, loader, indent_size=2, max_indent_level=8):
try: try:
with loader(): with loader():