github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-30 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
761 commits 6 branches 14 tags 3 MiB
Commit graph

639 commits

Author SHA1 Message Date
Lance Stout
75584d7ad7 Remap old method names in a better way. 
This should prevent some reference cycles that will cause garbage
collection issues.
 2011-02-14 13:49:43 -05:00
Lance Stout
e0f9025e7c More attempts at fixing garbage collection. 
Don't keep a reference to stanzas in Callback objects.
 2011-02-14 11:30:04 -05:00
Lance Stout
9004e8bbf2 Break references that can prevent garbage collection. 2011-02-14 11:13:41 -05:00
Lance Stout
8b5511c7ec Simplification when removing a deletable handler. 2011-02-13 16:40:04 -05:00
Lance Stout
34f6195ca5 Return the name of the registered callback. 
Instead of the actual callback object, return just the name of
the callback object created when using iq.send(callback=..).

This will help prevent memory leaks by not keeping an additional
reference to the object, but still allows for the callback to be
canceled by using self.remove_handler("handler_name").
 2011-02-13 16:30:57 -05:00
Lance Stout
70af52d74c Make one-off Callbacks ready for deletion after the prerun step. 
Waiting until the actual run step means that the handler is not
marked for deletion when checked in the __spawn_event() thread,
causing the callback to stay in the handler list.
 2011-02-13 16:28:06 -05:00
Lance Stout
ca2b4a188a Return the registered callback when using iq.send(callback=foo). 
Allows for a callback to be canceled by unregistering the
returned handler.
 2011-02-12 11:01:43 -05:00
Lance Stout
0d32638379 XMPPError exceptions can keep a stanza's contents. 
This allows exceptions to include the original
content of a stanza in the error response by including
the parameter clear=False when raising the exception.
 2011-02-11 15:20:26 -05:00
Lance Stout
c4b1212c44 Updated XEP-0199 plugin. 
Now has docs and uses the new plugin format.
 2011-02-11 00:30:45 -05:00
Nathan Fritz
3463bf46c6 added option to return false on ping error, added ping example 2011-02-10 13:45:35 -08:00
Lance Stout
13a01beb07 Fix same error for get_info default behaviour. 2011-02-09 09:12:44 -05:00
Lance Stout
145f577bde Fix get_items default behaviour. 2011-02-09 08:58:00 -05:00
Florent Le Coz
72ead3d598 Replace the print statement by a log.debug call 
This print syntax is deprecated in python3, so
the plugin was working only with python2
 2011-02-09 10:02:14 +08:00
Florent Le Coz
4b71fba64c Fix the xep_0009 import (no more relatives) 
Also, remove trailing spaces in all files
of this plugin
 2011-02-09 10:02:14 +08:00
Lance Stout
606c369173 Some more roster tweaks. 2011-02-08 19:15:50 -05:00
Stefan de Konink
1ed06bebcd This fixes the configuration stuff, because type is form not submit with setNodeConfiguration. 2011-02-07 23:55:46 +08:00
Lance Stout
aa1996eba6 Fixed failing tests from new XEP-0009 plugin 2011-02-07 10:18:15 -05:00
Nathan Fritz
683f717cf7 fixed merge 2011-02-05 04:54:52 -08:00
Lance Stout
3c871920b1 Make the roster backend settable. 2011-02-02 12:05:34 -05:00
Lance Stout
de6170a13d Merge branch 'develop' into roster 
Conflicts:
	sleekxmpp/basexmpp.py
 2011-02-02 09:13:22 -05:00
Lance Stout
5313338c3a Fixes for XEP-0202 2011-01-31 15:40:00 -05:00
Lance Stout
1a270dc05c First pass at re-worked stream features. 
Stream features now use stanza objects!

Features are given a ranking that expresses the dependency
relationships (since only one feature is negotiated at a time, the
dependency graph can be replaced by a line).

>>> xmpp.register_feature('my_feature', _my_handler,
>>>                       restart=True,   # Requires stream restart
>>>                       order=600)      # Ranking (out of ~ 10,000,
>>>                                       # lower #'s executed first)

SASL mechanisms may now be added or disabled as needed. Each mechanism
is given a priority value indicating the order in which the client
wishes for mechanisms to be tried. Higher priority numbers are executed
first.

>>> xmpp.register_sasl_mechanism('SASL-MECH', _mech_handler,
>>>                              priority=0)

Disabling a SASL mechanism:

>>> xmpp.remove_sasl_mechanism('ANONYMOUS')
 2011-01-28 00:49:37 -05:00
Lance Stout
bd9bf3f1c7 Update tostring methods. 
Will now always show top-level namespace, unless it is the same
as the stream's default namespace. Also added the XMPP stream
namespace to the namespace map as 'stream'.
 2011-01-27 18:05:05 -05:00
Lance Stout
cd800d636a Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop 2011-01-27 16:05:15 -05:00
Lance Stout
40642b2cd1 Make StreamError work properly. 
Now uses the correct namespaces and condition names.
 2011-01-27 16:02:57 -05:00
Lance Stout
35ef8f9090 Make stanza.plugins an OrderedDict. 
This allows you to determine the order in which substanzas
were added in the original XML.
 2011-01-27 16:01:35 -05:00
Lance Stout
38dc35840e Recognize stanzas that don't use the default namespace. 2011-01-27 15:59:50 -05:00
Florent Le Coz
b4004cd4d6 xep_0045: fix the 'to' value when configuring room 2011-01-27 09:34:32 +08:00
Lance Stout
0c8a8314b2 Cleanup for stanzabase. 
Use stanza.values instead of _get/set_stanza_values where used.

ElementBase stanzas can now use .tag

May use class method tag_name() for stanza classes.

ElementBase now has .clear() method.
 2011-01-26 11:27:41 -05:00
Lance Stout
4e757c2b56 Upgraded how subitem works. 
May now use register_stanza_plugin(Foo, Bar, iterable=True)
to add to the set of stanza classes used for iterable
substanzas. It is no longer necessary to manually specify
the contents of subitem if the new method is used.
 2011-01-26 10:04:36 -05:00
Stefan de Konink
c3be6ea0b2 My hunch is that these should also be updated. 2011-01-23 02:08:29 +08:00
Lance Stout
da332365d4 Make extending stanza objects nicer. 
A stanza object may add is_extension = True to its class definition
to provide a single new interface to a parent stanza.

For example:

import sleekxmpp
from sleekxmpp import Iq
from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin, ET

class Foo(ElementBase):
    """
    Test adding just an attribute to a parent stanza.

    Adding subelements works as expected.
    """
    is_extension = True
    interfaces = set(('foo',))
    plugin_attrib = 'foo'

    def setup(self, xml):
        # Don't include an XML element in the parent stanza
        # since we're adding just an attribute.
        # If adding a regular subelement, no need to do this.
        self.xml = ET.Element('')

    def set_foo(self, val):
        self.parent()._set_attr('foo', val)

    def get_foo(self):
        return self.parent()._get_attr('foo')

    def del_foo(self):
        self.parent()._del_attr('foo')

register_stanza_plugin(Iq, Foo)

i1 = Iq()
i2 = Iq(xml=ET.fromstring("<iq xmlns='jabber:client' foo='bar' />"))

>>> i1['foo'] = '3'
>>> i1
'3'
>>> i1
'<iq id="0" foo="3" />'
>>> i2
'<iq id="0" foo="bar" />'
>>> i2['foo']
'bar'
>>> del i2['foo']
>>> i2
'<iq id="0" />'
 2011-01-19 19:49:13 -05:00
Lance Stout
6f4c2f22f3 Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop 2011-01-19 17:50:05 -05:00
Lance Stout
493df57035 Fix thirdparty imports for Python3 2011-01-19 17:49:39 -05:00
Florent Le Coz
897a9ac333 Do not traceback when DNS resolution time out. 
Just log that the resolution timed out, and fall back
to the hostname from the JID in this case
 2011-01-20 06:34:08 +08:00
Lance Stout
acc2d071ac Fix disco add_item. 
If no JID is specified for the item, use xmpp.boundjid.full.
 2011-01-19 17:27:53 -05:00
Lance Stout
d3b1f8c476 Fix namespace for Nick stanza. 2011-01-19 16:47:18 -05:00
Lance Stout
f1db2fc156 Fix error in disco add_item. 
None values were not being treated properly.
 2011-01-19 12:08:28 -05:00
Lance Stout
2004ddd678 Add StreamError stanza and a stream_error event. 
Note that the stream may automatically attempt to
reconnect when a stream error is received.
 2011-01-16 13:22:52 -05:00
Lance Stout
cb85d4a529 Raise the event 'socket_error' when a socket error occurs. 
Will be most useful for debugging and responding to failed
connection attempts.
 2011-01-16 13:07:39 -05:00
Lance Stout
ead3af3135 Make it easier to import OrderedDict 2011-01-15 17:15:33 -05:00
Lance Stout
a2891d7608 Fix how disco plugin looks up info and items for clients. 2011-01-15 10:08:35 -05:00
Lance Stout
d7dea0c6cc Add a note for debug statement when running scheduled events. 
Fixes the intermittent DEBUG ((),) messages that give no
explanation.

Will now show as:
DEBUG Scheduled event: ((), )
 2011-01-14 12:07:25 -05:00
Lance Stout
65931bb384 Merge branch 'develop' into roster 2011-01-13 22:16:46 -05:00
Lance Stout
632827f213 Fix bug in JID class. Attribute .jid now works properly. 2011-01-13 10:21:20 -05:00
Lance Stout
b71550cec7 Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop 2011-01-13 10:20:34 -05:00
Dann Martens
b68e7bed40 Fixed typo. 2011-01-13 15:04:16 +01:00
Dann Martens
4be6482ff3 Fixed 'nil' bug in unmarshalling. 2011-01-13 13:42:01 +01:00
Dann Martens
0a3a7b5a70 Removed binding XML namespace experiments. 2011-01-13 11:37:58 +01:00
Dann Martens
3a12cdbd13 Introduced new XEP-0009 into develop. 2011-01-13 08:40:53 +01:00
Lance Stout
7d93d1824b Fix setup.py and old_0004.py typo bugs. 2011-01-12 12:22:48 -05:00
Lance Stout
ba0d699d83 Fix ordering error in Iq._set_stanza_values. 
If iq['query'] was set before a plugin that used the query
element was set, then the query element was duplicated.
 2011-01-12 08:55:33 -05:00
Lance Stout
a5d53b3349 Fix method call error. 2011-01-10 16:33:30 -05:00
Lance Stout
4487a90623 Add self.client_roster to make things simpler for clients. 2011-01-10 16:28:49 -05:00
Lance Stout
05da8cc3d1 Merge branch 'develop' into roster 2011-01-10 16:27:18 -05:00
Te-je Rodgers
fe3f8dde4b added plugin for xep-0249 2011-01-11 04:11:05 +08:00
Lance Stout
23e499998f Merge branch 'develop' into roster 2011-01-09 10:04:09 -05:00
Lance Stout
acdf9e2d22 Need to run post_init properly. 2011-01-09 10:03:32 -05:00
Lance Stout
2076d506b4 Update the XEP-0092 plugin to the new style. 2011-01-08 22:38:13 -05:00
Florent Le Coz
68ce47c905 Allow XEP 0092 to send os information 
Doesn't send these information by default, only if provided in the
config dict (as the 'os' key)
 2011-01-09 10:08:44 +08:00
Lance Stout
7c7fa0f008 Add support for XEP-0059 to XEP-0030 plugin. 2011-01-08 11:19:31 -05:00
Lance Stout
a8e3657487 Added new XEP-0059 plugin. 
Contributed by Erik Reuterborg Larsson (who).
 2011-01-08 10:58:47 -05:00
Lance Stout
13a2f719f4 Add reattempt to ClientXMPP.connect 2011-01-07 16:41:31 -05:00
Lance Stout
2908751020 Allow JID objects to be compared with strings. 
Two JIDs match if they have the same full JID value.
 2011-01-05 20:16:15 -05:00
Lance Stout
c156a4f723 Merge branch 'develop' into roster 2011-01-05 16:53:33 -05:00
Lance Stout
8b29431cde More clarification in docs for XEP-0030 plugin. 2011-01-04 19:39:10 -05:00
Lance Stout
4b145958fa Clarify docs for disco.get_info. 2011-01-04 18:38:21 -05:00
Lance Stout
e08b0054b2 Keep things lined up. 2010-12-29 15:01:50 -05:00
Andrzej Bieniek
596e135a03 Fixed typo in comment. 2010-12-28 21:32:28 +00:00
Lance Stout
e55e213c78 Fix some typos. 2010-12-28 16:17:08 -05:00
Lance Stout
8749f5e09b Make the new XEP-30 plugin retain older API signatures. 2010-12-28 15:43:00 -05:00
Lance Stout
b3353183f3 Added ordereddict implementation to thirdparty. 
See http://pypi.python.org/pypi/ordereddict and
http://code.activestate.com/recipes/576693/.
 2010-12-21 17:33:31 -05:00
Lance Stout
3657bf6636 Merge branch 'develop' into roster 2010-12-21 11:33:40 -05:00
Lance Stout
f97f6e5985 More documentation for XEP-0030 plugin. 2010-12-21 11:33:03 -05:00
Lance Stout
34c374a1e1 Make tests pass for catching exceptions. 
May now use sys.excepthook to catch exceptions
from threaded handlers.
 2010-12-17 13:11:03 -05:00
Lance Stout
506eccf84d Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop 2010-12-17 10:44:32 -05:00
Florent Le Coz
982bf3b2ec RootStanza raises unexpected exceptions 
We now raise the unexpected exceptions instead of sending
them on the network.
 - avoids flood (sending a traceback on a MUC, for example…) and
   maybe some security issues.
 - lets you handle the traceback (catch it to handle
   it properly, or with except_hook, etc)
 - an exception cannot be raised without you knowing
 2010-12-17 23:43:48 +08:00
Lance Stout
53a5026301 Almost done with xep-30; added more docs. 2010-12-16 23:52:17 -05:00
Lance Stout
0aee445e69 Use daemon threads instead of signals. 
Daemonized threads exit once the main program has quit,
and the only threads left running are all daemon threads.

Should fix hanging clients while not trampling over anyone
else's signal handlers.
 2010-12-16 22:21:50 -05:00
Lance Stout
adade2e5ec Merge branch 'develop' into roster 2010-12-16 22:03:56 -05:00
Lance Stout
0ea014fe41 Updated the list of plugins in sleekxmpp.plugins.__init__ 2010-12-16 18:29:56 -05:00
Lance Stout
62b190d0ff Fixed specifying 'from' values in XEP-0045 plugin. 
Methods now accept either an ifrom or mfrom parameter
to specify a 'from' value. Client connections should not
need to use these, but component connections must use them.
 2010-12-16 18:14:33 -05:00
Lance Stout
4b57b8131f Added support for using SSL CA certificates. 
Originally provided by Brian Beggs (macdiesel)
and Thom Nichols (tomstrummer).
 2010-12-16 17:30:08 -05:00
Lance Stout
988a90a176 Added MUC invite handler to XEP-0045 plugin. 
Originally contributed by damium/romeira, with some
modifications.

Also, converted tabs to spaces to prepare for future cleanup.
 2010-12-16 16:18:49 -05:00
Lance Stout
67775fb8bd Use boundjid in plugins instead of the deprecated accessors. 
Originally contributed by skinkie, with a few modifications.
 2010-12-16 15:38:00 -05:00
Lance Stout
e81683beee Some Python 3.1+ compatibility fixes. 
Originally contributed by filipegiusti.
 2010-12-16 15:29:17 -05:00
Lance Stout
d9c25ee65c Added more options to the make_iq_* methods. 
May include a to and from JID in make_iq_* calls.

May pass an existing iq stanza to most of them instead of generating
a new stanza.

make_iq now accepts a 'to' value, 'type' value, and 'query' value to
simplify things a bit more.
 2010-12-16 15:25:04 -05:00
Lance Stout
1ebc7f4d4b Implement a few more static node handlers. 2010-12-15 19:22:21 -05:00
Lance Stout
2c5b77ae2e And some more docs. 2010-12-15 18:57:45 -05:00
Lance Stout
d8aae88526 The documentation effort continues. 
Also, need to start working on a replacement for the XEP-30 page in the
wiki since the API has changed significantly.
 2010-12-15 17:58:15 -05:00
Lance Stout
2f4bdfee1b Update some docs. 2010-12-13 15:58:59 -05:00
Lance Stout
c16913c999 Merge branch 'develop' into roster 
Conflicts:
	sleekxmpp/basexmpp.py
 2010-12-13 14:36:53 -05:00
Lance Stout
f4451fe6b7 First pass at a new XEP-0030 plugin. 
Now with dynamic node handling goodness.

Some things are not quite working yet, in particular:
    set_items
    set_info
    set_identities
    set_features

And still need more unit tests to round things out.
 2010-12-09 18:57:27 -05:00
Lance Stout
f474d378ef Add support for using xml:lang values. 
Support is only for adding literal XML content
to stanzas. Full support for things like multiple
message bodies with different xml:lang values is
still in the works.
 2010-12-07 23:07:40 -05:00
Lance Stout
defc252c7d Fix several errors in SleekTest. 
Notably, not sending an expected stanza will not silently pass.
 2010-12-07 23:04:37 -05:00
Lance Stout
19bd1e0485 Actually make the Iq callbacks work for real. 2010-12-07 23:04:04 -05:00
Lance Stout
5f2fc67c40 Added option for iq.send to accept a callhandler. 
The callback will be a stream level handler, and will not
execute in its own thread. If you must have a thread, have the
callback function raise a custom event, which can be processed
by another event handler, which may run in an individual thread,
like so:

def handle_reply(self, iq):
    self.event('custom_event', iq)

def do_long_operation_in_thread(self, iq):
    ...

self.add_event_handler('custom_event', self.do_long_operation_in_thread)

...take out already prepared iq stanza...
iq.send(callback=self.handle_reply)
 2010-12-07 17:19:39 -05:00
Lance Stout
8ead33fc3b Fixed typo 2010-11-18 16:23:18 -05:00
Lance Stout
ab25301953 Adding stream tests for XEP-0030. 
Fixed some errors when responding to disco requests.
 2010-11-18 15:50:45 -05:00
Lance Stout
291b118aca XEP-0030 bug fixes. 2010-11-18 11:22:11 -05:00
Lance Stout
db7fb10e95 Add rename_node method to disco plugin. 2010-11-18 01:15:34 -05:00
Lance Stout
9214dc6610 Add rename_node method to disco plugin. 2010-11-18 01:12:11 -05:00
Lance Stout
58b95e4ae4 Merge branch 'develop' of github.com:fritzy/SleekXMPP into roster 2010-11-18 00:44:51 -05:00
Lance Stout
60d3afe6b6 Added __repr__ for JIDs. 2010-11-18 00:03:39 -05:00
Lance Stout
e648f08bad Fix stream test errors. 2010-11-17 16:08:14 -05:00
Lance Stout
7ba6d5e02d Fix Node set to None error. 2010-11-17 16:01:27 -05:00
Lance Stout
ea48bb5ac5 Fixed some live stream test errors. 
Added test demonstrating using multiple stream clients
in a single test.
 2010-11-17 15:45:16 -05:00
Lance Stout
6ee8a2980c Fix RESPONSE_TIMEOUT dependency loops. 2010-11-17 15:13:09 -05:00
Lance Stout
debf909359 Merge branch 'develop' into roster 2010-11-17 14:33:09 -05:00
Lance Stout
b8114b25ed Make live stream tests work better. 
SleekTest can now use matchers when checking stanzas, using
the method parameter for self.check(), self.recv(), and self.send():
    method='exact'      - Same behavior as before
           'xpath'      - Use xpath matcher
           'id'         - Use ID matcher
           'mask'       - Use XML mask matcher
           'stanzapath' - Use StanzaPath matcher

recv_feature and send_feature only accept 'exact' and 'mask' for now.
 2010-11-17 13:43:15 -05:00
Lance Stout
0d4d84b2fa Cleaned basexmpp.py 2010-11-17 10:13:45 -05:00
Lance Stout
d2aca3e7e0 Remove extraneous files. 2010-11-17 02:04:36 -05:00
Lance Stout
26aca2b789 Merge branch 'roster' of github.com:fritzy/SleekXMPP into roster 
Conflicts:
	sleekxmpp/basexmpp.py
	sleekxmpp/roster.py
	sleekxmpp/test/sleektest.py
	tests/test_stream_presence.py
	tests/test_stream_roster.py
 2010-11-17 02:01:12 -05:00
Lance Stout
5424ede413 More cleanup. 2010-11-17 01:54:30 -05:00
Lance Stout
20112f8e16 More docs! 2010-11-17 01:49:51 -05:00
Lance Stout
4260a754e5 Added more docs. 2010-11-17 01:49:51 -05:00
Lance Stout
ce30f72738 Added docs for main Roster class. 2010-11-17 01:49:51 -05:00
Lance Stout
69d430dd75 Cleaned up names. 2010-11-17 01:49:51 -05:00
Lance Stout
673545c7e4 First pass at integrating the new roster manager. 2010-11-17 01:49:19 -05:00
Nathan Fritz
45991e47ee scheduler no longer waits for the next event before exiting 2010-11-16 17:58:20 -08:00
Nathan Fritz
b8f40eb843 xep_0199 ping now uses scheduler instead of dedicated thread 2010-11-16 17:43:05 -08:00
Florent Le Coz
b73a859031 Add a groupchat_subject event 
Use this event to get notified of the subject changes (or to get the
subject of the room when joining one)
 2010-11-10 05:54:22 +08:00
Florent Le Coz
9dbf246f0b Doesn't fail if host has NO SRV record 
Just catch an other exception type coming from the dns resolver that
could be raised with hosts like "anon.example.com" which just don't have
any SRV record.
 2010-11-09 01:53:41 +08:00
Lance Stout
4fb77ac878 Logging no longer uses root logger. 
Each module should now log into its own logger.
 2010-11-06 01:28:59 -04:00
Lance Stout
d0c506f930 Simplified SleekTest. 
* check_stanza does not require stanza_class parameter. Introspection!
* check_message, check_iq, and check_presence removed -- use check
  instead.
* stream_send_stanza, stream_send_message, stream_send_iq, and
  stream_send_presence removed -- use send instead.
* Use recv instead of recv_message, recv_presence, etc.
* check_jid instead of check_JID
* stream_start may accept multi=True to return a new SleekTest instance
  for testing multiple streams at once.
 2010-11-05 21:18:48 -04:00
Lance Stout
7351fe1a02 Fix bug introduced while fixing another bug. 
Threaded event handlers now handle exceptions again.
 2010-11-04 14:35:35 -04:00
Nathan Fritz
38c2f51f83 fixed indent errors 2010-11-04 11:39:41 -07:00
Lance Stout
1bf34caa5b Fixes for XEP-0199 plugin. 
Quick fixes to get the XEP-0199 plugin working until a proper cleanup is
done.
 2010-11-03 14:04:18 -04:00
Lance Stout
5769935720 Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop 2010-11-03 12:39:44 -04:00
Lance Stout
0214db7545 Catch exceptions for direct events. 
Events triggered with direct=True will have exceptions caught.

Note that all event handlers in a direct event will currently run
in the same thread.
 2010-11-03 12:38:13 -04:00
Lance Stout
ffc6f031d9 Updated namespaced used in the XEP-0199 plugin. 2010-11-03 12:37:26 -04:00
Lance Stout
9e248bb852 Fix bug in XEP-0030 plugin. 
xep_0030 still referenced event_handlers. Added the method event_handled
which will return the number of registered handlers for an event to
resolve the issue.
 2010-10-31 18:27:52 -04:00
Lance Stout
973890e2c9 Added try/except for setting signal handlers. 
Setting signal handlers from inside a thread is not supported in Python,
but some applications need to run Sleek from a child thread.

SleekXMPP applications that run inside a child thread will NOT be able
to detect SIGHUP or SIGTERM events. Those must be caught and managed by
the main program.
 2010-10-28 10:42:23 -04:00
Lance Stout
9c08e56ed0 SSL and signal fixes. 
Made setting the SIG* handlers conditional on if the signal defined for
the OS.

Added the attribute ssl_version to XMLStream to set the version of SSL
used during connection. It defaults to ssl.PROTOCOL_TLSv1, but OpenFire
tends to require ssl.PROTOCOL_SSLv23.
 2010-10-27 19:27:47 -04:00
Lance Stout
4f69a03bb1 More cleanup. 2010-10-27 15:02:21 -04:00
Lance Stout
c2c18acd6a More docs! 2010-10-27 13:36:23 -04:00
Lance Stout
12ead36f96 Added more docs. 2010-10-27 10:51:58 -04:00
Lance Stout
41a642e06c Added docs for main Roster class. 2010-10-27 09:27:00 -04:00
Lance Stout
c6ed4b8a1d Cleaned up names. 2010-10-27 08:09:50 -04:00
Lance Stout
65aa6573df First pass at integrating the new roster manager. 2010-10-26 23:47:17 -04:00
Lance Stout
b888610525 Added XEP-202 Entity Time plugin. 
Contributed by Cesar Alcalde.
 2010-10-25 21:26:25 -04:00
Lance Stout
6d68706326 Added XEP-0012 Last Activity plugin. 
Contributed by Cesar Alcalde.
 2010-10-25 20:37:02 -04:00
Lance Stout
5bdcd9ef9d Made exceptions work. 
Raising an XMPPError exception from an event handler now works, even if
from a threaded handler.

Added stream tests to verify.

We should start using XMPPError, it really makes things simple!
 2010-10-25 15:09:56 -04:00
Lance Stout
ac330b5c6c Fixed bug in presence subscription handling. 
Subscription requests and responses were not setting the correct 'to'
attribute.
 2010-10-25 12:52:32 -04:00
Lance Stout
185d7cf28e More JID unit tests. 
sleekxmpp.xmlstream.jid now has 100% coverage!
 2010-10-24 19:06:54 -04:00
Lance Stout
8aa3d0c047 Fixed got_offline triggering bug. 2010-10-24 18:56:50 -04:00
Lance Stout
9e3d506651 Fixed resource bug in JIDs. 
JIDs without resources will return '' instead of the bare JID.

Cleaned up JID tests, and added check_JID to SleekTest.
 2010-10-24 18:22:41 -04:00
Lance Stout
2f3ff37a24 Make SleekTest streams register all plugins. 
Makes test coverage nicer.
 2010-10-24 17:35:11 -04:00
Lance Stout
1f09d60a52 ComponentXMPP saves all of its config data now. 
ComponentXMPP was ignoring plugin_config and plugin_whitelist
parameters, making register_plugins() fail.
 2010-10-24 17:33:11 -04:00
Lance Stout
d9aff3d36f Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop 2010-10-24 12:11:34 -04:00
Lance Stout
04cc48775d Fixed error in client roster handling. 
The roster result iq was not being passed to the roster update
handler.
 2010-10-24 12:08:59 -04:00
Nathan Fritz
27ebb6e8f6 presence no longer replies when exception is caught and tweaks to presence events 2010-10-21 16:59:15 -07:00
Lance Stout
8f55704928 Fixed mixed text and elements bug in tostring. 
XML of the form <a>foo <b>bar</b> baz</a> was outputted as
<a>foo <b>bar</b> baz baz</a>.

Includes unit test.
 2010-10-21 16:21:28 -04:00
Nathan Fritz
d88999691c misc small tweaks 2010-10-20 20:14:26 -07:00
Nathan Fritz
c4699b92e6 pep8 fixes on core library 2010-10-20 19:43:53 -07:00
Nathan Fritz
ce69213a1e when disconnected, reset the roster 2010-10-20 19:33:40 -07:00
Nathan Fritz
77eab6544f reconnect if session isn't established within 15 seconds 2010-10-20 19:18:27 -07:00
Nathan Fritz
11264fe0a8 capture SIGHUP and SIGTERM (windows) and disconnect; also testall no longer loads string26 with python3 2010-10-20 17:30:12 -07:00
Nathan Fritz
11a6e6d2e0 fixed logic error in state machine 2010-10-20 16:57:47 -07:00
Nathan Fritz
6e34b2cfdd fixed disconnect 2010-10-20 16:32:50 -07:00
Lance Stout
e18354ae0e Continue converting to underscored names. 2010-10-18 09:06:54 -04:00
Lance Stout
4375ac7d8b Underscore names by default. 
Stanza objects now accept the use of underscored names.

The CamelCase versions are still available for backwards compatibility,
but are discouraged.

The property stanza.values now maps to the old getStanzaValues and
setStanzaValues, in addition to _set_stanza_values and
_get_stanza_values.
 2010-10-17 22:04:42 -04:00
Lance Stout
faec86b3be Import plugins from string referenced modules. 2010-10-17 15:47:24 -04:00
Lance Stout
505a63da3a Cleanup, restore PEP8. 2010-10-16 21:15:31 -04:00
Florent Le Coz
93fbcad277 Fix the error on non-number priority 
The priority is not a number: we consider it 0 as a default
 2010-10-17 09:01:53 +08:00
Florent Le Coz
3625573c7d Default history is 0 2010-10-17 09:01:53 +08:00
Florent Le Coz
d9e7f555e6 MUC leave message and MUC history request 
It is now possible to ask for "any number of history stanzas" when
joining a muc (with history=None).
Also we use "maxchars" when asking NO history ("0") since it's a MUST in
the XEP.
And you can specify a message when leaving a MUC.
 2010-10-17 09:01:52 +08:00
Florent Le Coz
2755d732a4 Remove deprecation warnings 
Remove all the deprecation warnings by using only boundjid.
And also fix a indentation error.
 2010-10-17 08:55:30 +08:00
Florent Le Coz
2d18d905a5 Anonymous authentication 
Implemented ANONYMOUS authentication on the ClientXMPP class.
To use it, you just need to provide a domain (e.g 'anon.example.com')
with an optional resource (e.g 'anon.example.com/resource') as the JID,
with no password. The JID class has been improved to accept
domains as fulljid.

You can test this with echo_client.py
python echo_client.py -j anon.louiz.org/  # anonymous with a resource
                                          # defined by the server
python echo_client.py -j anon.louiz.org/resource  # anonymous with given
                                                  # resource

The "normal" authentication method still works exactly like before.
 2010-10-17 08:55:30 +08:00
Nathan Fritz
8b5c1010de fixed JID to accept server/domain/host as the same 2010-10-14 16:34:16 -07:00
Nathan Fritz
95ad8a1878 fixed stream test not disconnecting cleanly 2010-10-14 16:27:44 -07:00
Nathan Fritz
aeb7999e6a don't import statemachine 2010-10-14 16:08:50 -07:00
Nathan Fritz
8468332381 fixed stream tests 2010-10-14 15:53:10 -07:00
Nathan Fritz
dc001bb201 deprecated jid, fulljid, server, user, resource properties and added boundjid JID 2010-10-14 15:50:54 -07:00
Nathan Fritz
0d0b963fe5 fixed socket name collision in xmlstream.py and fixed python 3.x compatibility 2010-10-14 10:58:07 -07:00
Nathan Fritz
a41a4369c6 disconnect cleanly 2010-10-13 18:21:05 -07:00
Nathan Fritz
7ad7a29a8f new state machine in place 2010-10-13 18:15:21 -07:00
Lance Stout
a8b948cd33 SleekTest may now run against a live stream. 
Moved SleekTest to sleekxmpp.test package.
Corrected error in XML compare method.
Added TestLiveSocket to run stream tests against live streams.
Modified XMLStream to work with TestLiveSocket.
 2010-10-07 19:43:51 -04:00
Lance Stout
e02ffe8547 Corrected test errors. 
There was a bug in the XML compare method.
 2010-10-07 19:42:28 -04:00
Lance Stout
42bfca1c87 Removed debug log statement. 2010-10-07 19:41:33 -04:00
Lance Stout
0fffbb8200 Unit test reorganization. 
Moved SleekTest to sleekxmpp.test.

Organized test suites by their focus.
- Suites focused on testing stanza objects are named test_stanza_X.py
- Suites focused on testing stream behavior are name test_stream_X.py
 2010-10-07 10:58:13 -04:00
Lance Stout
21c32c6e1c Moved the pubsub tester to conn_tests. 2010-10-07 10:28:38 -04:00
Lance Stout
78141fe5f3 Fixed dealing with deleting handlers. 
The call to .index() may raise a ValueError if the item is not in the
list. So both the .index() and .pop() calls should be in the try block.
 2010-10-07 09:17:28 -04:00
Lance Stout
799645f13f Updated method names. 
Using underscored names where possible.
 2010-10-06 18:45:11 -04:00
Lance Stout
c294c1a85c More PEP8 compliance cleanups. 
Cleaned up the atom entry stanza.
 2010-10-06 15:12:39 -04:00
Lance Stout
cbe76c8a70 Cleaned up the Scheduler. 2010-10-06 15:03:21 -04:00
Lance Stout
77b8f0f4bb Fixed whitespace issue. 2010-10-06 14:31:33 -04:00
Lance Stout
ed366b338d Moved ClientXMPP to clientxmpp.py. 
Cleaned up the __init__.py files.
 2010-10-06 14:20:32 -04:00
Lance Stout
9e2cada19e Missed a few docstrings. 2010-10-06 14:09:14 -04:00
Lance Stout
d0ccbf6b7a Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop 2010-10-06 14:06:02 -04:00
Lance Stout
e1866ab328 Made first pass at cleaning up ClientXMPP. 
Added self.stream_ns to BaseXMPP.
Moved connected/disconnected events and logging to XMLStream.
 2010-10-06 14:03:19 -04:00
fritzy
3ffa09ba7c deal with deleting handlers that are no longer there 2010-10-06 17:58:03 +00:00
Lance Stout
a7410f2146 Made a first pass at cleaning up ComponentXMPP. 2010-10-06 10:47:05 -04:00
Lance Stout
178608f4c0 XMLStream cleanup. 
Added RestartStream as a top level item in sleekxmpp.xmlstream.

Fixed trailing whitespace.
 2010-10-06 10:45:36 -04:00
Lance Stout
9f0baec7b2 Made first pass at cleaning BaseXMPP. 
Have not intregrated the new JID class yet.
 2010-10-01 23:56:46 -04:00
Lance Stout
433c147627 Fixed typo in XEP-0033 plugin. 2010-10-01 21:25:27 -04:00
Lance Stout
9a34c9a9a1 Modified event handling to use the event queue. 
Updated tests to match. (Needed to add a small wait to make sure
the event got through the queue before checking the results.)
 2010-10-01 13:49:58 -04:00
Lance Stout
2662131124 Fixed tostring bug when using mapped namespaces. 2010-10-01 12:41:35 -04:00
Lance Stout
bb219595a7 Moved event functions to XMLStream. 
This is just a transplant, modifying event to use the main
event queue has not been implemented yet.
 2010-10-01 12:24:49 -04:00
Lance Stout
fcdd57ce54 Moved add_handler, send, and sendXML to XMLStream. 2010-10-01 11:15:51 -04:00
Lance Stout
5522443e0e Moved getNewId and getId to XMLStream. 
This prepares the way for moving add_handler to XMLStream.

Since stanzas, matchers, and handlers in any XML stream will typically
use unique IDs, XMLStream is a good place for these methods.
 2010-10-01 10:46:37 -04:00
Lance Stout
55cfe69fef Cleaned up trailing whitespace. 2010-10-01 10:09:10 -04:00
Lance Stout
6de87a1cbf Fixed line lengths and trailing whitespace. 
The pep8 command is now pleased.
 2010-09-30 13:06:16 -04:00
Lance Stout
7c10ff16fb Made a first pass at cleaning up XMLStream. 
A few extra methods are mentioned in the docs, but those have not
been moved to XMLStream from BaseXMPP yet.
 2010-09-30 12:56:22 -04:00
Nathan Fritz
c258d2f19d added room events for specific rooms, added buildForm to xep_0004 plugin 2010-09-23 00:51:23 +00:00
fritzy
d576e32f7a Merge branch 'develop' of git@github.com:fritzy/SleekXMPP into develop 2010-09-02 20:01:28 +00:00
Lance Stout
9bef4b4d4d Move the examples to a top-level examples directory. 2010-09-01 14:47:42 -04:00
Lance Stout
5c3066ba30 Updated all of the matcher classes in sleekxmpp.xmlstream.matcher. 
Matchers are now PEP8 compliant and have documentation.
 2010-09-01 14:28:43 -04:00
Lance Stout
576eefb097 Fixed line spacing in filesocket.py to please pep8. 2010-09-01 14:25:30 -04:00
Lance Stout
aebd115ba2 A few cleanups to make things simpler. 2010-09-01 14:20:34 -04:00
fritzy
6dfea828be xep-0004 merge should deal with dictionaries 2010-08-31 14:44:24 +00:00
Lance Stout
3749c1b88c Fixed ElementBase.match to match using sub_interface elements. 2010-08-30 17:12:10 -04:00
Lance Stout
998741b87e Fixed typos in ElementBase._fix_ns 2010-08-30 15:25:59 -04:00
Lance Stout
9c62bce206 Updated ElementBase.match to respect namespaces with slashes. 
Required adding option to _fix_ns to not propagate namespaces to child elements.
 2010-08-30 14:55:30 -04:00
Lance Stout
f5ae27da4f Fix some documentation typos. 2010-08-27 18:16:09 -04:00
Lance Stout
89fb15e896 Updated the suite of handler classes with documentation. 
Updated XMLStream to return True or False from removeHandler to indicate if the handler
existed and was removed.

Waiter handlers now unregister themselves after timing out.
 2010-08-27 16:42:26 -04:00
Lance Stout
bb6f4af8e2 Added unit tests for StanzaBase. 2010-08-27 12:22:35 -04:00
Lance Stout
6677df39f2 Updated xmlstream.filesocket. 2010-08-27 11:29:48 -04:00
Lance Stout
a2c515bc97 Updated StanzaBase with documentation. 2010-08-27 11:07:20 -04:00
Lance Stout
ca6ce26b0d Added comments to _fix_ns to clarify the cleaning procedure. 2010-08-26 18:40:58 -04:00
Lance Stout
00d7952001 Fixed ElementBase._fix_ns and related methods to respect namespaces which contain forward slashes. 2010-08-26 18:18:00 -04:00
Lance Stout
56766508b3 Fixed indentation in StanzaBase. 2010-08-26 14:19:36 -04:00
Lance Stout
5c59f5baca Clarify ElementBase documentation. 2010-08-26 14:07:09 -04:00
Lance Stout
e16b37d2be Fixed line lengths in ElementBase to comply with PEP8. 2010-08-26 13:55:23 -04:00
Lance Stout
d68bc2ba07 Finished the update of ElementBase with docs and unit tests. 
Corrected bugs in equality comparisons between stanzas.
 2010-08-26 13:49:36 -04:00
Lance Stout
10298a6eab Updated the remaining ElementBase methods. 
Remaining ElementBase todos:
    Write the class documentation for ElementBase.
    Write unit tests for the __magic__ methods.
 2010-08-26 10:08:22 -04:00
Lance Stout
a3580dcef9 Fixed ElementBase.match to respect namespaces. 2010-08-25 14:54:09 -04:00
Lance Stout
1eaa9cb28c Updated ElementBase.match and added unit tests. 2010-08-25 14:40:16 -04:00
Lance Stout
5d458bf6c2 Updated ElementBase._delSub and added unit tests. 
_delSub can now accept a path and will optionally remove any empty parent elements after deleting the target elements.
 2010-08-25 10:52:07 -04:00
Lance Stout
2fa58a74ab Fixed indenting issue. 2010-08-24 09:44:09 -04:00
Lance Stout
c8f406d1b3 Updated ElementBase._setSubText and added unit tests. 
_setSubText can now handle elements specified by an XPath expression, and
will build up the element tree as needed, reusing an existing elements in
the path.
 2010-08-24 09:37:42 -04:00
Lance Stout
203986dd7c Updated ElementBase._getSubText and added unit tests. 
Also added ElementBase._fix_ns() to apply the stanza namespace to elements that don't have a namespace.
 2010-08-24 08:55:37 -04:00
fritzy
f4ecf0bac4 fixed a but in stanza_pubsub 2010-08-22 06:08:48 +00:00
fritzy
345656926e added form compatibility with old api, stanzas now bool() to True on 2.x, jid attributes will return '' if not set 2010-08-21 22:48:43 +00:00
Nathan Fritz
c05ddcb7f5 Merge branch 'develop' of git@github.com:fritzy/SleekXMPP into develop 2010-08-19 19:54:09 -07:00
Nathan Fritz
eb9e72fe3e added some xep-0004 compatibility changes 2010-08-19 19:53:56 -07:00
Lance Stout
8a0616b3e0 Updated ElementBase methods _getAttr, _setAttr, and _delAttr with docs and tests. 2010-08-19 20:41:26 -04:00
Lance Stout
b71cfe0492 Small cleanup in ElementBase.__setitem__ 2010-08-19 19:14:18 -04:00
Lance Stout
fac3bca1f6 Updated ElementBase.__delitem__ and added unit tests. 2010-08-19 19:11:12 -04:00
Nathan Fritz
d150b35464 fixed todo merge 2010-08-19 16:09:47 -07:00
Nathan Fritz
21b7109c06 fixed jobs 2010-08-19 16:09:00 -07:00
Lance Stout
e4240dd593 Updated ElementBase.__setitem__ and added unit tests. 2010-08-19 14:21:58 -04:00
Lance Stout
2f6f4fc16d Updated ElementBase.__getitem__ with docs and unit tests. 2010-08-13 21:33:11 -04:00
Lance Stout
fe49b8c377 Updated getStanzaValues and setStanzaValues with docs and unit tests. 2010-08-13 20:05:24 -04:00
Lance Stout
b580a3138d Updated ElementBase.enable and ElementBase.initPlugin 2010-08-13 12:51:07 -04:00
Lance Stout
c20fab0f6c Updated ElementBase.setup, and added unit tests. 2010-08-13 12:24:47 -04:00
Lance Stout
415520200e Updated ElementBase.__init__ 2010-08-13 10:26:33 -04:00
Lance Stout
747001d33c Adjust first level indenting in ElementBase to prepare for cleanup. 2010-08-13 10:15:52 -04:00
Lance Stout
b0fb205c16 Updated registerStanzaPlugin and the XML test type. 2010-08-13 10:12:51 -04:00
Lance Stout
4b52007e8c Cleaned stanzabase imports. 2010-08-12 23:24:09 -04:00