Skip to content

do not force gevent monkey patching #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gwik wants to merge 2 commits into
base: master
Choose a base branch
from
Open

do not force gevent monkey patching #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccc4e31
use socket and ssl from gevent to avoid forcing monkey patch
gwik Nov 22, 2011
0c8baf2
remove unused variables to make pyflakes happy
gwik Nov 22, 2011
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
22 changes: 13 additions & 9 deletions applepushnotification/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -106,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
Expand All @@ -115,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
Expand All @@ -129,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()
Expand All @@ -146,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()
Expand Down