david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code cleanup

Browse Source 
darcs-hash:20061009173709-86b55-949f17ec584767d3582e47330efe942e298f9feb.gz
This commit is contained in:
David Rousselie
2006-10-09 19:37:09 +02:00
parent cb016a5406
commit 56dbebe6c2
4 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/jcl/jabber/component.py
View File

@@ -122,7 +122,7 @@ class JCLComponent(Component):
Call Component main loop Call Component main loop
Clean up when shutting down JCLcomponent Clean up when shutting down JCLcomponent
""" """
self.spool_dir += "/" + str(self.jid) self.spool_dir += "/" + unicode(self.jid)
self.running = True self.running = True
self.connect() self.connect()
## TODO : workaround to make test_run pass on FeederComponent ## TODO : workaround to make test_run pass on FeederComponent
@@ -132,9 +132,10 @@ class JCLComponent(Component):
name = "TimerThread") name = "TimerThread")
timer_thread.start() timer_thread.start()
try: try:
while (self.running and self.stream
and not self.stream.eof and self.stream.socket is not None):
try: try:
while (self.running and self.stream \
and not self.stream.eof \
and self.stream.socket is not None):
self.stream.loop_iter(JCLComponent.timeout) self.stream.loop_iter(JCLComponent.timeout)
if self.queue.qsize(): if self.queue.qsize():
raise self.queue.get(0) raise self.queue.get(0)
@@ -170,7 +171,6 @@ class JCLComponent(Component):
# except: # except:
# pass # pass
self.disconnect() self.disconnect()
# TODO : terminate SQLObject
self.__logger.debug("Exitting normally") self.__logger.debug("Exitting normally")
# TODO : terminate SQLObject # TODO : terminate SQLObject
@@ -258,7 +258,7 @@ class JCLComponent(Component):
self.__logger.debug("Signal %i received, shutting down..." % (signum,)) self.__logger.debug("Signal %i received, shutting down..." % (signum,))
self.running = False self.running = False
def disco_get_info(self, node, input_query): def disco_get_info(self, node, info_query):
"""Discovery get info handler """Discovery get info handler
""" """
self.__logger.debug("DISCO_GET_INFO") self.__logger.debug("DISCO_GET_INFO")
@@ -269,7 +269,7 @@ class JCLComponent(Component):
else: else:
return self.disco_info return self.disco_info
def disco_get_items(self, node, input_query): def disco_get_items(self, node, info_query):
"""Discovery get nested nodes handler """Discovery get nested nodes handler
""" """
self.__logger.debug("DISCO_GET_ITEMS") self.__logger.debug("DISCO_GET_ITEMS")
@@ -289,28 +289,28 @@ class JCLComponent(Component):
self.db_disconnect() self.db_disconnect()
return disco_items return disco_items
def handle_get_version(self, input_query): def handle_get_version(self, info_query):
"""Get Version handler """Get Version handler
""" """
self.__logger.debug("GET_VERSION") self.__logger.debug("GET_VERSION")
input_query = input_query.make_result_response() info_query = info_query.make_result_response()
query = input_query.new_query("jabber:iq:version") query = info_query.new_query("jabber:iq:version")
query.newTextChild(query.ns(), "name", self.name) query.newTextChild(query.ns(), "name", self.name)
query.newTextChild(query.ns(), "version", self.version) query.newTextChild(query.ns(), "version", self.version)
self.stream.send(input_query) self.stream.send(info_query)
return 1 return 1
def handle_get_register(self, input_query): def handle_get_register(self, info_query):
"""Send back register form to user """Send back register form to user
""" """
self.__logger.debug("GET_REGISTER") self.__logger.debug("GET_REGISTER")
## TODO Lang ## TODO Lang
## lang_class = self.__lang.get_lang_class_from_node(input_query.get_node()) ## lang_class = self.__lang.get_lang_class_from_node(info_query.get_node())
lang_class = None lang_class = None
## base_from_jid = unicode(input_query.get_from().bare()) ## base_from_jid = unicode(info_query.get_from().bare())
to_jid = input_query.get_to() to_jid = info_query.get_to()
input_query = input_query.make_result_response() info_query = info_query.make_result_response()
query = input_query.new_query("jabber:iq:register") query = info_query.new_query("jabber:iq:register")
if to_jid and to_jid != self.jid: if to_jid and to_jid != self.jid:
self.db_connect() self.db_connect()
self.get_reg_form_init(lang_class, \ self.get_reg_form_init(lang_class, \
@@ -319,18 +319,18 @@ class JCLComponent(Component):
self.db_disconnect() self.db_disconnect()
else: else:
self.get_reg_form(lang_class).attach_xml(query) self.get_reg_form(lang_class).attach_xml(query)
self.stream.send(input_query) self.stream.send(info_query)
return 1 return 1
def handle_set_register(self, input_query): def handle_set_register(self, info_query):
"""Handle user registration response """Handle user registration response
""" """
self.__logger.debug("SET_REGISTER") self.__logger.debug("SET_REGISTER")
## lang_class = \ ## lang_class = \
## self.__lang.get_lang_class_from_node(input_query.get_node()) ## self.__lang.get_lang_class_from_node(info_query.get_node())
from_jid = input_query.get_from() from_jid = info_query.get_from()
## base_from_jid = unicode(from_jid.bare()) ## base_from_jid = unicode(from_jid.bare())
remove = input_query.xpath_eval("r:query/r:remove", \ remove = info_query.xpath_eval("r:query/r:remove", \
{"r" : "jabber:iq:register"}) {"r" : "jabber:iq:register"})
if remove: if remove:
# for name in self.__storage.keys((base_from_jid,)): # for name in self.__storage.keys((base_from_jid,)):
@@ -353,7 +353,7 @@ class JCLComponent(Component):
self.stream.send(presence) self.stream.send(presence)
return 1 return 1
query = input_query.get_query() query = info_query.get_query()
x_data = X() x_data = X()
x_data.from_xml(query.children) x_data.from_xml(query.children)
# TODO : get info from Xdata # TODO : get info from Xdata
@@ -397,7 +397,7 @@ class JCLComponent(Component):
"""Handle subscribed presence from user """Handle subscribed presence from user
""" """
self.__logger.debug("PRESENCE_SUBSCRIBED") self.__logger.debug("PRESENCE_SUBSCRIBED")
name = stanza.get_to().node ## name = stanza.get_to().node
## from_jid = stanza.get_from() ## from_jid = stanza.get_from()
## base_from_jid = unicode(from_jid.bare()) ## base_from_jid = unicode(from_jid.bare())
# TODO : send presence available to subscribed user # TODO : send presence available to subscribed user
@@ -407,7 +407,7 @@ class JCLComponent(Component):
"""Handle unsubscribe presence from user """Handle unsubscribe presence from user
""" """
self.__logger.debug("PRESENCE_UNSUBSCRIBE") self.__logger.debug("PRESENCE_UNSUBSCRIBE")
name = stanza.get_to().node ## name = stanza.get_to().node
from_jid = stanza.get_from() from_jid = stanza.get_from()
## base_from_jid = unicode(from_jid.bare()) ## base_from_jid = unicode(from_jid.bare())
# TODO : delete from account base # TODO : delete from account base

1
src/jcl/jabber/feeder.py
View File

@@ -29,7 +29,6 @@ __revision__ = "$Id: feeder.py,v 1.3 2005/09/18 20:24:07 dax Exp $"
import logging import logging
from jcl.jabber.component import JCLComponent from jcl.jabber.component import JCLComponent
from jcl.model.account import Account
class FeederComponent(JCLComponent): class FeederComponent(JCLComponent):
"""Implement a feeder sender behavior based on the """Implement a feeder sender behavior based on the

10
src/jcl/jabber/x.py
View File

@@ -93,7 +93,11 @@ class X(object):
self.x_type = None self.x_type = None
self.xmlns = None self.xmlns = None
def add_field(self, field_type = "fixed", label = None, var = None, value = ""): def add_field(self, \
field_type = "fixed", \
label = None, \
var = None, \
value = ""):
"""Add a Field to this Xdata form """Add a Field to this Xdata form
""" """
field = Field(field_type, label, var, value) field = Field(field_type, label, var, value)
@@ -102,10 +106,10 @@ class X(object):
self.fields_tab.append(field) self.fields_tab.append(field)
return field return field
def attach_xml(self, iq): def attach_xml(self, info_query):
"""Attach this Xdata form to iq node """Attach this Xdata form to iq node
""" """
node = iq.newChild(None, "x", None) node = info_query.newChild(None, "x", None)
_ns = node.newNs(self.xmlns, None) _ns = node.newNs(self.xmlns, None)
node.setNs(_ns) node.setNs(_ns)
if not self.title is None: if not self.title is None:

2
tests/jcl/jabber/test_feeder.py
View File

@@ -97,5 +97,5 @@ class Sender_TestCase(unittest.TestCase):
name = "test", \ name = "test", \
jid = "test@jcl.test.com") jid = "test@jcl.test.com")
sender.send(to_account = account, \ sender.send(to_account = account, \
message = "Hello World") data = "Hello World")
self.assertTrue(True) self.assertTrue(True)