From 935ee4d14e80899fa45bb3d9296e123f642cc413 Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Fri, 26 Mar 2010 14:32:16 -0700 Subject: changed license to MIT --- LICENSE | 19 +++++++++++++++++++ setup.py | 4 ++-- sleekxmpp/__init__.py | 16 ++-------------- sleekxmpp/basexmpp.py | 16 ++-------------- sleekxmpp/componentxmpp.py | 16 ++-------------- sleekxmpp/exceptions.py | 8 ++++++++ sleekxmpp/stanza/__init__.py | 7 +++++++ sleekxmpp/stanza/error.py | 7 +++++++ sleekxmpp/stanza/htmlim.py | 7 +++++++ sleekxmpp/stanza/iq.py | 7 +++++++ sleekxmpp/stanza/message.py | 7 +++++++ sleekxmpp/stanza/nick.py | 7 +++++++ sleekxmpp/stanza/presence.py | 7 +++++++ sleekxmpp/stanza/rootstanza.py | 7 +++++++ sleekxmpp/stanza/roster.py | 7 +++++++ sleekxmpp/xmlstream/filesocket.py | 7 +++++++ sleekxmpp/xmlstream/handler/base.py | 7 +++++++ sleekxmpp/xmlstream/handler/callback.py | 7 +++++++ sleekxmpp/xmlstream/handler/waiter.py | 7 +++++++ sleekxmpp/xmlstream/handler/xmlcallback.py | 7 +++++++ sleekxmpp/xmlstream/handler/xmlwaiter.py | 7 +++++++ sleekxmpp/xmlstream/matcher/base.py | 6 ++++++ sleekxmpp/xmlstream/matcher/id.py | 7 +++++++ sleekxmpp/xmlstream/matcher/many.py | 7 +++++++ sleekxmpp/xmlstream/matcher/stanzapath.py | 7 +++++++ sleekxmpp/xmlstream/matcher/xmlmask.py | 7 +++++++ sleekxmpp/xmlstream/matcher/xpath.py | 7 +++++++ sleekxmpp/xmlstream/stanzabase.py | 7 +++++++ sleekxmpp/xmlstream/statemachine.py | 7 +++++++ sleekxmpp/xmlstream/xmlstream.py | 8 ++++++++ 30 files changed, 203 insertions(+), 44 deletions(-) diff --git a/LICENSE b/LICENSE index e69de29b..59c501bd 100644 --- a/LICENSE +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2010 ICRL + +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. diff --git a/setup.py b/setup.py index 163cb8c6..280ec3c0 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc). """ CLASSIFIERS = [ 'Intended Audience :: Developers', - 'License :: OSI Approved :: GPL v2.0', + 'License :: OSI Approved :: MIT', 'Programming Language :: Python', 'Topic :: Software Development :: Libraries :: Python Modules', ] @@ -57,7 +57,7 @@ setup( author = 'Nathanael Fritz', author_email = 'fritzy [at] netflint.net', url = 'http://code.google.com/p/sleekxmpp', - license = 'GPLv2', + license = 'MIT', platforms = [ 'any' ], packages = packages, requires = [ 'tlslite', 'pythondns' ], diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py index cda228b1..c788313d 100644 --- a/sleekxmpp/__init__.py +++ b/sleekxmpp/__init__.py @@ -2,22 +2,10 @@ """ SleekXMPP: The Sleek XMPP Library - Copyright (C) 2007 Nathanael C. Fritz + Copyright (C) 2010 Nathanael C. Fritz This file is part of SleekXMPP. - SleekXMPP is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - SleekXMPP is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with SleekXMPP; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + See the file license.txt for copying permission. """ from __future__ import absolute_import, unicode_literals from . basexmpp import basexmpp diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 961775ff..34b8d764 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -1,21 +1,9 @@ """ SleekXMPP: The Sleek XMPP Library - Copyright (C) 2007 Nathanael C. Fritz + Copyright (C) 2010 Nathanael C. Fritz This file is part of SleekXMPP. - SleekXMPP is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - SleekXMPP is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with SleekXMPP; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + See the file license.txt for copying permission. """ from __future__ import with_statement, unicode_literals diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py index 5bd596d2..9c7a6125 100755 --- a/sleekxmpp/componentxmpp.py +++ b/sleekxmpp/componentxmpp.py @@ -2,22 +2,10 @@ """ SleekXMPP: The Sleek XMPP Library - Copyright (C) 2007 Nathanael C. Fritz + Copyright (C) 2010 Nathanael C. Fritz This file is part of SleekXMPP. - SleekXMPP is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - SleekXMPP is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with SleekXMPP; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + See the file license.txt for copying permission. """ from __future__ import absolute_import from . basexmpp import basexmpp diff --git a/sleekxmpp/exceptions.py b/sleekxmpp/exceptions.py index 9df51700..5b761cf3 100644 --- a/sleekxmpp/exceptions.py +++ b/sleekxmpp/exceptions.py @@ -1,3 +1,11 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + +See the file license.txt for copying permission. +""" + class XMPPError(Exception): def __init__(self, condition='undefined-condition', text=None, etype=None, extension=None, extension_ns=None, extension_args=None): self.condition = condition diff --git a/sleekxmpp/stanza/__init__.py b/sleekxmpp/stanza/__init__.py index 765748ca..c3d8a318 100644 --- a/sleekxmpp/stanza/__init__.py +++ b/sleekxmpp/stanza/__init__.py @@ -1 +1,8 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" __all__ = ['presence'] diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py index 4cb7310a..a1454d1e 100644 --- a/sleekxmpp/stanza/error.py +++ b/sleekxmpp/stanza/error.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from .. xmlstream.stanzabase import ElementBase, ET class Error(ElementBase): diff --git a/sleekxmpp/stanza/htmlim.py b/sleekxmpp/stanza/htmlim.py index 24b68592..d2ccfd6a 100644 --- a/sleekxmpp/stanza/htmlim.py +++ b/sleekxmpp/stanza/htmlim.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from .. xmlstream.stanzabase import ElementBase, ET class HTMLIM(ElementBase): diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py index e76280b4..8d91c83e 100644 --- a/sleekxmpp/stanza/iq.py +++ b/sleekxmpp/stanza/iq.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from .. xmlstream.stanzabase import StanzaBase from xml.etree import cElementTree as ET from . error import Error diff --git a/sleekxmpp/stanza/message.py b/sleekxmpp/stanza/message.py index f57ddbe0..9c2bf30e 100644 --- a/sleekxmpp/stanza/message.py +++ b/sleekxmpp/stanza/message.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from .. xmlstream.stanzabase import StanzaBase from xml.etree import cElementTree as ET from . error import Error diff --git a/sleekxmpp/stanza/nick.py b/sleekxmpp/stanza/nick.py index 83f7a07b..92a523d6 100644 --- a/sleekxmpp/stanza/nick.py +++ b/sleekxmpp/stanza/nick.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from .. xmlstream.stanzabase import ElementBase, ET class Nick(ElementBase): diff --git a/sleekxmpp/stanza/presence.py b/sleekxmpp/stanza/presence.py index a6319820..1149456f 100644 --- a/sleekxmpp/stanza/presence.py +++ b/sleekxmpp/stanza/presence.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from .. xmlstream.stanzabase import StanzaBase from xml.etree import cElementTree as ET from . error import Error diff --git a/sleekxmpp/stanza/rootstanza.py b/sleekxmpp/stanza/rootstanza.py index 72ba5ca9..9c147e40 100644 --- a/sleekxmpp/stanza/rootstanza.py +++ b/sleekxmpp/stanza/rootstanza.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from .. xmlstream.stanzabase import StanzaBase from xml.etree import cElementTree as ET from . error import Error diff --git a/sleekxmpp/stanza/roster.py b/sleekxmpp/stanza/roster.py index d8b61a5b..1fefc180 100644 --- a/sleekxmpp/stanza/roster.py +++ b/sleekxmpp/stanza/roster.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from .. xmlstream.stanzabase import ElementBase, ET, JID import logging diff --git a/sleekxmpp/xmlstream/filesocket.py b/sleekxmpp/xmlstream/filesocket.py index 580c43f0..f60c5b8e 100644 --- a/sleekxmpp/xmlstream/filesocket.py +++ b/sleekxmpp/xmlstream/filesocket.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from socket import _fileobject import socket diff --git a/sleekxmpp/xmlstream/handler/base.py b/sleekxmpp/xmlstream/handler/base.py index 9a951193..5d55f4ee 100644 --- a/sleekxmpp/xmlstream/handler/base.py +++ b/sleekxmpp/xmlstream/handler/base.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" class BaseHandler(object): diff --git a/sleekxmpp/xmlstream/handler/callback.py b/sleekxmpp/xmlstream/handler/callback.py index 20e731f9..49cfa14d 100644 --- a/sleekxmpp/xmlstream/handler/callback.py +++ b/sleekxmpp/xmlstream/handler/callback.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from . import base import logging diff --git a/sleekxmpp/xmlstream/handler/waiter.py b/sleekxmpp/xmlstream/handler/waiter.py index f2303cd5..c85a0c46 100644 --- a/sleekxmpp/xmlstream/handler/waiter.py +++ b/sleekxmpp/xmlstream/handler/waiter.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from . import base try: import queue diff --git a/sleekxmpp/xmlstream/handler/xmlcallback.py b/sleekxmpp/xmlstream/handler/xmlcallback.py index ae288ff1..632c142b 100644 --- a/sleekxmpp/xmlstream/handler/xmlcallback.py +++ b/sleekxmpp/xmlstream/handler/xmlcallback.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" import threading from . callback import Callback diff --git a/sleekxmpp/xmlstream/handler/xmlwaiter.py b/sleekxmpp/xmlstream/handler/xmlwaiter.py index 1e524b02..2344403b 100644 --- a/sleekxmpp/xmlstream/handler/xmlwaiter.py +++ b/sleekxmpp/xmlstream/handler/xmlwaiter.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from . waiter import Waiter class XMLWaiter(Waiter): diff --git a/sleekxmpp/xmlstream/matcher/base.py b/sleekxmpp/xmlstream/matcher/base.py index 97e4465c..8185bdc5 100644 --- a/sleekxmpp/xmlstream/matcher/base.py +++ b/sleekxmpp/xmlstream/matcher/base.py @@ -1,4 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + See the file license.txt for copying permission. +""" class MatcherBase(object): def __init__(self, criteria): diff --git a/sleekxmpp/xmlstream/matcher/id.py b/sleekxmpp/xmlstream/matcher/id.py index 44fad15c..bb858fc4 100644 --- a/sleekxmpp/xmlstream/matcher/id.py +++ b/sleekxmpp/xmlstream/matcher/id.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from . import base class MatcherId(base.MatcherBase): diff --git a/sleekxmpp/xmlstream/matcher/many.py b/sleekxmpp/xmlstream/matcher/many.py index 42e92b28..cf860e62 100644 --- a/sleekxmpp/xmlstream/matcher/many.py +++ b/sleekxmpp/xmlstream/matcher/many.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from . import base from xml.etree import cElementTree diff --git a/sleekxmpp/xmlstream/matcher/stanzapath.py b/sleekxmpp/xmlstream/matcher/stanzapath.py index d036d0b8..bd091c0e 100644 --- a/sleekxmpp/xmlstream/matcher/stanzapath.py +++ b/sleekxmpp/xmlstream/matcher/stanzapath.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from . import base from xml.etree import cElementTree diff --git a/sleekxmpp/xmlstream/matcher/xmlmask.py b/sleekxmpp/xmlstream/matcher/xmlmask.py index e4a22faa..eba3e954 100644 --- a/sleekxmpp/xmlstream/matcher/xmlmask.py +++ b/sleekxmpp/xmlstream/matcher/xmlmask.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from . import base from xml.etree import cElementTree from xml.parsers.expat import ExpatError diff --git a/sleekxmpp/xmlstream/matcher/xpath.py b/sleekxmpp/xmlstream/matcher/xpath.py index fe18a655..f6d04243 100644 --- a/sleekxmpp/xmlstream/matcher/xpath.py +++ b/sleekxmpp/xmlstream/matcher/xpath.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from . import base from xml.etree import cElementTree diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py index 0e9aba8e..960e8a71 100644 --- a/sleekxmpp/xmlstream/stanzabase.py +++ b/sleekxmpp/xmlstream/stanzabase.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from xml.etree import cElementTree as ET import logging import traceback diff --git a/sleekxmpp/xmlstream/statemachine.py b/sleekxmpp/xmlstream/statemachine.py index e9e270c8..fb7d1508 100644 --- a/sleekxmpp/xmlstream/statemachine.py +++ b/sleekxmpp/xmlstream/statemachine.py @@ -1,3 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" from __future__ import with_statement import threading diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 594583a8..e208dba7 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -1,3 +1,11 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file license.txt for copying permission. +""" + from __future__ import with_statement, unicode_literals try: import queue -- cgit v1.2.3