# HG changeset patch # User Goffi # Date 1428938958 -7200 # Node ID 2f87fa282dfddd2fb1142003c7991b97e1d05d24 # Parent a87c155d0fd5d54c0a4f349d0c5664c1e0cd4052 updated old docstring (privilege is actually a new (2015) module not derivated from idavoll) diff -r a87c155d0fd5 -r 2f87fa282dfd sat_pubsub/privilege.py --- a/sat_pubsub/privilege.py Tue Mar 31 17:31:56 2015 +0200 +++ b/sat_pubsub/privilege.py Mon Apr 13 17:29:18 2015 +0200 @@ -2,8 +2,7 @@ #-*- coding: utf-8 -*- # """ -Copyright (c) 2003-2011 Ralph Meijer -Copyright (c) 2012, 2013, 2014, 2015 Jérôme Poisson +Copyright (c) 2015 Jérôme Poisson This program is free software: you can redistribute it and/or modify @@ -18,45 +17,10 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --- - -This program is based on Idavoll (http://idavoll.ik.nu/), -originaly written by Ralph Meijer (http://ralphm.net/blog/) -It is sublicensed under AGPL v3 (or any later version) as allowed by the original -license. - --- - -Here is a copy of the original license: - -Copyright (c) 2003-2011 Ralph Meijer -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +--- -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -""" - -""" -Remote roster client. - -This module access roster throught a hacked version of -remote roster management http://jkaluza.fedorapeople.org/remote-roster.html +This module implements XEP-0356 (Privileged Entity) to manage rosters, messages and presences """ from wokkel import xmppim @@ -153,5 +117,3 @@ d = iq.send() d.addCallback(processRoster) return d - -