From c69728bea0eb2bf47c81f9a128b989e0f3358bfd Mon Sep 17 00:00:00 2001
From: Tobin <tobinjbrown@gmail.com>
Date: Sat, 4 Apr 2015 17:16:27 -0500
Subject: [PATCH] remove username attribute and use reddit.user.name

---
 rtv/__main__.py   | 2 +-
 rtv/page.py       | 4 +---
 rtv/submission.py | 4 ++--
 rtv/subreddit.py  | 7 ++++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/rtv/__main__.py b/rtv/__main__.py
index cb86551..c571874 100644
--- a/rtv/__main__.py
+++ b/rtv/__main__.py
@@ -109,7 +109,7 @@ def main():
             if args.link:
                 page = SubmissionPage(stdscr, reddit, url=args.link)
                 page.loop()
-            page = SubredditPage(stdscr, reddit, args.subreddit, args.username)
+            page = SubredditPage(stdscr, reddit, args.subreddit)
             page.loop()
     except praw.errors.InvalidUserPass:
         print('Invalid password for username: {}'.format(args.username))
diff --git a/rtv/page.py b/rtv/page.py
index 4753734..70d13f6 100644
--- a/rtv/page.py
+++ b/rtv/page.py
@@ -161,12 +161,11 @@ class BasePage(object):
     MIN_HEIGHT = 10
     MIN_WIDTH = 20
 
-    def __init__(self, stdscr, reddit, content, username, **kwargs):
+    def __init__(self, stdscr, reddit, content, **kwargs):
 
         self.stdscr = stdscr
         self.reddit = reddit
         self.content = content
-        self.username = username
         self.nav = Navigator(self.content.get, **kwargs)
 
         self._header_window = None
@@ -247,7 +246,6 @@ class BasePage(object):
 
         try:
             self.reddit.login(username, password)
-            self.username = username
         except praw.errors.InvalidUserPass:
             show_notification(self.stdscr, ['Invalid user/pass'])
         else:
diff --git a/rtv/submission.py b/rtv/submission.py
index be515ba..ddac09c 100644
--- a/rtv/submission.py
+++ b/rtv/submission.py
@@ -31,8 +31,8 @@ class SubmissionPage(BasePage):
         else:
             raise ValueError('Must specify url or submission')
 
-        super(SubmissionPage, self).__init__(stdscr, reddit, content,
-                                             page_index=-1, username=None)
+        super(SubmissionPage, self).__init__(stdscr, reddit,
+                                             content, page_index=-1)
 
     def loop(self):
         self.active = True
diff --git a/rtv/subreddit.py b/rtv/subreddit.py
index 7eda88a..f898824 100644
--- a/rtv/subreddit.py
+++ b/rtv/subreddit.py
@@ -24,13 +24,13 @@ class SubredditController(BaseController):
 
 class SubredditPage(BasePage):
 
-    def __init__(self, stdscr, reddit, name, username):
+    def __init__(self, stdscr, reddit, name):
 
         self.controller = SubredditController(self)
         self.loader = LoadScreen(stdscr)
 
         content = SubredditContent.from_name(reddit, name, self.loader)
-        super(SubredditPage, self).__init__(stdscr, reddit, content, username)
+        super(SubredditPage, self).__init__(stdscr, reddit, content)
 
     def loop(self):
         while True:
@@ -79,8 +79,9 @@ class SubredditPage(BasePage):
     def redditor_profile(self):
         if self.reddit.is_logged_in():
             try:
+                redditor = self.reddit.user.name
                 self.content = SubredditContent.from_redditor(
-                     self.reddit, self.username, self.loader)
+                     self.reddit, redditor, self.loader)
             except requests.HTTPError:
                 show_notification(self.stdscr, ['Could not reach subreddit'])
         else: