diff options
| author | alkorgun <alkorgun@gmail.com> | 2014-01-15 20:59:17 +0400 |
|---|---|---|
| committer | alkorgun <alkorgun@gmail.com> | 2014-01-15 20:59:17 +0400 |
| commit | 7eaeea214a6f8057d0a44428e58a5fa38ed1d2de (patch) | |
| tree | 9adcb682a9ec1a373ccd8bb751f89b98095e757e | |
| parent | cc42529b8865c33899ea41af39df3d43d9eb2b62 (diff) | |
errata
| -rw-r--r-- | xmpp/auth.py | 2 | ||||
| -rw-r--r-- | xmpp/debug.py | 4 | ||||
| -rw-r--r-- | xmpp/dispatcher.py | 2 | ||||
| -rw-r--r-- | xmpp/transports.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/xmpp/auth.py b/xmpp/auth.py index 7042d42..7032659 100644 --- a/xmpp/auth.py +++ b/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/xmpp/debug.py b/xmpp/debug.py index ccccd02..d4c33ce 100644 --- a/xmpp/debug.py +++ b/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/xmpp/dispatcher.py b/xmpp/dispatcher.py index 5d020d0..9a615df 100644 --- a/xmpp/dispatcher.py +++ b/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 diff --git a/xmpp/transports.py b/xmpp/transports.py index 2d93686..2dd247d 100644 --- a/xmpp/transports.py +++ b/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 |