Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#1164) Add types to reddit/redditor.py #1221

Merged
merged 2 commits into from
Dec 29, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 31 additions & 11 deletions praw/models/reddit/redditor.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Provide the Redditor class."""
from json import dumps
from typing import Any, Dict, Generator, List, Optional, TypeVar, Union

from ...const import API_PATH
from ...util.cache import cachedproperty
Expand All @@ -8,6 +9,15 @@
from .base import RedditBase
from .mixins import FullnameMixin, MessageableMixin

_Redditor = TypeVar("_Redditor")
_RedditorStream = TypeVar("_RedditorStream")
Comment = TypeVar("Comment")
Multireddit = TypeVar("Multireddit")
Reddit = TypeVar("Reddit")
Submission = TypeVar("Submission")
Subreddit = TypeVar("Subreddit")
Trophy = TypeVar("Trophy")


class Redditor(
MessageableMixin, RedditorListingMixin, FullnameMixin, RedditBase
Expand Down Expand Up @@ -74,7 +84,7 @@ def from_data(cls, reddit, data):
return cls(reddit, data)

@cachedproperty
def stream(self):
def stream(self) -> _RedditorStream:
"""Provide an instance of :class:`.RedditorStream`.

Streams can be used to indefinitely retrieve new comments made by a
Expand Down Expand Up @@ -106,7 +116,13 @@ def _kind(self):
def _path(self):
return API_PATH["user"].format(user=self)

def __init__(self, reddit, name=None, fullname=None, _data=None):
def __init__(
self,
reddit: Reddit,
name: Optional[str] = None,
fullname: Optional[str] = None,
_data: Optional[Dict[str, Any]] = None,
):
"""Initialize a Redditor instance.

:param reddit: An instance of :class:`~.Reddit`.
Expand Down Expand Up @@ -164,7 +180,7 @@ def block(self):
API_PATH["block_user"], params={"account_id": self.fullname}
)

def friend(self, note=None):
def friend(self, note: str = None):
"""Friend the Redditor.

:param note: A note to save along with the relationship. Requires
Expand All @@ -175,7 +191,7 @@ def friend(self, note=None):
"""
self._friend("PUT", data={"note": note} if note else {})

def friend_info(self):
def friend_info(self) -> _Redditor:
"""Return a Redditor instance with specific friend-related attributes.

:returns: A :class:`.Redditor` instance with fields ``date``, ``id``,
Expand All @@ -184,7 +200,7 @@ def friend_info(self):
"""
return self._reddit.get(API_PATH["friend_v1"].format(user=self))

def gild(self, months=1):
def gild(self, months: int = 1):
"""Gild the Redditor.

:param months: Specifies the number of months to gild up to 36
Expand All @@ -198,7 +214,7 @@ def gild(self, months=1):
data={"months": months},
)

def moderated(self):
def moderated(self) -> List[Subreddit]:
"""Return a list of the redditor's moderated subreddits.

:returns: A ``list`` of :class:`~praw.models.Subreddit` objects.
Expand Down Expand Up @@ -226,11 +242,11 @@ def moderated(self):
]
return subreddits

def multireddits(self):
def multireddits(self) -> List[Multireddit]:
"""Return a list of the redditor's public multireddits."""
return self._reddit.get(API_PATH["multireddit_user"].format(user=self))

def trophies(self):
def trophies(self) -> List[Trophy]:
"""Return a list of the redditor's trophies.

:returns: A ``list`` of :class:`~praw.models.Trophy` objects.
Expand Down Expand Up @@ -267,15 +283,17 @@ def unfriend(self):
class RedditorStream:
"""Provides submission and comment streams."""

def __init__(self, redditor):
def __init__(self, redditor: Redditor):
"""Create a RedditorStream instance.

:param redditor: The redditor associated with the streams.

"""
self.redditor = redditor

def comments(self, **stream_options):
def comments(
self, **stream_options: Union[str, int, Dict[str, str]]
) -> Generator[Comment, None, None]:
"""Yield new comments as they become available.

Comments are yielded oldest first. Up to 100 historical comments will
Expand All @@ -294,7 +312,9 @@ def comments(self, **stream_options):
"""
return stream_generator(self.redditor.comments.new, **stream_options)

def submissions(self, **stream_options):
def submissions(
self, **stream_options: Union[str, int, Dict[str, str]]
) -> Generator[Submission, None, None]:
"""Yield new submissions as they become available.

Submissions are yielded oldest first. Up to 100 historical submissions
Expand Down