diff options
-rw-r--r-- | pykolab/__init__.py | 2 | ||||
-rw-r--r-- | pykolab/base.py | 5 | ||||
-rw-r--r-- | pykolab/cli/__init__.py | 2 | ||||
-rw-r--r-- | pykolab/setup/__init__.py | 2 | ||||
-rw-r--r-- | pykolab/setup/imap.py | 2 | ||||
-rw-r--r-- | pykolab/setup/ldap_setup.py | 2 | ||||
-rw-r--r-- | pykolab/tests/__init__.py | 2 | ||||
-rw-r--r-- | pykolab/tests/calendar.py | 2 | ||||
-rw-r--r-- | pykolab/tests/constants.py | 2 | ||||
-rw-r--r-- | pykolab/tests/contacts.py | 2 | ||||
-rw-r--r-- | pykolab/tests/create-contacts.py | 2 | ||||
-rw-r--r-- | pykolab/tests/mail.py | 2 | ||||
-rw-r--r-- | pykolab/tests/zpush/__init__.py | 2 | ||||
-rw-r--r-- | pykolab/tests/zpush/test_000_000.py | 6 | ||||
-rw-r--r-- | pykolab/tests/zpush/test_000_001.py | 2 | ||||
-rw-r--r-- | pykolab/translate.py | 2 |
16 files changed, 20 insertions, 19 deletions
diff --git a/pykolab/__init__.py b/pykolab/__init__.py index 7c0b4a5..135d198 100644 --- a/pykolab/__init__.py +++ b/pykolab/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/base.py b/pykolab/base.py index dd112a2..e5b0884 100644 --- a/pykolab/base.py +++ b/pykolab/base.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # @@ -17,9 +17,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -from pykolab.conf import Defaults, Runtime -import pykolab.conf - class PyKolabBase(object): def __init__(self, pykolab): diff --git a/pykolab/cli/__init__.py b/pykolab/cli/__init__.py index d71dca1..40fb20b 100644 --- a/pykolab/cli/__init__.py +++ b/pykolab/cli/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/setup/__init__.py b/pykolab/setup/__init__.py index 73859fb..4dfda90 100644 --- a/pykolab/setup/__init__.py +++ b/pykolab/setup/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/setup/imap.py b/pykolab/setup/imap.py index 6165259..29df9a4 100644 --- a/pykolab/setup/imap.py +++ b/pykolab/setup/imap.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/setup/ldap_setup.py b/pykolab/setup/ldap_setup.py index cc42a81..94adbe3 100644 --- a/pykolab/setup/ldap_setup.py +++ b/pykolab/setup/ldap_setup.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/tests/__init__.py b/pykolab/tests/__init__.py index fe8d8db..b13b0e9 100644 --- a/pykolab/tests/__init__.py +++ b/pykolab/tests/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/tests/calendar.py b/pykolab/tests/calendar.py index 80f5d3d..d424762 100644 --- a/pykolab/tests/calendar.py +++ b/pykolab/tests/calendar.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/tests/constants.py b/pykolab/tests/constants.py index 3053964..8ecd4af 100644 --- a/pykolab/tests/constants.py +++ b/pykolab/tests/constants.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/tests/contacts.py b/pykolab/tests/contacts.py index 796e804..49bdd0e 100644 --- a/pykolab/tests/contacts.py +++ b/pykolab/tests/contacts.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/tests/create-contacts.py b/pykolab/tests/create-contacts.py index 5423faa..7641a36 100644 --- a/pykolab/tests/create-contacts.py +++ b/pykolab/tests/create-contacts.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Paul James Adams <adams a kolabsys.com> # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> diff --git a/pykolab/tests/mail.py b/pykolab/tests/mail.py index bbaf1e9..15a81c3 100644 --- a/pykolab/tests/mail.py +++ b/pykolab/tests/mail.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/tests/zpush/__init__.py b/pykolab/tests/zpush/__init__.py index 0bbb0ff..bfa34b5 100644 --- a/pykolab/tests/zpush/__init__.py +++ b/pykolab/tests/zpush/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/tests/zpush/test_000_000.py b/pykolab/tests/zpush/test_000_000.py index ed40ca9..8c8b07d 100644 --- a/pykolab/tests/zpush/test_000_000.py +++ b/pykolab/tests/zpush/test_000_000.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # @@ -75,6 +75,10 @@ class Test_000_000(object): self.suite_num = "000" self.suite_test_num = "000" + self.log.info("About to execute preperation task #000 in Test Suite #000"); + self.log.info("We will assume the start situation has been configured"); + self.log.info("such as is described in the documentation"); + if not conf: self.conf = Conf() self.conf.finalize_conf() diff --git a/pykolab/tests/zpush/test_000_001.py b/pykolab/tests/zpush/test_000_001.py index c46d7e1..9a427f8 100644 --- a/pykolab/tests/zpush/test_000_001.py +++ b/pykolab/tests/zpush/test_000_001.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # diff --git a/pykolab/translate.py b/pykolab/translate.py index 6386912..3d34a28 100644 --- a/pykolab/translate.py +++ b/pykolab/translate.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com) +# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com> # |