Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mrDoctorWho/vk4xmpp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrDoctorWho <mrdoctorwho@gmail.com>2014-01-15 22:04:43 +0400
committermrDoctorWho <mrdoctorwho@gmail.com>2014-01-15 22:04:43 +0400
commit3021239b02bfb473230a2c6da8bc51c0f60a9c0e (patch)
tree7ce9d2ce72404c2e1352d906100b57b24e2d3a7a /gateway.py
parentfc84166a006edd62f5d0267bf5e4622816b9bfb5 (diff)
xmpppy fix
Diffstat (limited to 'gateway.py')
-rw-r--r--gateway.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/gateway.py b/gateway.py
index 35a5bec..b5844a7 100644
--- a/gateway.py
+++ b/gateway.py
@@ -2,7 +2,7 @@
# coding: utf-8
# vk4xmpp gateway, v1.9
-# © simpleApps, 01.08.2013
+# © simpleApps, 2013 — 2014.
# Program published under MIT license.
import re, os, sys, time, signal, socket, logging, threading
@@ -43,7 +43,7 @@ WhiteList = []
jidToID = {}
unAllowedChars = [unichr(x) for x in xrange(32) if x not in (9, 10, 13)] + [unichr(57003)]
-TransportFeatures = [ xmpp.NS_DISCO_ITEMS,
+TransportFeatures = [xmpp.NS_DISCO_ITEMS,
xmpp.NS_DISCO_INFO,
xmpp.NS_RECEIPTS,
xmpp.NS_REGISTER,
@@ -54,11 +54,11 @@ TransportFeatures = [ xmpp.NS_DISCO_ITEMS,
xmpp.NS_VCARD,
xmpp.NS_DELAY,
xmpp.NS_PING,
- xmpp.NS_LAST ]
+ xmpp.NS_LAST]
-IDentifier = { "type": "vk",
+IDentifier = {"type": "vk",
"category": "gateway",
- "name": "VK4XMPP Transport" }
+ "name": "VK4XMPP Transport"}
Semaphore = threading.Semaphore()
@@ -114,7 +114,7 @@ loggerHandler.setFormatter(Formatter)
logger.addHandler(loggerHandler)
def gatewayRev():
- revNumber, rev = 138, 0
+ revNumber, rev = 141, 0
shell = os.popen("git describe --always && git log --pretty=format:''").readlines()
if shell:
revNumber, rev = len(shell), shell[0]
@@ -707,7 +707,6 @@ if __name__ == "__main__":
Component.iter(6)
except AttributeError:
disconnectHandler(False)
- break ## To be sure that it will restart.
except xmpp.StreamError:
crashLog("Component.iter")
except: