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

#67, Fixed unicode bug on python2.

Browse Source
This commit is contained in:
Michael Lazar
2015-04-02 20:52:39 -07:00
parent ca41b77d83
commit a603593381
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtv/submission.py
View File

@@ -139,13 +139,13 @@ class SubmissionPage(BasePage):
row = offset row = offset
if row in valid_rows: if row in valid_rows:
text = clean('{author} '.format(**data)) text = clean(u'{author} '.format(**data))
attr = curses.A_BOLD attr = curses.A_BOLD
attr |= (Color.BLUE if not data['is_author'] else Color.GREEN) attr |= (Color.BLUE if not data['is_author'] else Color.GREEN)
win.addnstr(row, 1, text, n_cols - 1, attr) win.addnstr(row, 1, text, n_cols - 1, attr)
if data['flair']: if data['flair']:
text = clean('{flair} '.format(**data)) text = clean(u'{flair} '.format(**data))
attr = curses.A_BOLD | Color.YELLOW attr = curses.A_BOLD | Color.YELLOW
win.addnstr(text, n_cols - win.getyx()[1], attr) win.addnstr(text, n_cols - win.getyx()[1], attr)
@@ -157,7 +157,7 @@ class SubmissionPage(BasePage):
text, attr = DARROW, (curses.A_BOLD | Color.RED) text, attr = DARROW, (curses.A_BOLD | Color.RED)
win.addnstr(text, n_cols - win.getyx()[1], attr) win.addnstr(text, n_cols - win.getyx()[1], attr)
text = clean(' {score} {created}'.format(**data)) text = clean(u' {score} {created}'.format(**data))
win.addnstr(text, n_cols - win.getyx()[1]) win.addnstr(text, n_cols - win.getyx()[1])
n_body = len(data['split_body']) n_body = len(data['split_body'])
@@ -187,9 +187,9 @@ class SubmissionPage(BasePage):
n_rows, n_cols = win.getmaxyx() n_rows, n_cols = win.getmaxyx()
n_cols -= 1 n_cols -= 1
text = clean('{body}'.format(**data)) text = clean(u'{body}'.format(**data))
win.addnstr(0, 1, text, n_cols - 1) win.addnstr(0, 1, text, n_cols - 1)
text = clean(' [{count}]'.format(**data)) text = clean(u' [{count}]'.format(**data))
win.addnstr(text, n_cols - win.getyx()[1], curses.A_BOLD) win.addnstr(text, n_cols - win.getyx()[1], curses.A_BOLD)
# Unfortunately vline() doesn't support custom color so we have to # Unfortunately vline() doesn't support custom color so we have to
@@ -211,17 +211,17 @@ class SubmissionPage(BasePage):
row = len(data['split_title']) + 1 row = len(data['split_title']) + 1
attr = curses.A_BOLD | Color.GREEN attr = curses.A_BOLD | Color.GREEN
text = clean('{author}'.format(**data)) text = clean(u'{author}'.format(**data))
win.addnstr(row, 1, text, n_cols, attr) win.addnstr(row, 1, text, n_cols, attr)
attr = curses.A_BOLD | Color.YELLOW attr = curses.A_BOLD | Color.YELLOW
text = clean(' {flair}'.format(**data)) text = clean(u' {flair}'.format(**data))
win.addnstr(text, n_cols - win.getyx()[1], attr) win.addnstr(text, n_cols - win.getyx()[1], attr)
text = clean(' {created} {subreddit}'.format(**data)) text = clean(u' {created} {subreddit}'.format(**data))
win.addnstr(text, n_cols - win.getyx()[1]) win.addnstr(text, n_cols - win.getyx()[1])
row = len(data['split_title']) + 2 row = len(data['split_title']) + 2
attr = curses.A_UNDERLINE | Color.BLUE attr = curses.A_UNDERLINE | Color.BLUE
text = clean('{url}'.format(**data)) text = clean(u'{url}'.format(**data))
win.addnstr(row, 1, text, n_cols, attr) win.addnstr(row, 1, text, n_cols, attr)
offset = len(data['split_title']) + 3 offset = len(data['split_title']) + 3
@@ -237,7 +237,7 @@ class SubmissionPage(BasePage):
win.addnstr(row, 1, text, n_cols) win.addnstr(row, 1, text, n_cols)
row = len(data['split_title']) + len(split_text) + 3 row = len(data['split_title']) + len(split_text) + 3
text = clean('{score} {comments}'.format(**data)) text = clean(u'{score} {comments}'.format(**data))
win.addnstr(row, 1, text, n_cols, curses.A_BOLD) win.addnstr(row, 1, text, n_cols, curses.A_BOLD)
win.border() win.border()

12
rtv/subreddit.py
View File

@@ -115,12 +115,12 @@ class SubredditPage(BasePage):
seen = (data['url_full'] in opened_links) seen = (data['url_full'] in opened_links)
link_color = Color.MAGENTA if seen else Color.BLUE link_color = Color.MAGENTA if seen else Color.BLUE
attr = curses.A_UNDERLINE | link_color attr = curses.A_UNDERLINE | link_color
text = clean('{url}'.format(**data)) text = clean(u'{url}'.format(**data))
win.addnstr(row, 1, text, n_cols - 1, attr) win.addnstr(row, 1, text, n_cols - 1, attr)
row = n_title + offset + 1 row = n_title + offset + 1
if row in valid_rows: if row in valid_rows:
text = clean('{score} '.format(**data)) text = clean(u'{score} '.format(**data))
win.addnstr(row, 1, text, n_cols - 1) win.addnstr(row, 1, text, n_cols - 1)
if data['likes'] is None: if data['likes'] is None:
@@ -131,14 +131,14 @@ class SubredditPage(BasePage):
text, attr = DARROW, curses.A_BOLD | Color.RED text, attr = DARROW, curses.A_BOLD | Color.RED
win.addnstr(text, n_cols - win.getyx()[1], attr) win.addnstr(text, n_cols - win.getyx()[1], attr)
text = clean(' {created} {comments}'.format(**data)) text = clean(u' {created} {comments}'.format(**data))
win.addnstr(text, n_cols - win.getyx()[1]) win.addnstr(text, n_cols - win.getyx()[1])
row = n_title + offset + 2 row = n_title + offset + 2
if row in valid_rows: if row in valid_rows:
text = clean('{author}'.format(**data)) text = clean(u'{author}'.format(**data))
win.addnstr(row, 1, text, n_cols - 1, curses.A_BOLD) win.addnstr(row, 1, text, n_cols - 1, curses.A_BOLD)
text = clean(' {subreddit}'.format(**data)) text = clean(u' {subreddit}'.format(**data))
win.addnstr(text, n_cols - win.getyx()[1], Color.YELLOW) win.addnstr(text, n_cols - win.getyx()[1], Color.YELLOW)
text = clean(' {flair}'.format(**data)) text = clean(u' {flair}'.format(**data))
win.addnstr(text, n_cols - win.getyx()[1], Color.RED) win.addnstr(text, n_cols - win.getyx()[1], Color.RED)