From 6094b45029fa7b54647c5398607178ea651e38ab Mon Sep 17 00:00:00 2001 From: Michael Lazar Date: Tue, 19 Jul 2016 01:11:06 -0700 Subject: [PATCH] Missed some changes. --- rtv/subreddit.py | 2 +- rtv/{reddits.py => subscription.py} | 24 ++++++++++++------------ tests/conftest.py | 2 +- tests/test_subscription.py | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) rename rtv/{reddits.py => subscription.py} (71%) diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 1ac5963..10faa5e 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -9,7 +9,7 @@ from .content import SubredditContent from .page import Page, PageController, logged_in from .objects import Navigator, Color, Command from .submission import SubmissionPage -from .reddits import SubscriptionPage +from .subscription import SubscriptionPage from .exceptions import TemporaryFileError diff --git a/rtv/reddits.py b/rtv/subscription.py similarity index 71% rename from rtv/reddits.py rename to rtv/subscription.py index 4786250..3251b18 100644 --- a/rtv/reddits.py +++ b/rtv/subscription.py @@ -4,27 +4,27 @@ from __future__ import unicode_literals import curses from .page import Page, PageController -from .content import ListRedditsContent +from .content import SubscriptionContent from .objects import Color, Navigator, Command -class ListRedditsController(PageController): +class SubscriptionController(PageController): character_map = {} -class ListRedditsPage(Page): +class SubscriptionPage(Page): def __init__(self, reddit, name, func, term, config, oauth): - super(ListRedditsPage, self).__init__(reddit, term, config, oauth) + super(SubscriptionPage, self).__init__(reddit, term, config, oauth) - self.controller = ListRedditsController(self, keymap=config.keymap) + self.controller = SubscriptionController(self, keymap=config.keymap) self.name = name self.func = func - self.content = ListRedditsContent.from_func(name, func, term.loader) + self.content = SubscriptionContent.from_func(name, func, term.loader) self.nav = Navigator(self.content.get) self.reddit_data = None - @ListRedditsController.register(Command('REFRESH')) + @SubscriptionController.register(Command('REFRESH')) def refresh_content(self, order=None, name=None): "Re-download all reddits and reset the page index" @@ -34,21 +34,21 @@ class ListRedditsPage(Page): return with self.term.loader(): - self.content = ListRedditsContent.from_func(self.name, - self.func, self.term.loader) + self.content = SubscriptionContent.from_func( + self.name, self.func, self.term.loader) if not self.term.loader.exception: self.nav = Navigator(self.content.get) - @ListRedditsController.register(Command('SUBSCRIPTION_SELECT')) + @SubscriptionController.register(Command('SUBSCRIPTION_SELECT')) def select_reddit(self): "Store the selected reddit and return to the subreddit page" self.reddit_data = self.content.get(self.nav.absolute_index) self.active = False - @ListRedditsController.register(Command('SUBSCRIPTION_EXIT')) + @SubscriptionController.register(Command('SUBSCRIPTION_EXIT')) def close_subscriptions(self): - "Close list of reddits and return to the subreddit page" + "Close subscriptions and return to the subreddit page" self.active = False diff --git a/tests/conftest.py b/tests/conftest.py index 1f76174..10fc4fa 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -17,7 +17,7 @@ from rtv.config import Config from rtv.terminal import Terminal from rtv.subreddit import SubredditPage from rtv.submission import SubmissionPage -from rtv.reddits import SubscriptionPage +from rtv.subscription import SubscriptionPage try: from unittest import mock diff --git a/tests/test_subscription.py b/tests/test_subscription.py index 8790e65..1963c3b 100644 --- a/tests/test_subscription.py +++ b/tests/test_subscription.py @@ -6,7 +6,7 @@ import curses import praw import pytest -from rtv.reddits import SubscriptionPage +from rtv.subscription import SubscriptionPage try: from unittest import mock