diff options
| author | mrDoctorWho <mrdoctorwho@gmail.com> | 2014-01-15 22:04:43 +0400 |
|---|---|---|
| committer | mrDoctorWho <mrdoctorwho@gmail.com> | 2014-01-15 22:04:43 +0400 |
| commit | 3021239b02bfb473230a2c6da8bc51c0f60a9c0e (patch) | |
| tree | 7ce9d2ce72404c2e1352d906100b57b24e2d3a7a /library | |
| parent | fc84166a006edd62f5d0267bf5e4622816b9bfb5 (diff) | |
xmpppy fix
Diffstat (limited to 'library')
| -rw-r--r-- | library/xmpp/auth.py | 2 | ||||
| -rw-r--r-- | library/xmpp/debug.py | 4 | ||||
| -rw-r--r-- | library/xmpp/dispatcher.py | 4 | ||||
| -rw-r--r-- | library/xmpp/transports.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/library/xmpp/auth.py b/library/xmpp/auth.py index 7042d42..7032659 100644 --- a/library/xmpp/auth.py +++ b/library/xmpp/auth.py @@ -296,7 +296,7 @@ class Bind(PlugIn): if not feats.getTag("bind", namespace=NS_BIND): self.bound = "failure" self.DEBUG("Server does not requested binding.", "error") - return Nonr + return None if feats.getTag("session", namespace=NS_SESSION): self.session = 1 else: diff --git a/library/xmpp/debug.py b/library/xmpp/debug.py index ccccd02..d4c33ce 100644 --- a/library/xmpp/debug.py +++ b/library/xmpp/debug.py @@ -133,8 +133,8 @@ class Debug: if self.time_stamp == 2: output = "%s%s " % ( pre, - trftime("%b %d %H:%M:%S", - caltime(time.time())) + time.strftime("%b %d %H:%M:%S", + time.localtime(time.time())) ) elif self.time_stamp == 1: output = "%s %s" % ( diff --git a/library/xmpp/dispatcher.py b/library/xmpp/dispatcher.py index 5d020d0..58cb5ed 100644 --- a/library/xmpp/dispatcher.py +++ b/library/xmpp/dispatcher.py @@ -12,7 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -# $Id: dispatcher.py, v1.43 2013/10/21 alkorgun Exp $ +# $Id: dispatcher.py, v1.44 2014/01/15 alkorgun Exp $ """ Main xmpppy mechanism. Provides library with methods to assign different handlers @@ -153,7 +153,7 @@ class Dispatcher(PlugIn): e = self._pendingExceptions.pop() raise e[0], e[1], e[2] conn = self._owner.Connection - recv, send = select([conn._sock], [conn._sock], [], timeout)[:2] + recv, send = select([conn._sock], [conn._sock] if conn._send_queue else [], [], timeout)[:2] if send: while conn._send_queue: conn.send_now(conn._send_queue.pop(0)) diff --git a/library/xmpp/transports.py b/library/xmpp/transports.py index 2d93686..2dd247d 100644 --- a/library/xmpp/transports.py +++ b/library/xmpp/transports.py @@ -12,7 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -# $Id: transports.py, v1.36 2014/01/10 alkorgun Exp $ +# $Id: transports.py, v1.37 2014/01/15 alkorgun Exp $ """ This module contains the low-level implementations of xmpppy connect methods or |