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

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/stanza_session.py')
-rw-r--r--src/common/stanza_session.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index d334ac1e5..cb1d7fb7f 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -41,19 +41,19 @@ import os
XmlDsig = 'http://www.w3.org/2000/09/xmldsig#'
class StanzaSession(object):
- def __init__(self, conn, jid, thread_id, type):
+ def __init__(self, conn, jid, thread_id, type_):
self.conn = conn
self.jid = jid
- self.type = type
+ self.type = type_
if thread_id:
self.received_thread_id = True
self.thread_id = thread_id
else:
self.received_thread_id = False
- if type == 'normal':
+ if type_ == 'normal':
self.thread_id = None
else:
self.thread_id = self.generate_thread_id()
@@ -189,8 +189,8 @@ if gajim.HAVE_PYCRYPTO:
# handle_session_negotiation method.
class EncryptedStanzaSession(StanzaSession):
- def __init__(self, conn, jid, thread_id, type='chat'):
- StanzaSession.__init__(self, conn, jid, thread_id, type='chat')
+ def __init__(self, conn, jid, thread_id, type_='chat'):
+ StanzaSession.__init__(self, conn, jid, thread_id, type_='chat')
self.xes = {}
self.es = {}