Skip to content

Commit 6fe7819

Browse files
authored
Removing 2to3 requirement (#1)
1 parent 420bde9 commit 6fe7819

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

pushover.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def __init__(self, payload):
8383
if payload.get("priority", 0) == 2:
8484
self.url = RECEIPT_URL + self.answer["receipt"]
8585
self.status["done"] = False
86-
for param, when in MessageRequest.params.iteritems():
86+
for param, when in MessageRequest.params.items():
8787
self.status[param] = False
8888
self.status[when] = 0
8989

@@ -108,7 +108,7 @@ def poll(self):
108108
"""
109109
if not self.status["done"]:
110110
r = Request("get", self.url + ".json", {"token": self.payload["token"]})
111-
for param, when in MessageRequest.params.iteritems():
111+
for param, when in MessageRequest.params.items():
112112
self.status[param] = bool(r.answer[param])
113113
self.status[when] = int(r.answer[when])
114114
for param in ["acknowledged_by", "acknowledged_by_device"]:
@@ -201,7 +201,7 @@ def message(self, user, message, **kwargs):
201201
"""
202202

203203
payload = {"message": message, "user": user, "token": self.token}
204-
for key, value in kwargs.iteritems():
204+
for key, value in kwargs.items():
205205
if key not in Pushover.message_keywords:
206206
raise ValueError("{0}: invalid message parameter".format(key))
207207
elif key == "timestamp" and value is True:
@@ -225,7 +225,7 @@ def glance(self, user, **kwargs):
225225
"""
226226
payload = {"user": user, "token": self.token}
227227

228-
for key, value in kwargs.iteritems():
228+
for key, value in kwargs.items():
229229
if key not in Pushover.glance_keywords:
230230
raise ValueError("{0}: invalid glance parameter".format(key))
231231
else:

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@
1818
py_modules=["pushover", "cli"],
1919
entry_points={"console_scripts": ["pushover = cli:main"]},
2020
install_requires=["requests>=1.0"],
21-
use_2to3=True,
2221
license="GNU GPLv3",
2322
)

0 commit comments

Comments
 (0)