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

Explicitly print format data as strings

Browse Source 
SubredditPage._draw_item_format now explicitly converts everything it
prints to a string. This fixes crashing on Redditor pages when the
Redditor object was split() before converting it to a string. Modified
variable names to reflect different types.
This commit is contained in:
John Helmert
2019-07-29 18:34:18 -05:00
parent 5436dc9fce
commit 9e43d7ed65
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tuir/subreddit_page.py
View File

@@ -411,7 +411,7 @@ class SubredditPage(Page):
for get_data, get_attr, first in self.format: for get_data, get_attr, first in self.format:
# add_line wants strings, make sure we give it strings # add_line wants strings, make sure we give it strings
if callable(get_data): if callable(get_data):
string = get_data(data) print_data = get_data(data)
else: else:
# Start writing to the next line if we hit a newline # Start writing to the next line if we hit a newline
if get_data == "\n": if get_data == "\n":
@@ -419,16 +419,18 @@ class SubredditPage(Page):
continue continue
# Otherwise, proceed on the same line # Otherwise, proceed on the same line
string = get_data print_data = get_data
# Don't try to write None strings to the screen. This happens in # Don't try to write None strings to the screen. This happens in
# places like user pages, where data['comments'] is None # places like user pages, where data['comments'] is None
if not string and first is False: if not print_data and first is False:
continue continue
# We only want to print a maximum of one line of data # We only want to print a maximum of one line of data,
# and we want to cast to a string, since sometimes 'data' is not a
# string, but a Redditor object
# TODO - support line wrapping # TODO - support line wrapping
string = string.split('\n')[0] string = str(print_data).split('\n')[0]
if string == ' ': if string == ' ':
# Make sure spaces aren't treated like normal strings and print # Make sure spaces aren't treated like normal strings and print