From 7bf9d1d0414d099762ca940290a1276b584f209b Mon Sep 17 00:00:00 2001 From: Cody Strugnell Date: Thu, 15 Sep 2022 18:57:53 +0200 Subject: [PATCH] Removing 2to3 requirement --- pushover.py | 8 ++++---- setup.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pushover.py b/pushover.py index 97a9d5f..109126b 100644 --- a/pushover.py +++ b/pushover.py @@ -83,7 +83,7 @@ def __init__(self, payload): if payload.get("priority", 0) == 2: self.url = RECEIPT_URL + self.answer["receipt"] self.status["done"] = False - for param, when in MessageRequest.params.iteritems(): + for param, when in MessageRequest.params.items(): self.status[param] = False self.status[when] = 0 @@ -108,7 +108,7 @@ def poll(self): """ if not self.status["done"]: r = Request("get", self.url + ".json", {"token": self.payload["token"]}) - for param, when in MessageRequest.params.iteritems(): + for param, when in MessageRequest.params.items(): self.status[param] = bool(r.answer[param]) self.status[when] = int(r.answer[when]) for param in ["acknowledged_by", "acknowledged_by_device"]: @@ -201,7 +201,7 @@ def message(self, user, message, **kwargs): """ payload = {"message": message, "user": user, "token": self.token} - for key, value in kwargs.iteritems(): + for key, value in kwargs.items(): if key not in Pushover.message_keywords: raise ValueError("{0}: invalid message parameter".format(key)) elif key == "timestamp" and value is True: @@ -225,7 +225,7 @@ def glance(self, user, **kwargs): """ payload = {"user": user, "token": self.token} - for key, value in kwargs.iteritems(): + for key, value in kwargs.items(): if key not in Pushover.glance_keywords: raise ValueError("{0}: invalid glance parameter".format(key)) else: diff --git a/setup.py b/setup.py index 639b9a5..162d1cb 100644 --- a/setup.py +++ b/setup.py @@ -18,6 +18,5 @@ py_modules=["pushover", "cli"], entry_points={"console_scripts": ["pushover = cli:main"]}, install_requires=["requests>=1.0"], - use_2to3=True, license="GNU GPLv3", )