Skip to content

Python 2.4 compatibility changes. #1

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
slmnhq wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Python 2.4 compatibility changes. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions rtjp_eventlet/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
from __future__ import absolute_import
import sys
import eventlet
#from eventlet import api, coros, event
import logging
from . import core
from . import errors
import core
import errors
#from .. import core
#logging.basicConfig()

Expand Down Expand Up @@ -153,19 +152,20 @@ def _send_frame(self, id, buffer, ev):
ev.send_exception(Exception("Not Connected"))
return
try:
self._send_lock.acquire()
self._sock.sendall(buffer)
self.logger.debug('SENT %s: %s', self, repr(buffer))
except Exception, e:
self.logger.exception('%s Error sending payload %s', self, repr(buffer))
try:
self._sock.shutdown()
self._sock.close()
except:
pass
ev.send_exception(*sys.exc_info())
else:
ev.send(id)
self._send_lock.acquire()
self._sock.sendall(buffer)
self.logger.debug('SENT %s: %s', self, repr(buffer))
except Exception, e:
self.logger.exception('%s Error sending payload %s', self, repr(buffer))
try:
self._sock.shutdown()
self._sock.close()
except:
pass
ev.send_exception(*sys.exc_info())
else:
ev.send(id)
finally:
self._send_lock.release()

Expand Down