Skip to content
Merged
Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions pushover.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"]:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)