summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-03-07 15:45:29 +0000
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-03-07 15:45:29 +0000
commit7d9324de99184598fb22824f9a500c55bd3a3aec (patch)
treeaece1cbbac36fa94cbaa90b03d4341e009fe388f
parenta6773874d462a661173991004d5e4dafd87c4b6c (diff)
downloadpykolab-7d9324de99184598fb22824f9a500c55bd3a3aec.tar.gz
Relicense from GPLv2 only to GPLv3+
-rwxr-xr-xconf.py2
-rwxr-xr-xkolab.py2
-rwxr-xr-xkolabd.py2
-rw-r--r--kolabd/__init__.py2
-rwxr-xr-xkolabtest.py2
-rw-r--r--pykolab/__init__.py2
-rw-r--r--pykolab/auth/__init__.py2
-rw-r--r--pykolab/auth/ldap/__init__.py2
-rw-r--r--pykolab/base.py2
-rw-r--r--pykolab/cli/__init__.py2
-rw-r--r--pykolab/conf/__init__.py2
-rw-r--r--pykolab/conf/defaults.py2
-rw-r--r--pykolab/conf/runtime.py2
-rw-r--r--pykolab/constants.py.in2
-rw-r--r--pykolab/imap/__init__.py2
-rw-r--r--pykolab/logger.py2
-rw-r--r--pykolab/plugin/defaultfolders/__init__.py6
-rw-r--r--pykolab/plugin/dynamicquota/__init__.py2
-rw-r--r--pykolab/plugin/recipientpolicy/__init__.py2
-rw-r--r--pykolab/plugins.py2
-rw-r--r--pykolab/setup/__init__.py2
-rw-r--r--pykolab/setup/imap.py2
-rw-r--r--pykolab/setup/ldap_setup.py2
-rw-r--r--pykolab/tests/__init__.py2
-rw-r--r--pykolab/tests/calendar.py2
-rw-r--r--pykolab/tests/constants.py2
-rw-r--r--pykolab/tests/contacts.py2
-rw-r--r--pykolab/tests/create-contacts.py2
-rw-r--r--pykolab/tests/mail.py2
-rw-r--r--pykolab/tests/zpush/__init__.py2
-rw-r--r--pykolab/tests/zpush/test_000_000.py2
-rw-r--r--pykolab/tests/zpush/test_000_001.py2
-rw-r--r--pykolab/translate.py2
-rwxr-xr-xsetup-kolab.py2
34 files changed, 35 insertions, 37 deletions
diff --git a/conf.py b/conf.py
index 6956df4..08169ed 100755
--- a/conf.py
+++ b/conf.py
@@ -7,7 +7,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/kolab.py b/kolab.py
index d4dcfaa..ca16b40 100755
--- a/kolab.py
+++ b/kolab.py
@@ -6,7 +6,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/kolabd.py b/kolabd.py
index adc7e91..7a03d49 100755
--- a/kolabd.py
+++ b/kolabd.py
@@ -6,7 +6,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/kolabd/__init__.py b/kolabd/__init__.py
index b9c7bef..2af615f 100644
--- a/kolabd/__init__.py
+++ b/kolabd/__init__.py
@@ -4,7 +4,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/kolabtest.py b/kolabtest.py
index 1fe6eb6..4f50f25 100755
--- a/kolabtest.py
+++ b/kolabtest.py
@@ -6,7 +6,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/__init__.py b/pykolab/__init__.py
index 135d198..9855af3 100644
--- a/pykolab/__init__.py
+++ b/pykolab/__init__.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/auth/__init__.py b/pykolab/auth/__init__.py
index 503867b..2d71607 100644
--- a/pykolab/auth/__init__.py
+++ b/pykolab/auth/__init__.py
@@ -4,7 +4,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index 8c23cf2..6cddbc2 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -4,7 +4,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/base.py b/pykolab/base.py
index e5b0884..ac25d19 100644
--- a/pykolab/base.py
+++ b/pykolab/base.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/cli/__init__.py b/pykolab/cli/__init__.py
index bc20cd8..a53001b 100644
--- a/pykolab/cli/__init__.py
+++ b/pykolab/cli/__init__.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py
index 4556954..d1bffd1 100644
--- a/pykolab/conf/__init__.py
+++ b/pykolab/conf/__init__.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/conf/defaults.py b/pykolab/conf/defaults.py
index 6d752b5..af5e7e1 100644
--- a/pykolab/conf/defaults.py
+++ b/pykolab/conf/defaults.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/conf/runtime.py b/pykolab/conf/runtime.py
index a0d5632..7994f9e 100644
--- a/pykolab/conf/runtime.py
+++ b/pykolab/conf/runtime.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/constants.py.in b/pykolab/constants.py.in
index ae4b52f..190d8d5 100644
--- a/pykolab/constants.py.in
+++ b/pykolab/constants.py.in
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/imap/__init__.py b/pykolab/imap/__init__.py
index bfee0f7..313b62c 100644
--- a/pykolab/imap/__init__.py
+++ b/pykolab/imap/__init__.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/logger.py b/pykolab/logger.py
index 48c840d..ac7effa 100644
--- a/pykolab/logger.py
+++ b/pykolab/logger.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/plugin/defaultfolders/__init__.py b/pykolab/plugin/defaultfolders/__init__.py
index 576546a..550be2d 100644
--- a/pykolab/plugin/defaultfolders/__init__.py
+++ b/pykolab/plugin/defaultfolders/__init__.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,9 +23,7 @@ class KolabDefaultfolders(object):
"""
def __init__(self, conf=None):
- if not conf == None:
- self.conf = conf
- pass
+ self.conf = conf
def create_user_folders(self, kw={}, args=()):
"""
diff --git a/pykolab/plugin/dynamicquota/__init__.py b/pykolab/plugin/dynamicquota/__init__.py
index 00c9799..c91ebfc 100644
--- a/pykolab/plugin/dynamicquota/__init__.py
+++ b/pykolab/plugin/dynamicquota/__init__.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/plugin/recipientpolicy/__init__.py b/pykolab/plugin/recipientpolicy/__init__.py
index d131356..3aa7c2a 100644
--- a/pykolab/plugin/recipientpolicy/__init__.py
+++ b/pykolab/plugin/recipientpolicy/__init__.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/plugins.py b/pykolab/plugins.py
index 095c50c..991a1e6 100644
--- a/pykolab/plugins.py
+++ b/pykolab/plugins.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/setup/__init__.py b/pykolab/setup/__init__.py
index 4dfda90..2cc09da 100644
--- a/pykolab/setup/__init__.py
+++ b/pykolab/setup/__init__.py
@@ -6,7 +6,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/setup/imap.py b/pykolab/setup/imap.py
index 29df9a4..85b884f 100644
--- a/pykolab/setup/imap.py
+++ b/pykolab/setup/imap.py
@@ -6,7 +6,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/setup/ldap_setup.py b/pykolab/setup/ldap_setup.py
index 94adbe3..8874753 100644
--- a/pykolab/setup/ldap_setup.py
+++ b/pykolab/setup/ldap_setup.py
@@ -6,7 +6,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/tests/__init__.py b/pykolab/tests/__init__.py
index b13b0e9..554b214 100644
--- a/pykolab/tests/__init__.py
+++ b/pykolab/tests/__init__.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/tests/calendar.py b/pykolab/tests/calendar.py
index d424762..99a79e6 100644
--- a/pykolab/tests/calendar.py
+++ b/pykolab/tests/calendar.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/tests/constants.py b/pykolab/tests/constants.py
index 8ecd4af..0a85299 100644
--- a/pykolab/tests/constants.py
+++ b/pykolab/tests/constants.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/tests/contacts.py b/pykolab/tests/contacts.py
index 49bdd0e..1d05dec 100644
--- a/pykolab/tests/contacts.py
+++ b/pykolab/tests/contacts.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/tests/create-contacts.py b/pykolab/tests/create-contacts.py
index 7641a36..6837f00 100644
--- a/pykolab/tests/create-contacts.py
+++ b/pykolab/tests/create-contacts.py
@@ -9,7 +9,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/tests/mail.py b/pykolab/tests/mail.py
index 15a81c3..a9888f8 100644
--- a/pykolab/tests/mail.py
+++ b/pykolab/tests/mail.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/tests/zpush/__init__.py b/pykolab/tests/zpush/__init__.py
index bfa34b5..6794725 100644
--- a/pykolab/tests/zpush/__init__.py
+++ b/pykolab/tests/zpush/__init__.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/tests/zpush/test_000_000.py b/pykolab/tests/zpush/test_000_000.py
index 8c8b07d..e0969c2 100644
--- a/pykolab/tests/zpush/test_000_000.py
+++ b/pykolab/tests/zpush/test_000_000.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/tests/zpush/test_000_001.py b/pykolab/tests/zpush/test_000_001.py
index 9a427f8..c7bfbb6 100644
--- a/pykolab/tests/zpush/test_000_001.py
+++ b/pykolab/tests/zpush/test_000_001.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pykolab/translate.py b/pykolab/translate.py
index 3d34a28..c4d5506 100644
--- a/pykolab/translate.py
+++ b/pykolab/translate.py
@@ -5,7 +5,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/setup-kolab.py b/setup-kolab.py
index 54b3e29..8dd8416 100755
--- a/setup-kolab.py
+++ b/setup-kolab.py
@@ -7,7 +7,7 @@
#
# This program 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 2 only
+# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of