From ccc4e31358f0de5c4f155a785745ad15a8354a58 Mon Sep 17 00:00:00 2001 From: Antonin Amand Date: Tue, 22 Nov 2011 17:15:11 +0100 Subject: [PATCH 1/2] use socket and ssl from gevent to avoid forcing monkey patch --- applepushnotification/service.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/applepushnotification/service.py b/applepushnotification/service.py index e800250..0868807 100644 --- a/applepushnotification/service.py +++ b/applepushnotification/service.py @@ -1,10 +1,10 @@ #!/usr/bin/env python -from gevent import monkey; monkey.patch_all() -import ssl, gevent, time, struct, sys +import gevent, time, struct from gevent.queue import Queue from gevent.event import Event -from socket import * +from gevent import socket +from gevent import ssl try: import json @@ -77,7 +77,9 @@ def __init__(self, sandbox = True, **kwargs): def _check_send_connection(self): if self._push_connection is None: - s = ssl.wrap_socket(socket(AF_INET, SOCK_STREAM, 0), + tcp_socket = socket.socket( + socket.AF_INET, socket.SOCK_STREAM, 0) + s = ssl.wrap_socket(tcp_socket, ssl_version=ssl.PROTOCOL_SSLv3, **self._sslargs) addr = ["gateway.push.apple.com", 2195] @@ -89,7 +91,9 @@ def _check_send_connection(self): def _check_feedback_connection(self): if self._feedback_connection is None: - s = ssl.wrap_socket(socket(AF_INET, SOCK_STREAM, 0), + tcp_socket = socket.socket( + socket.AF_INET, socket.SOCK_STREAM, 0) + s = ssl.wrap_socket(tcp_socket, ssl_version = ssl.PROTOCOL_SSLv3, **self._sslargs) addr = ["feedback.push.apple.com", 2196] From 0c8baf27635d74166d6c11864866affbf8cc6c19 Mon Sep 17 00:00:00 2001 From: Antonin Amand Date: Tue, 22 Nov 2011 17:15:54 +0100 Subject: [PATCH 2/2] remove unused variables to make pyflakes happy --- applepushnotification/service.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/applepushnotification/service.py b/applepushnotification/service.py index 0868807..20c5cc8 100644 --- a/applepushnotification/service.py +++ b/applepushnotification/service.py @@ -110,7 +110,7 @@ def _send_loop(self): self._check_send_connection() try: self._push_connection.send(str(msg)) - except Exception, e: + except Exception: self._send_queue.put(msg) self._push_connection.close() self._push_connection = None @@ -119,7 +119,7 @@ def _send_loop(self): if self._send_queue.qsize() < 1 and \ not self._send_queue_cleared.is_set(): self._send_queue_cleared.set() - except gevent.GreenletExit, e: + except gevent.GreenletExit: pass finally: self._send_greenlet = None @@ -133,7 +133,7 @@ def _error_loop(self): return data = struct.unpack("!bbI", msg) self._error_queue.put((data[1], data[2])) - except gevent.GreenletExit, e: + except gevent.GreenletExit: pass finally: self._push_connection.close() @@ -150,7 +150,7 @@ def _feedback_loop(self): return data = struct.unpack("!IH32s", msg) self._feedback_queue.put((data[0], data[2])) - except gevent.GreenletExit, e: + except gevent.GreenletExit: pass finally: self._feedback_connection.close()