From d3fc09fa89914572b19fac1cab7ae7f42ed9feb1 Mon Sep 17 00:00:00 2001 From: PokestarFan Date: Mon, 23 Dec 2019 18:27:33 -0500 Subject: [PATCH] Reove useless super call arguments --- praw/exceptions.py | 2 +- praw/models/front.py | 2 +- praw/models/list/base.py | 2 +- praw/models/listing/domain.py | 2 +- praw/models/listing/generator.py | 2 +- praw/models/listing/listing.py | 2 +- praw/models/listing/mixins/redditor.py | 2 +- praw/models/listing/mixins/subreddit.py | 4 ++-- praw/models/reddit/base.py | 2 +- praw/models/reddit/collections.py | 10 +++++----- praw/models/reddit/comment.py | 4 ++-- praw/models/reddit/emoji.py | 2 +- praw/models/reddit/live.py | 8 ++++---- praw/models/reddit/message.py | 2 +- praw/models/reddit/modmail.py | 4 ++-- praw/models/reddit/more.py | 2 +- praw/models/reddit/multi.py | 2 +- praw/models/reddit/redditor.py | 2 +- praw/models/reddit/removal_reasons.py | 2 +- praw/models/reddit/submission.py | 4 ++-- praw/models/reddit/subreddit.py | 4 ++-- praw/models/reddit/widgets.py | 12 ++++++------ praw/models/reddit/wikipage.py | 2 +- praw/models/trophy.py | 2 +- praw/models/user.py | 2 +- tests/integration/models/reddit/test_more.py | 2 +- tests/integration/models/test_comment_forest.py | 2 +- 27 files changed, 44 insertions(+), 44 deletions(-) diff --git a/praw/exceptions.py b/praw/exceptions.py index 505fdba4f..043f18ca1 100644 --- a/praw/exceptions.py +++ b/praw/exceptions.py @@ -33,7 +33,7 @@ def __init__(self, error_type, message, field): error_str += u" on field '{}'".format(field) error_str = error_str.encode("unicode_escape").decode("ascii") - super(APIException, self).__init__(error_str) + super().__init__(error_str) self.error_type = error_type self.message = message self.field = field diff --git a/praw/models/front.py b/praw/models/front.py index 18b5dc8ff..bcf800535 100644 --- a/praw/models/front.py +++ b/praw/models/front.py @@ -10,7 +10,7 @@ class Front(SubredditListingMixin): def __init__(self, reddit): """Initialize a Front instance.""" - super(Front, self).__init__(reddit, _data=None) + super().__init__(reddit, _data=None) self._path = "/" def best(self, **generator_kwargs): diff --git a/praw/models/list/base.py b/praw/models/list/base.py index 86623df4c..9a104aa10 100644 --- a/praw/models/list/base.py +++ b/praw/models/list/base.py @@ -13,7 +13,7 @@ def __init__(self, reddit, _data): :param reddit: An instance of :class:`~.Reddit`. """ - super(BaseList, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) if self.CHILD_ATTRIBUTE is None: raise NotImplementedError("BaseList must be extended.") diff --git a/praw/models/listing/domain.py b/praw/models/listing/domain.py index 000b37dca..64ef4d46d 100644 --- a/praw/models/listing/domain.py +++ b/praw/models/listing/domain.py @@ -13,5 +13,5 @@ def __init__(self, reddit, domain): :param domain: The domain for which to obtain listings. """ - super(DomainListing, self).__init__(reddit, _data=None) + super().__init__(reddit, _data=None) self._path = API_PATH["domain"].format(domain=domain) diff --git a/praw/models/listing/generator.py b/praw/models/listing/generator.py index 0601ff684..41518a662 100644 --- a/praw/models/listing/generator.py +++ b/praw/models/listing/generator.py @@ -29,7 +29,7 @@ def __init__(self, reddit, url, limit=100, params=None): parameters to send with the request. """ - super(ListingGenerator, self).__init__(reddit, _data=None) + super().__init__(reddit, _data=None) self._exhausted = False self._listing = None self._list_index = None diff --git a/praw/models/listing/listing.py b/praw/models/listing/listing.py index cedd764f2..96ce0bbe2 100644 --- a/praw/models/listing/listing.py +++ b/praw/models/listing/listing.py @@ -19,7 +19,7 @@ def __setattr__(self, attribute, value): """Objectify the CHILD_ATTRIBUTE attribute.""" if attribute == self.CHILD_ATTRIBUTE: value = self._reddit._objector.objectify(value) - super(Listing, self).__setattr__(attribute, value) + super().__setattr__(attribute, value) class FlairListing(Listing): diff --git a/praw/models/listing/mixins/redditor.py b/praw/models/listing/mixins/redditor.py index 6d27e9a3d..e4f6b7e44 100644 --- a/praw/models/listing/mixins/redditor.py +++ b/praw/models/listing/mixins/redditor.py @@ -134,7 +134,7 @@ def __init__(self, reddit, base_path, subpath): :param subpath: The additional path to this sublisting. """ - super(SubListing, self).__init__(reddit, _data=None) + super().__init__(reddit, _data=None) self._listing_use_sort = True self._reddit = reddit self._path = urljoin(base_path, subpath) diff --git a/praw/models/listing/mixins/subreddit.py b/praw/models/listing/mixins/subreddit.py index 526722cf7..5febcbe18 100644 --- a/praw/models/listing/mixins/subreddit.py +++ b/praw/models/listing/mixins/subreddit.py @@ -35,7 +35,7 @@ def __init__(self, reddit, _data): :param reddit: An instance of :class:`.Reddit`. """ - super(SubredditListingMixin, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) class CommentHelper(PRAWBase): @@ -47,7 +47,7 @@ def _path(self): def __init__(self, subreddit): """Initialize a CommentHelper instance.""" - super(CommentHelper, self).__init__(subreddit._reddit, _data=None) + super().__init__(subreddit._reddit, _data=None) self.subreddit = subreddit def __call__(self, **generator_kwargs): diff --git a/praw/models/reddit/base.py b/praw/models/reddit/base.py index c42de335a..ff81f623f 100644 --- a/praw/models/reddit/base.py +++ b/praw/models/reddit/base.py @@ -45,7 +45,7 @@ def __init__(self, reddit, _data): :param reddit: An instance of :class:`~.Reddit`. """ - super(RedditBase, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) self._fetched = False def __repr__(self): diff --git a/praw/models/reddit/collections.py b/praw/models/reddit/collections.py index 98b84e506..86aa039b7 100644 --- a/praw/models/reddit/collections.py +++ b/praw/models/reddit/collections.py @@ -89,7 +89,7 @@ def __init__(self, reddit, _data=None, collection_id=None, permalink=None): :param collection_id: The ID of the Collection (optional). :param permalink: The permalink of the Collection (optional). """ - super(Collection, self).__init__(reddit, _data) + super().__init__(reddit, _data) if (_data, collection_id, permalink).count(None) != 2: raise TypeError( @@ -142,7 +142,7 @@ def __setattr__(self, attribute, value): self.author = self._reddit.redditor(value) elif attribute == "sorted_links": value = self._reddit._objector.objectify(value) - super(Collection, self).__setattr__(attribute, value) + super().__setattr__(attribute, value) def _fetch_info(self): return ("collection", {}, self._info_params) @@ -240,7 +240,7 @@ def __init__(self, reddit, collection_id): :param collection_id: The ID of a collection. """ - super(CollectionModeration, self).__init__(reddit, _data=None) + super().__init__(reddit, _data=None) self.collection_id = collection_id def add_post(self, submission): @@ -444,7 +444,7 @@ def __call__(self, collection_id=None, permalink=None): def __init__(self, reddit, subreddit, _data=None): """Initialize an instance of SubredditCollections.""" - super(SubredditCollections, self).__init__(reddit, _data) + super().__init__(reddit, _data) self.subreddit = subreddit def __iter__(self): @@ -479,7 +479,7 @@ class SubredditCollectionsModeration(PRAWBase): def __init__(self, reddit, sub_fullname, _data=None): """Initialize the SubredditCollectionsModeration instance.""" - super(SubredditCollectionsModeration, self).__init__(reddit, _data) + super().__init__(reddit, _data) self.subreddit_fullname = sub_fullname def create(self, title, description): diff --git a/praw/models/reddit/comment.py b/praw/models/reddit/comment.py index a1daaefc8..f6402bb26 100644 --- a/praw/models/reddit/comment.py +++ b/praw/models/reddit/comment.py @@ -145,7 +145,7 @@ def __init__( ) self._replies = [] self._submission = None - super(Comment, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) if id: self.id = id elif url: @@ -165,7 +165,7 @@ def __setattr__(self, attribute, value): attribute = "_replies" elif attribute == "subreddit": value = self._reddit.subreddit(value) - super(Comment, self).__setattr__(attribute, value) + super().__setattr__(attribute, value) def _fetch_info(self): return ("info", {}, {"id": self.fullname}) diff --git a/praw/models/reddit/emoji.py b/praw/models/reddit/emoji.py index d60713645..42e472886 100644 --- a/praw/models/reddit/emoji.py +++ b/praw/models/reddit/emoji.py @@ -49,7 +49,7 @@ def __init__(self, reddit, subreddit, name, _data=None): """Construct an instance of the Emoji object.""" self.name = name self.subreddit = subreddit - super(Emoji, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) def _fetch(self): for emoji in self.subreddit.emoji: diff --git a/praw/models/reddit/live.py b/praw/models/reddit/live.py index cebf2bfbf..b044eed1c 100644 --- a/praw/models/reddit/live.py +++ b/praw/models/reddit/live.py @@ -344,7 +344,7 @@ def __init__( """ if bool(id) == bool(_data): raise TypeError("Either `id` or `_data` must be provided.") - super(LiveThread, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) if id: self.id = id @@ -612,10 +612,10 @@ def __init__(self, reddit, thread_id=None, update_id=None, _data=None): # Since _data (part of JSON returned from reddit) have no # thread ID, self._thread must be set by the caller of # LiveUpdate(). See the code of LiveThread.updates() for example. - super(LiveUpdate, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) self._fetched = True elif thread_id and update_id: - super(LiveUpdate, self).__init__(reddit, _data=None) + super().__init__(reddit, _data=None) self._thread = LiveThread(self._reddit, thread_id) self.id = update_id else: @@ -628,7 +628,7 @@ def __setattr__(self, attribute, value): """Objectify author.""" if attribute == "author": value = Redditor(self._reddit, name=value) - super(LiveUpdate, self).__setattr__(attribute, value) + super().__setattr__(attribute, value) def _fetch(self): url = API_PATH["live_focus"].format( diff --git a/praw/models/reddit/message.py b/praw/models/reddit/message.py index 26e33e9e2..d013287ef 100644 --- a/praw/models/reddit/message.py +++ b/praw/models/reddit/message.py @@ -78,7 +78,7 @@ def _kind(self): def __init__(self, reddit, _data): """Construct an instance of the Message object.""" - super(Message, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) self._fetched = True def delete(self): diff --git a/praw/models/reddit/modmail.py b/praw/models/reddit/modmail.py index e14fd948e..34a602fb0 100644 --- a/praw/models/reddit/modmail.py +++ b/praw/models/reddit/modmail.py @@ -136,7 +136,7 @@ def __init__( (default: False). """ - super(ModmailConversation, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) if bool(id) == bool(_data): raise TypeError("Either `id` or `_data` must be provided.") @@ -338,7 +338,7 @@ def __setattr__(self, attribute, value): """Objectify the AUTHOR_ATTRIBUTE attribute.""" if attribute == self.AUTHOR_ATTRIBUTE: value = self._reddit._objector.objectify(value) - super(ModmailObject, self).__setattr__(attribute, value) + super().__setattr__(attribute, value) class ModmailAction(ModmailObject): diff --git a/praw/models/reddit/more.py b/praw/models/reddit/more.py index ed09d35b0..e9e1bba5e 100644 --- a/praw/models/reddit/more.py +++ b/praw/models/reddit/more.py @@ -10,7 +10,7 @@ def __init__(self, reddit, _data): """Construct an instance of the MoreComments object.""" self.count = self.parent_id = None self.children = [] - super(MoreComments, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) self._comments = None self.submission = None diff --git a/praw/models/reddit/multi.py b/praw/models/reddit/multi.py index 69352febe..acb1b3205 100644 --- a/praw/models/reddit/multi.py +++ b/praw/models/reddit/multi.py @@ -94,7 +94,7 @@ def stream(self): def __init__(self, reddit, _data): """Construct an instance of the Multireddit object.""" self.path = None - super(Multireddit, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) self._author = Redditor(reddit, self.path.split("/", 3)[2]) self._path = API_PATH["multireddit"].format( multi=self.name, user=self._author diff --git a/praw/models/reddit/redditor.py b/praw/models/reddit/redditor.py index bb2893766..a694706f0 100644 --- a/praw/models/reddit/redditor.py +++ b/praw/models/reddit/redditor.py @@ -125,7 +125,7 @@ def __init__(self, reddit, name=None, fullname=None, _data=None): assert ( isinstance(_data, dict) and "name" in _data ), "Please file a bug with PRAW" - super(Redditor, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) self._listing_use_sort = True if name: self.name = name diff --git a/praw/models/reddit/removal_reasons.py b/praw/models/reddit/removal_reasons.py index b3afc3af4..0d03941cf 100644 --- a/praw/models/reddit/removal_reasons.py +++ b/praw/models/reddit/removal_reasons.py @@ -40,7 +40,7 @@ def __init__(self, reddit, subreddit, reason_id, _data=None): """Construct an instance of the Removal Reason object.""" self.id = reason_id self.subreddit = subreddit - super(RemovalReason, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) def _fetch(self): for removal_reason in self.subreddit.mod.removal_reasons: diff --git a/praw/models/reddit/submission.py b/praw/models/reddit/submission.py index 2d4b6df50..759c234bf 100644 --- a/praw/models/reddit/submission.py +++ b/praw/models/reddit/submission.py @@ -191,7 +191,7 @@ def __init__( raise TypeError( "Exactly one of `id`, `url`, or `_data` must be provided." ) - super(Submission, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) self.comment_limit = 2048 # Specify the sort order for ``comments`` @@ -210,7 +210,7 @@ def __setattr__(self, attribute, value): value = Redditor.from_data(self._reddit, value) elif attribute == "subreddit": value = Subreddit(self._reddit, value) - super(Submission, self).__setattr__(attribute, value) + super().__setattr__(attribute, value) def _chunk(self, other_submissions, chunk_size): all_submissions = [self.fullname] diff --git a/praw/models/reddit/subreddit.py b/praw/models/reddit/subreddit.py index 6c2124ff3..5e93d50de 100644 --- a/praw/models/reddit/subreddit.py +++ b/praw/models/reddit/subreddit.py @@ -436,7 +436,7 @@ def __init__(self, reddit, display_name=None, _data=None): raise TypeError( "Either `display_name` or `_data` must be provided." ) - super(Subreddit, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) if display_name: self.display_name = display_name self._path = API_PATH["subreddit"].format(subreddit=self) @@ -2101,7 +2101,7 @@ def add(self, redditor, permissions=None, **other_settings): """ other_settings = self._handle_permissions(permissions, other_settings) - super(ModeratorRelationship, self).add(redditor, **other_settings) + super().add(redditor, **other_settings) # pylint: enable=arguments-differ diff --git a/praw/models/reddit/widgets.py b/praw/models/reddit/widgets.py index 830f69e42..be7944e1c 100755 --- a/praw/models/reddit/widgets.py +++ b/praw/models/reddit/widgets.py @@ -294,7 +294,7 @@ def __init__(self, subreddit): self.subreddit = subreddit self.progressive_images = False - super(SubredditWidgets, self).__init__(subreddit._reddit, {}) + super().__init__(subreddit._reddit, {}) def __repr__(self): """Return an object initialization representation of the object.""" @@ -309,7 +309,7 @@ def _fetch(self): ) self._raw_items = data.pop("items") - super(SubredditWidgets, self).__init__(self.subreddit._reddit, data) + super().__init__(self.subreddit._reddit, data) cached_property_names = [ "id_card", @@ -948,7 +948,7 @@ def __init__(self, reddit, _data): """Initialize an instance of the class.""" self.subreddit = "" # in case it isn't in _data self.id = "" # in case it isn't in _data - super(Widget, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) self._mod = None @@ -1269,7 +1269,7 @@ def __init__(self, reddit, _data): _data["imageData"] = [ ImageData(reddit, data) for data in _data.pop("imageData") ] - super(CustomWidget, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) class IDCard(Widget): @@ -1514,7 +1514,7 @@ def __init__(self, reddit, _data): if self.CHILD_ATTRIBUTE not in _data: # .mod.update() sometimes returns payload without 'mods' field _data[self.CHILD_ATTRIBUTE] = [] - super(ModeratorsWidget, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) class PostFlairWidget(Widget, BaseList): @@ -1649,7 +1649,7 @@ def __init__(self, reddit, _data): if self.CHILD_ATTRIBUTE not in _data: # .mod.update() sometimes returns payload without 'data' field _data[self.CHILD_ATTRIBUTE] = [] - super(RulesWidget, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) class TextArea(Widget): diff --git a/praw/models/reddit/wikipage.py b/praw/models/reddit/wikipage.py index 729129641..16b09edc6 100644 --- a/praw/models/reddit/wikipage.py +++ b/praw/models/reddit/wikipage.py @@ -72,7 +72,7 @@ def __init__(self, reddit, subreddit, name, revision=None, _data=None): self.name = name self._revision = revision self.subreddit = subreddit - super(WikiPage, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) def __repr__(self): """Return an object initialization representation of the instance.""" diff --git a/praw/models/trophy.py b/praw/models/trophy.py index a1e0f813a..dc3672357 100644 --- a/praw/models/trophy.py +++ b/praw/models/trophy.py @@ -39,7 +39,7 @@ def __init__(self, reddit, _data): """ assert isinstance(_data, dict) and "name" in _data - super(Trophy, self).__init__(reddit, _data=_data) + super().__init__(reddit, _data=_data) def __str__(self): """Return a name of the trophy.""" diff --git a/praw/models/user.py b/praw/models/user.py index b163f4528..e469fe14c 100644 --- a/praw/models/user.py +++ b/praw/models/user.py @@ -49,7 +49,7 @@ def __init__(self, reddit): This class is intended to be interfaced with through ``reddit.user``. """ - super(User, self).__init__(reddit, _data=None) + super().__init__(reddit, _data=None) def blocked(self): """Return a RedditorList of blocked Redditors.""" diff --git a/tests/integration/models/reddit/test_more.py b/tests/integration/models/reddit/test_more.py index e0b71346d..330c5c07c 100644 --- a/tests/integration/models/reddit/test_more.py +++ b/tests/integration/models/reddit/test_more.py @@ -5,7 +5,7 @@ class TestMore(IntegrationTest): def setup(self): - super(TestMore, self).setup() + super().setup() # Responses do not decode well on travis so manually renable gzip. self.reddit._core._requestor._http.headers["Accept-Encoding"] = "gzip" diff --git a/tests/integration/models/test_comment_forest.py b/tests/integration/models/test_comment_forest.py index 61db6d74d..58f36b918 100644 --- a/tests/integration/models/test_comment_forest.py +++ b/tests/integration/models/test_comment_forest.py @@ -6,7 +6,7 @@ class TestCommentForest(IntegrationTest): def setup(self): - super(TestCommentForest, self).setup() + super().setup() # Responses do not decode well on travis so manually re-enable gzip. self.reddit._core._requestor._http.headers["Accept-Encoding"] = "gzip"