From 8bc9bc29ae92118d2d2abd288adee9072a98ecf5 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Fri, 15 Aug 2008 03:20:23 +0000 Subject: * Big headers review * Remove some licencing problems * To do: same for images * See #4200 --- src/common/GnuPG.py | 27 +++++++++------------ src/common/GnuPGInterface.py | 50 +++++++++++++++++++-------------------- src/common/__init__.py | 22 ++++++++++++++++- src/common/atom.py | 24 ++++++++++++++++++- src/common/caps.py | 12 +++++++--- src/common/check_paths.py | 17 ++++++++----- src/common/commands.py | 14 +++++++---- src/common/config.py | 31 ++++++++++++++---------- src/common/configpaths.py | 25 +++++++++++++++++++- src/common/connection.py | 29 ++++++++++++++--------- src/common/connection_handlers.py | 23 +++++++++++------- src/common/contacts.py | 22 ++++++++++------- src/common/crypto.py | 21 +++++++++++++++- src/common/dataforms.py | 22 +++++++++++++++++ src/common/dbus_support.py | 19 ++++++++------- src/common/defs.py | 24 +++++++++++++++++++ src/common/dh.py | 23 +++++++++++++++++- src/common/events.py | 25 +++++++++----------- src/common/exceptions.py | 15 +++++++----- src/common/fuzzyclock.py | 21 +++++++--------- src/common/gajim.py | 20 ++++++++++------ src/common/helpers.py | 26 ++++++++++++-------- src/common/i18n.py | 25 +++++++------------- src/common/logger.py | 18 +++++++++----- src/common/nslookup.py | 13 ++++++---- src/common/optparser.py | 20 +++++++++++----- src/common/passwords.py | 16 +++++++++---- src/common/proxy65_manager.py | 16 +++++++------ src/common/pubsub.py | 25 +++++++++++++++++++- src/common/rst_xhtml_generator.py | 14 ++++++----- src/common/sleepy.py | 22 ++++++++--------- src/common/socks5.py | 27 +++++++-------------- src/common/stanza_session.py | 24 +++++++++++++++++++ src/common/xmpp_stringprep.py | 19 +++++++-------- 34 files changed, 500 insertions(+), 251 deletions(-) (limited to 'src/common') diff --git a/src/common/GnuPG.py b/src/common/GnuPG.py index 75f707588..1aad663bd 100644 --- a/src/common/GnuPG.py +++ b/src/common/GnuPG.py @@ -1,17 +1,12 @@ -## common/GnuPG.py +## src/common/GnuPG.py ## -## Contributors for this file: -## - Yann Leboulanger -## - Nikos Kouremenos -## -## Copyright (C) 2003-2004 Yann Leboulanger -## Vincent Hanquez -## Copyright (C) 2005 Yann Leboulanger -## Vincent Hanquez -## Nikos Kouremenos -## Dimitur Kirov -## Travis Shirk -## Norman Rasmussen +## Copyright (C) 2003-2008 Yann Leboulanger +## Copyright (C) 2005 Alex Mauer +## Copyright (C) 2005-2006 Nikos Kouremenos +## Copyright (C) 2005-2008 Yann Leboulanger +## Copyright (C) 2007 Stephan Erb +## Copyright (C) 2008 Jean-Marie Traissard +## Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -21,11 +16,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import gajim @@ -229,4 +224,4 @@ if gajim.HAVE_GPG: out = out + "-----END PGP %s-----\n" % type return out -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/GnuPGInterface.py b/src/common/GnuPGInterface.py index 73189116a..e7b074558 100644 --- a/src/common/GnuPGInterface.py +++ b/src/common/GnuPGInterface.py @@ -1,3 +1,26 @@ +## src/common/GnuPGInterface.py +## +## Copyright (C) 2001 Frank J. Tobin +## Copyright (C) 2005 Nikos Kouremenos +## Copyright (C) 2006-2007 Yann Leboulanger +## Copyright (C) 2008 Jean-Marie Traissard +## Jonathan Schleifer +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## + """Interface to GNU Privacy Guard (GnuPG) GnuPGInterface is a Python module to interface with GnuPG. @@ -196,31 +219,6 @@ Here is an example of generating a key: >>> proc.handles['logger'].close() >>> >>> proc.wait() - - -COPYRIGHT: - -Copyright (C) 2001 Frank J. Tobin, ftobin@neverending.org - -LICENSE: - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library 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 -Lesser General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see . - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/copyleft/lesser.html """ import os @@ -656,4 +654,4 @@ GnuPGInterface = GnuPG if __name__ == '__main__': _run_doctests() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/__init__.py b/src/common/__init__.py index bbd45f43d..5ef271917 100644 --- a/src/common/__init__.py +++ b/src/common/__init__.py @@ -1,2 +1,22 @@ +## src/common/__init__.py +## +## Copyright (C) 2005 Yann Leboulanger +## Nikos Kouremenos +## Copyright (C) 2008 Jonathan Schleifer +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/atom.py b/src/common/atom.py index 3031e6651..4b99d533a 100644 --- a/src/common/atom.py +++ b/src/common/atom.py @@ -1,4 +1,26 @@ # -*- coding: utf-8 -*- +## src/common/atom.py +## +## Copyright (C) 2006 Jean-Marie Traissard +## Tomasz Melcer +## Copyright (C) 2006-2007 Yann Leboulanger +## Copyright (C) 2008 Jonathan Schleifer +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## + ''' Atom (rfc 4287) feed parser, used to read data from atom-over-pubsub transports and services. Very simple. Actually implements only atom:entry. Implement more features if you need. ''' @@ -135,4 +157,4 @@ class OldEntry(xmpp.Node, object): feed_tagline = u'' -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/caps.py b/src/common/caps.py index ea29abbd7..abc7db94a 100644 --- a/src/common/caps.py +++ b/src/common/caps.py @@ -1,5 +1,11 @@ +## src/common/caps.py ## -## Copyright (C) 2006 Gajim Team +## Copyright (C) 2007 Tomasz Melcer +## Travis Shirk +## Copyright (C) 2007-2008 Yann Leboulanger +## Copyright (C) 2008 Brendan Taylor +## Jonathan Schleifer +## Stephan Erb ## ## This file is part of Gajim. ## @@ -9,11 +15,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## from itertools import * diff --git a/src/common/check_paths.py b/src/common/check_paths.py index d93a8fbab..160fe4f70 100644 --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -1,7 +1,12 @@ +## src/common/check_paths.py ## -## Copyright (C) 2005-2006 Yann Leboulanger -## Copyright (C) 2005-2006 Nikos Kouremenos -## Copyright (C) 2005-2006 Travis Shirk +## Copyright (C) 2005-2006 Travis Shirk +## Nikos Kouremenos +## Copyright (C) 2005-2008 Yann Leboulanger +## Copyright (C) 2006 Dimitur Kirov +## Copyright (C) 2007 Tomasz Melcer +## Copyright (C) 2008 Jean-Marie Traissard +## Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -11,11 +16,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import os @@ -147,4 +152,4 @@ def create_path(directory): print _('creating %s directory') % directory os.mkdir(directory, 0700) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/commands.py b/src/common/commands.py index 51d075b15..85d7e9b54 100644 --- a/src/common/commands.py +++ b/src/common/commands.py @@ -1,5 +1,11 @@ +## src/common/commands.py ## -## Copyright (C) 2006 Gajim Team +## Copyright (C) 2006-2007 Yann Leboulanger +## Tomasz Melcer +## Copyright (C) 2007 Jean-Marie Traissard +## Copyright (C) 2008 Brendan Taylor +## Jonathan Schleifer +## Stephan Erb ## ## This file is part of Gajim. ## @@ -9,11 +15,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import xmpp @@ -413,4 +419,4 @@ class ConnectionCommands: raise xmpp.NodeProcessed -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/config.py b/src/common/config.py index 9943b5e17..b6f909c14 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -1,15 +1,20 @@ -## common/config.py +## src/common/config.py +## +## Copyright (C) 2003-2008 Yann Leboulanger +## Copyright (C) 2004-2005 Vincent Hanquez +## Copyright (C) 2005 Stéphan Kochen +## Copyright (C) 2005-2006 Dimitur Kirov +## Alex Mauer +## Nikos Kouremenos +## Copyright (C) 2005-2007 Travis Shirk +## Copyright (C) 2006 Stefan Bethge +## Copyright (C) 2006-2008 Jean-Marie Traissard +## Copyright (C) 2007 James Newton +## Julien Pivotto +## Copyright (C) 2007-2008 Brendan Taylor +## Stephan Erb +## Copyright (C) 2008 Jonathan Schleifer ## -## Copyright (C) 2003-2007 Yann Leboulanger -## Copyright (C) 2005-2006 Nikos Kouremenos -## Copyright (C) 2004-2005 Vincent Hanquez -## Copyright (C) 2005 Dimitur Kirov -## Travis Shirk -## Norman Rasmussen -## Copyright (C) 2006 Stefan Bethge -## Copyright (C) 2007 Julien Pivotto -## Stephan Erb -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -18,11 +23,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## diff --git a/src/common/configpaths.py b/src/common/configpaths.py index ab153f7d6..311defe48 100644 --- a/src/common/configpaths.py +++ b/src/common/configpaths.py @@ -1,3 +1,26 @@ +## src/common/configpaths.py +## +## Copyright (C) 2006 Jean-Marie Traissard +## Junglecow +## Copyright (C) 2006-2007 Yann Leboulanger +## Copyright (C) 2007 Brendan Taylor +## Copyright (C) 2008 Jonathan Schleifer +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## + import os import sys import tempfile @@ -122,4 +145,4 @@ class ConfigPaths: gajimpaths = ConfigPaths() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/connection.py b/src/common/connection.py index 86c5b7214..0ed03748e 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1,13 +1,20 @@ -## common/connection.py +## src/common/connection.py ## -## -## Copyright (C) 2003-2004 Vincent Hanquez -## Copyright (C) 2003-2007 Yann Leboulanger -## Copyright (C) 2005-2006 Nikos Kouremenos -## Dimitur Kirov -## Travis Shirk -## Copyright (C) 2007 Julien Pivotto -## Stephan Erb +## Copyright (C) 2003-2005 Vincent Hanquez +## Copyright (C) 2003-2008 Yann Leboulanger +## Copyright (C) 2005 Alex Mauer +## Stéphan Kochen +## Copyright (C) 2005-2006 Dimitur Kirov +## Travis Shirk +## Nikos Kouremenos +## Copyright (C) 2006 Junglecow +## Stefan Bethge +## Copyright (C) 2006-2008 Jean-Marie Traissard +## Copyright (C) 2007 Tomasz Melcer +## Julien Pivotto +## Copyright (C) 2007-2008 Stephan Erb +## Copyright (C) 2008 Brendan Taylor +## Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -17,11 +24,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import os diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index 7af206c05..2a575e046 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1,11 +1,16 @@ +## src/common/connection_handlers.py ## -## Copyright (C) 2006 Gajim Team -## -## Contributors for this file: -## - Yann Leboulanger -## - Nikos Kouremenos -## - Dimitur Kirov -## - Travis Shirk +## Copyright (C) 2006 Dimitur Kirov +## Junglecow +## Copyright (C) 2006-2007 Tomasz Melcer +## Travis Shirk +## Nikos Kouremenos +## Copyright (C) 2006-2008 Yann Leboulanger +## Copyright (C) 2007 Julien Pivotto +## Copyright (C) 2007-2008 Brendan Taylor +## Jean-Marie Traissard +## Stephan Erb +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -15,11 +20,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import os diff --git a/src/common/contacts.py b/src/common/contacts.py index f38847735..67b03fce8 100644 --- a/src/common/contacts.py +++ b/src/common/contacts.py @@ -1,10 +1,16 @@ -## common/contacts.py +## src/common/contacts.py ## -## Copyright (C) 2006 Yann Leboulanger -## Nikos Kouremenos -## Copyright (C) 2007 Lukas Petrovicky -## Julien Pivotto -## Stephan Erb +## Copyright (C) 2006 Dimitur Kirov +## Travis Shirk +## Nikos Kouremenos +## Copyright (C) 2006-2008 Yann Leboulanger +## Jean-Marie Traissard +## Copyright (C) 2007 Lukas Petrovicky +## Tomasz Melcer +## Julien Pivotto +## Copyright (C) 2007-2008 Stephan Erb +## Copyright (C) 2008 Brendan Taylor +## Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -14,11 +20,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import common.gajim diff --git a/src/common/crypto.py b/src/common/crypto.py index 9c0caaaea..859b8ba15 100644 --- a/src/common/crypto.py +++ b/src/common/crypto.py @@ -1,4 +1,23 @@ # common crypto functions (mostly specific to XEP-0116, but useful elsewhere) +## src/common/crypto.py +## +## Copyright (C) 2007 Brendan Taylor +## Copyright (C) 2008 Jonathan Schleifer +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## import os import math @@ -85,4 +104,4 @@ def powmod(base, exp, mod): return result -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/dataforms.py b/src/common/dataforms.py index 5855acd2a..59f399815 100644 --- a/src/common/dataforms.py +++ b/src/common/dataforms.py @@ -1,4 +1,26 @@ # this will go to src/common/xmpp later, for now it is in src/common +## src/common/dataforms.py +## +## Copyright (C) 2006-2007 Tomasz Melcer +## Copyright (C) 2006-2008 Yann Leboulanger +## Copyright (C) 2007 Stephan Erb +## Copyright (C) 2008 Jonathan Schleifer +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## + """ This module contains wrappers for different parts of data forms (JEP 0004). For information how to use them, read documentation. """ diff --git a/src/common/dbus_support.py b/src/common/dbus_support.py index d9c04ab0d..76afe2d61 100644 --- a/src/common/dbus_support.py +++ b/src/common/dbus_support.py @@ -1,9 +1,12 @@ -## dbus_support.py +## src/common/dbus_support.py ## -## Copyright (C) 2005 Yann Leboulanger -## Copyright (C) 2005 Nikos Kouremenos -## Copyright (C) 2005 Dimitur Kirov -## Copyright (C) 2005 Andrew Sayman +## Copyright (C) 2005 Andrew Sayman +## Dimitur Kirov +## Copyright (C) 2005-2006 Nikos Kouremenos +## Copyright (C) 2005-2007 Yann Leboulanger +## Copyright (C) 2006 Jean-Marie Traissard +## Stefan Bethge +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -13,11 +16,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import os, sys @@ -150,4 +153,4 @@ if supported: '''Raised when one of the provided arguments is invalid.''' _dbus_error_name = _GAJIM_ERROR_IFACE + '.InvalidArgument' -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/defs.py b/src/common/defs.py index 51cf2e032..047f9202e 100644 --- a/src/common/defs.py +++ b/src/common/defs.py @@ -1,3 +1,27 @@ +## src/common/defs.py +## +## Copyright (C) 2006 Nikos Kouremenos +## Copyright (C) 2006-2008 Yann Leboulanger +## Jean-Marie Traissard +## Copyright (C) 2007 Brendan Taylor +## Tomasz Melcer +## Copyright (C) 2008 Jonathan Schleifer +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## + import re docdir = '../' diff --git a/src/common/dh.py b/src/common/dh.py index f336edc16..d371a5823 100644 --- a/src/common/dh.py +++ b/src/common/dh.py @@ -1,3 +1,24 @@ +## src/common/dh.py +## +## Copyright (C) 2007 Yann Leboulanger +## Copyright (C) 2008 Brendan Taylor +## Jonathan Schleifer +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## + import string # This file defines a number of constants; specifically, large primes suitable for @@ -206,4 +227,4 @@ def hex_to_decimal(stripee): primes = map(hex_to_decimal, hex_primes) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/events.py b/src/common/events.py index 8dbf17a31..2741e30e4 100644 --- a/src/common/events.py +++ b/src/common/events.py @@ -1,15 +1,12 @@ -## common/events.py +## src/common/events.py ## -## Contributors for this file: -## - Yann Leboulanger -## -## Copyright (C) 2006 Yann Leboulanger -## Vincent Hanquez -## Nikos Kouremenos -## Dimitur Kirov -## Travis Shirk -## Norman Rasmussen -## Copyright (C) 2007 Stephan Erb +## Copyright (C) 2006 Jean-Marie Traissard +## Nikos Kouremenos +## Copyright (C) 2006-2007 Yann Leboulanger +## Copyright (C) 2007 Julien Pivotto +## Copyright (C) 2007-2008 Stephan Erb +## Copyright (C) 2008 Brendan Taylor +## Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -19,11 +16,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import time @@ -292,4 +289,4 @@ class Events: {account1: {jid1: [ev1, ev2], },. }''' return self._get_some_events('roster') -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/exceptions.py b/src/common/exceptions.py index a6e9ea971..2a9b4247d 100644 --- a/src/common/exceptions.py +++ b/src/common/exceptions.py @@ -1,7 +1,10 @@ -## exceptions.py +## src/common/exceptions.py ## -## Copyright (C) 2005-2006 Yann Leboulanger -## Copyright (C) 2005-2006 Nikos Kouremenos +## Copyright (C) 2005-2006 Nikos Kouremenos +## Copyright (C) 2005-2008 Yann Leboulanger +## Copyright (C) 2006 Jean-Marie Traissard +## Copyright (C) 2007 Brendan Taylor +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -11,11 +14,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## class PysqliteNotAvailable(Exception): @@ -88,4 +91,4 @@ class GajimGeneralException(Exception): def __str__(self): return self.text -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/fuzzyclock.py b/src/common/fuzzyclock.py index 36a5585ee..8fd38f3c5 100755 --- a/src/common/fuzzyclock.py +++ b/src/common/fuzzyclock.py @@ -1,14 +1,9 @@ -## fuzzyclock.py +## src/common/fuzzyclock.py ## -## Contributors for this file: -## -## - Yann Leboulanger -## - Christoph Neuroth -## -## Copyright (C) 2006 Christoph Neuroth -## Yann Leboulanger -## Dimitur Kirov -## Travis Shirk +## Copyright (C) 2006 Christoph Neuroth +## Copyright (C) 2006-2007 Yann Leboulanger +## Copyright (C) 2007 Jean-Marie Traissard +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -18,11 +13,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## ''' @@ -140,4 +135,4 @@ class FuzzyClock: return newTimeStr -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/gajim.py b/src/common/gajim.py index e071568bb..a60b235b7 100644 --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -1,9 +1,15 @@ -## common/gajim.py +## src/common/gajim.py ## -## Copyright (C) 2003-2007 Yann Leboulanger -## Copyright (C) 2005-2006 Nikos Kouremenos -## Copyright (C) 2005-2006 Dimitur Kirov -## Copyright (C) 2005-2006 Travis Shirk +## Copyright (C) 2003-2008 Yann Leboulanger +## Copyright (C) 2005-2006 Dimitur Kirov +## Travis Shirk +## Nikos Kouremenos +## Copyright (C) 2006 Junglecow +## Stefan Bethge +## Copyright (C) 2006-2008 Jean-Marie Traissard +## Copyright (C) 2007-2008 Brendan Taylor +## Stephan Erb +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -13,11 +19,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import sys diff --git a/src/common/helpers.py b/src/common/helpers.py index d354ee0e0..e0c999441 100644 --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -1,12 +1,18 @@ -## common/helpers.py +## src/common/helpers.py +## +## Copyright (C) 2003-2008 Yann Leboulanger +## Copyright (C) 2005-2006 Dimitur Kirov +## Nikos Kouremenos +## Copyright (C) 2006 Alex Mauer +## Copyright (C) 2006-2007 Travis Shirk +## Copyright (C) 2006-2008 Jean-Marie Traissard +## Copyright (C) 2007 Lukas Petrovicky +## James Newton +## Julien Pivotto +## Copyright (C) 2007-2008 Stephan Erb +## Copyright (C) 2008 Brendan Taylor +## Jonathan Schleifer ## -## Copyright (C) 2003-2007 Yann Leboulanger -## Copyright (C) 2005-2006 Nikos Kouremenos -## Copyright (C) 2005 Dimitur Kirov -## Travis Shirk -## Copyright (C) 2007 Lukas Petrovicky -## Stephan Erb -## ## This file is part of Gajim. ## ## Gajim is free software; you can redistribute it and/or modify @@ -15,11 +21,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import re diff --git a/src/common/i18n.py b/src/common/i18n.py index 0ffe57909..4d15e7536 100644 --- a/src/common/i18n.py +++ b/src/common/i18n.py @@ -1,17 +1,10 @@ -## common/i18n.py -## -*- coding: utf-8 -*- -## Contributors for this file: -## - Yann Leboulanger -## - Nikos Kouremenos +## src/common/i18n.py ## -## Copyright (C) 2003-2004 Yann Leboulanger -## Vincent Hanquez -## Copyright (C) 2005 Yann Leboulanger -## Vincent Hanquez -## Nikos Kouremenos -## Dimitur Kirov -## Travis Shirk -## Norman Rasmussen +## Copyright (C) 2003-2007 Yann Leboulanger +## Copyright (C) 2004 Vincent Hanquez +## Copyright (C) 2004-2007 Yann Leboulanger +## Copyright (C) 2005-2006 Nikos Kouremenos +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -21,11 +14,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import locale @@ -87,4 +80,4 @@ def ngettext(s_sing, s_plural, n, replace_sing = None, replace_plural = None): text = text % replace_plural return text -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/logger.py b/src/common/logger.py index be29b7cca..c917024ce 100644 --- a/src/common/logger.py +++ b/src/common/logger.py @@ -1,7 +1,13 @@ -## logger.py +## src/common/logger.py ## -## Copyright (C) 2005-2006 Nikos Kouremenos -## Copyright (C) 2005-2006 Yann Leboulanger +## Copyright (C) 2003-2008 Yann Leboulanger +## Copyright (C) 2004-2005 Vincent Hanquez +## Copyright (C) 2005-2006 Nikos Kouremenos +## Copyright (C) 2006 Dimitur Kirov +## Copyright (C) 2006-2008 Jean-Marie Traissard +## Copyright (C) 2007 Tomasz Melcer +## Julien Pivotto +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -11,11 +17,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## ''' This module allows to access the on-disk database of logs. ''' @@ -761,4 +767,4 @@ class Logger: except sqlite.OperationalError, e: print >> sys.stderr, str(e) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/nslookup.py b/src/common/nslookup.py index 12722b478..f5c2cbd76 100644 --- a/src/common/nslookup.py +++ b/src/common/nslookup.py @@ -1,6 +1,9 @@ -## common/nslookup.py +## src/common/nslookup.py ## -## Copyright (C) 2006 Dimitur Kirov +## Copyright (C) 2006 Dimitur Kirov +## Nikos Kouremenos +## Copyright (C) 2007 Yann Leboulanger +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -10,11 +13,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import sys @@ -334,4 +337,4 @@ if __name__ == '__main__': gobject.timeout_add(200, process) gtk.main() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/optparser.py b/src/common/optparser.py index 8dfb03f70..5b017cbe6 100644 --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -1,7 +1,15 @@ +## src/common/optparser.py ## -## Copyright (C) 2005-2006 Yann Leboulanger -## Copyright (C) 2005-2006 Nikos Kouremenos -## Copyright (C) 2007 Stephan Erb +## Copyright (C) 2003-2005 Vincent Hanquez +## Copyright (C) 2003-2008 Yann Leboulanger +## Copyright (C) 2005-2006 Dimitur Kirov +## Nikos Kouremenos +## Copyright (C) 2006-2008 Jean-Marie Traissard +## Copyright (C) 2007 James Newton +## Brendan Taylor +## Tomasz Melcer +## Stephan Erb +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -11,11 +19,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import os @@ -596,4 +604,4 @@ class OptionsParser: con.close() gajim.config.set('version', '0.11.4.4') -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/passwords.py b/src/common/passwords.py index 1ec2f29dc..9a48841ed 100644 --- a/src/common/passwords.py +++ b/src/common/passwords.py @@ -1,6 +1,12 @@ +## src/common/passwords.py ## -## Copyright (C) 2006 Gustavo J. A. M. Carneiro -## Copyright (C) 2006 Nikos Kouremenos +## Copyright (C) 2006 Gustavo J. A. M. Carneiro +## Nikos Kouremenos +## Copyright (C) 2006-2008 Yann Leboulanger +## Copyright (C) 2007 Jean-Marie Traissard +## Julien Pivotto +## Copyright (C) 2008 Jonathan Schleifer +## Stephan Erb ## ## This file is part of Gajim. ## @@ -10,11 +16,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## __all__ = ['get_password', 'save_password'] @@ -138,4 +144,4 @@ def get_password(account_name): def save_password(account_name, password): return get_storage().save_password(account_name, password) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/proxy65_manager.py b/src/common/proxy65_manager.py index 587c68960..57b3a2f55 100644 --- a/src/common/proxy65_manager.py +++ b/src/common/proxy65_manager.py @@ -1,8 +1,9 @@ +## src/common/proxy65_manager.py ## -## Copyright (C) 2006 Gajim Team -## -## Contributors for this file: -## - Dimitur Kirov +## Copyright (C) 2006 Dimitur Kirov +## Jean-Marie Traissard +## Copyright (C) 2007 Yann Leboulanger +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -12,12 +13,13 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## + import socket import struct import errno @@ -276,4 +278,4 @@ class HostTester(Socks5, IdleObject): return -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/pubsub.py b/src/common/pubsub.py index e5e8bf8f9..dfed21487 100644 --- a/src/common/pubsub.py +++ b/src/common/pubsub.py @@ -1,3 +1,26 @@ +## src/common/pubsub.py +## +## Copyright (C) 2006 Tomasz Melcer +## Copyright (C) 2006-2008 Yann Leboulanger +## Copyright (C) 2007 Jean-Marie Traissard +## Copyright (C) 2008 Jonathan Schleifer +## Stephan Erb +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## + import xmpp import gajim import connection_handlers @@ -105,4 +128,4 @@ class ConnectionPubSub: self.awaiting_answers[id] = (connection_handlers.PEP_CONFIG,) self.connection.send(query) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/rst_xhtml_generator.py b/src/common/rst_xhtml_generator.py index 8c7d059b2..2be34de8a 100644 --- a/src/common/rst_xhtml_generator.py +++ b/src/common/rst_xhtml_generator.py @@ -1,8 +1,10 @@ -## rst_xhtml_generator.py +## src/common/rst_xhtml_generator.py ## -## Copyright (C) 2006 Yann Leboulanger -## Copyright (C) 2006 Nikos Kouremenos ## Copyright (C) 2006 Santiago Gala +## Nikos Kouremenos +## Copyright (C) 2006-2007 Yann Leboulanger +## Copyright (C) 2007 Jean-Marie Traissard +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -12,11 +14,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## try: @@ -162,4 +164,4 @@ test2_ """) print "test 3\n", Generator.create_xhtml(""":ticket:`316` implements :xep:`71`""") -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/sleepy.py b/src/common/sleepy.py index 4cc36970c..c42e52546 100644 --- a/src/common/sleepy.py +++ b/src/common/sleepy.py @@ -1,13 +1,11 @@ -## common/sleepy.py +## src/common/sleepy.py ## -## Contributors for this file: -## - Yann Leboulanger -## - Nikos Kouremenos -## -## Copyright (C) 2003-2004 Yann Leboulanger -## Vincent Hanquez -## Copyright (C) 2005-2006 Yann Leboulanger -## Nikos Kouremenos +## Copyright (C) 2003-2007 Yann Leboulanger +## Copyright (C) 2005-2006 Yann Leboulanger +## Nikos Kouremenos +## Copyright (C) 2007 Jean-Marie Traissard +## Copyright (C) 2008 Jonathan Schleifer +## Mateusz Biliński ## ## This file is part of Gajim. ## @@ -17,11 +15,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## from common import gajim @@ -129,4 +127,4 @@ if os.name == 'nt': else: Sleepy = SleepyUnix -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/socks5.py b/src/common/socks5.py index c81321362..a8590a998 100644 --- a/src/common/socks5.py +++ b/src/common/socks5.py @@ -1,19 +1,10 @@ - -## common/xmpp/socks5.py -## -## Contributors for this file: -## - Yann Leboulanger -## - Nikos Kouremenos -## - Dimitur Kirov +## src/common/socks5.py ## -## Copyright (C) 2003-2004 Yann Leboulanger -## Vincent Hanquez -## Copyright (C) 2005 Yann Leboulanger -## Vincent Hanquez -## Nikos Kouremenos -## Dimitur Kirov -## Travis Shirk -## Norman Rasmussen +## Copyright (C) 2005-2006 Dimitur Kirov +## Nikos Kouremenos +## Copyright (C) 2005-2007 Yann Leboulanger +## Copyright (C) 2006-2008 Jean-Marie Traissard +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -23,11 +14,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## @@ -1084,4 +1075,4 @@ class Socks5Receiver(Socks5, IdleObject): if self.queue is not None: self.queue.remove_receiver(self.queue_idx, False) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py index dd8041064..91e4b7f5c 100644 --- a/src/common/stanza_session.py +++ b/src/common/stanza_session.py @@ -1,3 +1,27 @@ +## src/common/stanza_session.py +## +## Copyright (C) 2007 Julien Pivotto +## Stephan Erb +## Copyright (C) 2007-2008 Yann Leboulanger +## Brendan Taylor +## Jean-Marie Traissard +## Copyright (C) 2008 Jonathan Schleifer +## +## This file is part of Gajim. +## +## Gajim 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; version 3 only. +## +## Gajim 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 Gajim. If not, see . +## + from common import gajim from common import xmpp diff --git a/src/common/xmpp_stringprep.py b/src/common/xmpp_stringprep.py index e3a760f05..1ed1cb945 100644 --- a/src/common/xmpp_stringprep.py +++ b/src/common/xmpp_stringprep.py @@ -1,11 +1,10 @@ -## common/xmpp_stringprep.py +## src/common/xmpp_stringprep.py ## -## Contributors for this file: -## - Yann Leboulanger -## - Nikos Kouremenos -## -## Copyright (C) 2001-2005 Twisted Matrix Laboratories. -## Copyright (C) 2005 Gajim Team +## Copyright (C) 2001-2005 Twisted Matrix Laboratories +## Copyright (C) 2005-2007 Yann Leboulanger +## Copyright (C) 2006 Stefan Bethge +## Copyright (C) 2007 Jean-Marie Traissard +## Copyright (C) 2008 Jonathan Schleifer ## ## This file is part of Gajim. ## @@ -15,11 +14,11 @@ ## ## Gajim 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 +## 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 Gajim. If not, see . +## along with Gajim. If not, see . ## import sys, warnings @@ -264,4 +263,4 @@ else: nameprep = NamePrep() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: -- cgit v1.2.3