From 0274823b7e767cc8cc02b8506a649c772f88644e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Piboub=C3=A8s?= <theo.piboubes@gmail.com>
Date: Sun, 9 Aug 2015 23:32:17 +0200
Subject: [PATCH] Safe call is useless here + some refactoring

---
 rtv/content.py   | 7 ++++---
 rtv/subreddit.py | 7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rtv/content.py b/rtv/content.py
index f77c7a9..6dd0b1f 100644
--- a/rtv/content.py
+++ b/rtv/content.py
@@ -368,21 +368,22 @@ class SubredditContent(BaseContent):
         return data
 
 class SubscriptionContent(BaseContent):
-    def __init__(self, subscriptions, loader):
-        self.name = "Subscriptions"
+    def __init__(self, name, subscriptions, loader):
+        self.name = name
         self._loader = loader
         self._subscriptions = subscriptions
         self._subscription_data = []
 
     @classmethod
     def get_list(cls, reddit, loader):
+        display_name = "Subscriptions"
         try:
             with loader():
                 subscriptions = reddit.get_my_subreddits(limit=None)
         except praw.errors.APIException:
             raise SubscriptionError()
 
-        return cls(subscriptions, loader)
+        return cls(display_name, subscriptions, loader)
 
     def get(self, index, n_cols=70):
         """
diff --git a/rtv/subreddit.py b/rtv/subreddit.py
index d73fcb4..4c9e448 100644
--- a/rtv/subreddit.py
+++ b/rtv/subreddit.py
@@ -167,10 +167,9 @@ class SubredditPage(BasePage):
             show_notification(self.stdscr, ['Not logged in'])
             return
 
-        with self.safe_call as s:
-            page = SubscriptionPage(self.stdscr, self.reddit)
-            page.loop()
-            self.refresh_content()
+        page = SubscriptionPage(self.stdscr, self.reddit)
+        page.loop()
+        self.refresh_content()
 
     @staticmethod
     def draw_item(win, data, inverted=False):