Request 1796 (revoked)

Overview

Request 1796 (revoked)

fix for setup-kolab

Created by tpokorra over 8 years ago
In state revoked
Open review for Admin

Submit pykolab

Submit package home:tpokorra:branches:Kolab:16 / pykolab to package Kolab:16 / pykolab

pykolab.spec Changed

@@ -2,10 +2,6 @@
 #!BuildIgnore: systemd
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global py2 2
-%endif
-
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %if 0%{?suse_version} || 0%{?fedora} > 17 || 0%{?rhel} > 6
@@ -33,7 +29,7 @@
 
 Summary: Kolab Groupware Solution
 Name: pykolab
-Version: 0.8.23
+Version: 0.8.4
 Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/System
@@ -42,7 +38,8 @@
 Source0: pykolab-%{version}.tar.gz
 Source1: pykolab.logrotate
 
-Patch0001: 0001-Add-footer_sender_exceptions-option-T850567.patch
+Patch0001: pykolab-0.8-patch-out-manticore.patch
+Patch0002: pykolab-0.8.4-patch-freshclam-subprocess.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
@@ -68,33 +65,44 @@
 BuildRequires: MySQL-python
 %endif
 
-BuildRequires: python%{?py2}
-BuildRequires: python%{?py2}-augeas
-BuildRequires: python%{?py2}-gnupg
-BuildRequires: python%{?py2}-icalendar
-BuildRequires: python%{?py2}-kolab >= 2.0
-BuildRequires: python%{?py2}-kolabformat
-BuildRequires: python%{?py2}-ldap
-BuildRequires: python%{?py2}-nose
-BuildRequires: python%{?py2}-pep8
-BuildRequires: python%{?py2}-pyasn1
-BuildRequires: python%{?py2}-pyasn1-modules
-%if 0%{?rhel} < 8 && 0%{?fedora} < 1
+BuildRequires: python
+BuildRequires: python-augeas
+BuildRequires: python-gnupg
+BuildRequires: python-icalendar
+BuildRequires: python-kolab
+BuildRequires: python-kolabformat
+BuildRequires: python-ldap
+BuildRequires: python-nose
+BuildRequires: python-pep8
+BuildRequires: python-pyasn1
+BuildRequires: python-pyasn1-modules
+
+%if 0%{?suse_version}
+BuildRequires: python-pytz
+%else
 BuildRequires: pytz
+%endif
+
+BuildRequires: python-sievelib
+BuildRequires: python-sqlalchemy
+
+%if 0%{?fedora} >= 23
+# Fedora 23 has python2-twisted and python-twisted
+BuildRequires: python-twisted
 %else
-BuildRequires: python%{?py2}-pytz
+BuildRequires: python-twisted-core
+%endif
+BuildRequires: python-tzlocal
+
+%if 0%{?fedora} >= 21
+# Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
+BuildRequires: qca
 %endif
-BuildRequires: python%{?py2}-sievelib
-BuildRequires: python%{?py2}-six
-BuildRequires: python%{?py2}-sqlalchemy
-BuildRequires: python%{?py2}-twisted-core
-BuildRequires: python%{?py2}-tzlocal
 
 Requires: kolab-cli = %{version}-%{release}
-Requires: python%{?py2}-ldap >= 2.4
-Requires: python%{?py2}-pyasn1
-Requires: python%{?py2}-pyasn1-modules
-Requires: python%{?py2}-six
+Requires: python-ldap >= 2.4
+Requires: python-pyasn1
+Requires: python-pyasn1-modules
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/sbin/usermod
 Requires(pre): /usr/sbin/groupadd
@@ -234,7 +242,11 @@
 %prep
 %setup -q
 
+%if 0%{?kolab_enterprise}
 %patch0001 -p1
+%endif
+
+%patch0002 -p1
 
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
@@ -571,66 +583,6 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
-* Tue Feb 8 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.23-1
-- Release of version 0.8.23
-
-* Fri Feb 4 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.22-1
-- Release of version 0.8.22
-
-* Thu Feb 3 2022 Christoph Erhardt <kolab@sicherha.de> - 0.8.20-2
-- Fix TypeError in logger
-
-* Thu Feb 3 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.20-1
-- Release of version 0.8.20
-
-* Mon Mar 2 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.18-1
-- Release of version 0.8.18
-
-* Wed Dec 4 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.17-1
-- Release of version 0.8.17
-- Require python-six
-
-* Mon Nov 18 2019 Daniel Hoffend <dh@dotlan.net> - 0.8.16-2
-- roundcubemail plugin owncload is no longer part of roundcubemail-plugins-kolab
-- Fixes T5665: kolabd should now terminate its child processes on exit
-- restore system umask after fork (fix T5659)
-
-* Mon Nov 18 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.16-1
-- Release of version 0.8.16
-
-* Tue Sep 24 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.15-1
-- Release of version 0.8.15
-
-* Fri Aug 16 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.14-1
-* Release of version 0.8.14
-
-* Tue Jun 4 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.12-1
-- Release of version 0.8.12
-
-* Tue May 21 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.11-1
-- Release of version 0.8.11
-
-* Fri Jul 27 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.10-1
-- Release of version 0.8.10
-
-* Thu May 17 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.9-1
-- Release of version 0.8.9
-
-* Thu Mar 8 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.8-1
-- Release of version 0.8.8
-
-* Tue Dec 13 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.7-1
-- Release of version 0.8.7
-
-* Fri Nov 18 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.6-1
-- Release of version 0.8.6
-
-* Thu Oct 06 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.5-1
-- Release of version 0.8.5
-
-* Wed Oct 05 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.4-3
-- Add a patch for T1414: Set LDAP TIMEOUT option only on "immediate" connection
-
 * Tue Oct 04 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.4-2
 - Add a patch that fixes setup-kolab again, error in call of subprocess for freshclam

0001-Add-footer_sender_exceptions-option-T850567.patch Deleted

@@ -1,49 +0,0 @@
-From a9f988dad24b43d3af1da6a009cb4d14a22c9204 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Wed, 26 Jul 2023 15:27:42 +0200
-Subject: PATCH 1/6 Add footer_sender_exceptions option (T850567)
-
-Summary: Example: `footer_sender_exceptions = NONE, *.kolab.ch, kolab.ch`
-
-Reviewers: #pykolab_developers, mollekopf
-
-Reviewed By: #pykolab_developers, mollekopf
-
-Subscribers: mollekopf, #pykolab_developers
-
-Differential Revision: https://git.kolab.org/D4463
----
- wallace/module_footer.py | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/wallace/module_footer.py b/wallace/module_footer.py
-index 96e8cf6..75b7029 100644
---- a/wallace/module_footer.py
-+++ b/wallace/module_footer.py
-@@ -114,6 +114,23 @@ def execute(*args, **kw):
- footer_position = conf.get('wallace', 'footer_position')
- footer_html_file = conf.get('wallace', 'footer_html')
- footer_text_file = conf.get('wallace', 'footer_text')
-+ sender_exceptions = conf.get('wallace', 'footer_sender_exceptions')
-+
-+ if sender_exceptions:
-+ sender = message.get("X-Kolab-From")
-+ log.debug("Checking sender %r" % (sender), level=8)
-+
-+ if sender:
-+ for item in sender_exceptions.split(','):
-+ item = item.strip()
-+ regex = '@' + item.replace('*', '^@+').replace('.', '\\.') + '$'
-+ if item == 'NONE':
-+ regex = '^<>$'
-+
-+ if re.search(regex, sender):
-+ log.debug("Sender matches exception %s" % (item), level=8)
-+ exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','footer', filepath))
-+ return
- 
- if not os.path.isfile(footer_text_file) and not os.path.isfile(footer_html_file):
- log.warning(_("No contents configured for footer module"))
--- 
-2.41.0
-

cyrus-imapd.conf-cert-paths.patch Changed

@@ -1,27 +1,6 @@
-diff -ur pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl pykolab-0.8.6/share/templates/guam.sys.config.tpl
---- pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl	2016-11-18 12:24:34.000000000 +0100
-+++ pykolab-0.8.6/share/templates/guam.sys.config.tpl	2016-11-18 13:35:14.350503922 +0100
-@@ -26,7 +26,7 @@
-                             },
-                             {
-                                 tls_config, 
--                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
-+                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
-                                 
-                             }
-                         
-@@ -43,7 +43,7 @@
-                             },
-                             {
-                                 tls_config, 
--                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
-+                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
-                                 
-                             }
-                         
-diff -ur pykolab-0.8.6.orig/share/templates/imapd.conf.tpl pykolab-0.8.6/share/templates/imapd.conf.tpl
---- pykolab-0.8.6.orig/share/templates/imapd.conf.tpl	2016-11-18 12:24:34.000000000 +0100
-+++ pykolab-0.8.6/share/templates/imapd.conf.tpl	2016-11-18 13:34:48.872221218 +0100
+diff -ur pykolab-0.7.12.orig/share/templates/imapd.conf.tpl pykolab-0.7.12/share/templates/imapd.conf.tpl
+--- pykolab-0.7.12.orig/share/templates/imapd.conf.tpl	2015-05-13 14:52:54.000000000 +0200
++++ pykolab-0.7.12/share/templates/imapd.conf.tpl	2015-05-13 15:35:12.623343019 +0200
 @@ -6,8 +6,8 @@
  sasl_pwcheck_method: saslauthd
  sasl_mech_list: PLAIN LOGIN
@@ -33,3 +12,4 @@
  # uncomment this if you're operating in a DSCP environment (RFC-4594)
  # qosmarking: af13
  auth_mech: pts
+Only in pykolab-0.7.12/share/templates: imapd.conf.tpl.orig

pykolab-0.8-patch-out-manticore.patch Added

pykolab-0.8.4-patch-freshclam-subprocess.patch Added

debian.changelog Changed

@@ -1,157 +1,3 @@
-pykolab (0.8.23-0~kolab1) unstable; urgency=low
-
- * Release of version 0.8.23
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Tue, 8 Feb 2022 01:49:00 +0100
-
-pykolab (0.8.22-0~kolab1) unstable; urgency=low
-
- * Release of version 0.8.22
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Fri, 4 Feb 2022 01:49:00 +0100
-
-pykolab (0.8.20-0~kolab2) unstable; urgency=low
-
- * Fix TypeError in logger
-
- -- Christoph Erhardt <kolab@sicherha.de> Thu, 03 Feb 2022 19:07:22 +0100
-
-pykolab (0.8.20-0~kolab1) unstable; urgency=low
-
- * Release of version 0.8.20
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Thu, 3 Feb 2022 01:49:00 +0100
-
-pykolab (0.8.19-0~kolab1) unstable; urgency=low
-
- * Release of version 0.8.19
-
- -- Christian Mollekopf <mollekopf@kolabsys.com> Wed, 30 Sep 2020 01:49:00 +0100
-
-pykolab (0.8.18-0~kolab2) unstable; urgency=low
-
- * Release of version 0.8.18
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Mon, 2 Mar 2020 01:49:00 +0100
-
-pykolab (0.8.17-0~kolab2) unstable; urgency=low
-
- * Require python-six
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Wed, 4 Dec 2019 01:49:00 +0100
-
-pykolab (0.8.16-0~kolab1) unstable; urgency=low
-
- * Release of version 0.8.16
- * roundcubemail plugin owncload is no longer part of roundcubemail-plugins-kolab
- * Fixes T5665: kolabd should now terminate its child processes on exit
- * restore system umask after fork (fix T5659)
-
- -- Daniel Hoffend <dh@dotlan.net> Mon, 18 Nov 2019 16:56:02 +0100
-
-pykolab (0.8.15-0~kolab2) unstable; urgency=low
-
- * Fix init scripts for kolab-saslauthd and wallace
-
- -- Daniel Hoffend <dh@dotlan.net> Fri, 15 Nov 2019 01:35:13 +0100
-
-pykolab (0.8.15-0~kolab1) unstable; urgency=low
-
- * Release of version 0.8.15
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Tue, 24 Sep 2019 01:49:00 +0100
-
-pykolab (0.8.14-0~kolab2) unstable; urgency=low
-
- * Release of version 0.8.14
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Fri, 16 Aug 2019 01:49:00 +0100
-
-pykolab (0.8.13-0~kolab5) unstable; urgency=low
-
- * Require both python-pymysql and python-mysqldb
- * Fix PHP setup on Xenial
- * Fix MySQL setup on Bionic
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Mon, 29 Jul 2019 01:49:00 +0100
-
-pykolab (0.8.13-0~kolab3) unstable; urgency=low
-
- * Release of version 0.8.13
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Thu, 20 Jun 2019 01:49:00 +0100
-
-pykolab (0.8.12-0~kolab5) unstable; urgency=low
-
- * Release of version 0.8.12
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Tue, 4 Jun 2019 01:49:00 +0100
-
-pykolab (0.8.11-0~kolab5) unstable; urgency=low
-
- * Fix unicode templates for roundcube
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Tue, 21 May 2019 01:49:00 +0100
-
-pykolab (0.8.11-0~kolab3) unstable; urgency=low
-
- * Add hotfix for rejection of all senders (T5363)
-
- -- Christoph Erhardt <kolab@sicherha.de> Sun, 19 May 2019 09:54:51 +0200
-
-pykolab (0.8.11-0~kolab2) unstable; urgency=low
-
- * Release of version 0.8.11
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Fri, 17 May 2019 01:49:00 +0100
-
-pykolab (0.8.10-0~kolab2) unstable; urgency=low
-
- * Correct dependencies for Ubuntu 18.04
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Wed, 3 Oct 2018 01:49:00 +0100
-
-pykolab (0.8.10-0~kolab1) unstable; urgency=low
-
- * Upstream release of version 0.8.10
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Fri, 27 Jul 2018 01:49:00 +0100
-
-pykolab (0.8.9-0~kolab1) unstable; urgency=low
-
- * Upstream release of version 0.8.9
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Thu, 17 May 2018 01:49:00 +0100
-
-pykolab (0.8.8-0~kolab1) unstable; urgency=low
-
- * Upstream release of version 0.8.8
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Thu, 8 Mar 2018 01:49:00 +0100
-
-pykolab (0.8.7-0~kolab2) unstable; urgency=low
-
- * pykolab requires now python-pymysql because /usr/lib/postfix/kolab_smtp_access_policy needs module pymysql on Ubuntu Xenial
-
- -- Timotheus Pokorra <tp@tbits.net> Thu, 25 May 2017 01:49:00 +0100
-
-pykolab (0.8.7-0~kolab1) unstable; urgency=low
-
- * Upstream release of version 0.8.7
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Tue, 13 Dec 2016 01:49:00 +0100
-
-pykolab (0.8.6-0~kolab1) unstable; urgency=low
-
- * Upstream release of version 0.8.6
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Fri, 18 Nov 2016 01:49:00 +0100
-
-pykolab (0.8.5-0~kolab1) unstable; urgency=low
-
- * Upstream release of version 0.8.5
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Thu, 6 Oct 2016 01:49:00 +0100
 
 pykolab (0.8.4-0~kolab1) unstable; urgency=low

debian.control Changed

debian.series Changed

debian.tar.gz/kolab-saslauthd.init Changed

debian.tar.gz/kolab-server.init Changed

debian.tar.gz/wallace.init Changed

pykolab-0.8.23.tar.gz/.flake8 Deleted

pykolab-0.8.23.tar.gz/.pylintrc Deleted

pykolab-0.8.23.tar.gz/conf/signature_IT.html Deleted

pykolab-0.8.23.tar.gz/conf/signature_IT.txt Deleted

pykolab-0.8.23.tar.gz/pykolab/auth/plesk Deleted

pykolab-0.8.23.tar.gz/pykolab/auth/plesk/__init__.py Deleted

@@ -1,161 +0,0 @@
-# Copyright 2010-2017 Kolab Systems AG (http://www.kolabsys.com)
-#
-# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
-# Christian Mollekopf <mollekopf@kolabsys.com>
-#
-# 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, either version 3 of the License, 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
-# 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 this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-import datetime
-
-import sqlalchemy
-
-from sqlalchemy import Column
-from sqlalchemy import ForeignKey
-from sqlalchemy import Integer
-from sqlalchemy import String
-from sqlalchemy import Text
-
-from sqlalchemy import MetaData
-from sqlalchemy import Table
-
-from sqlalchemy import desc
-from sqlalchemy import create_engine
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import mapper
-
-try:
- from sqlalchemy.orm import relationship
-except:
- from sqlalchemy.orm import relation as relationship
-
-try:
- from sqlalchemy.orm import sessionmaker
-except:
- from sqlalchemy.orm import create_session
-
-import pykolab
-
-from pykolab import utils
-from pykolab.translate import _
-
-# pylint: disable=invalid-name
-conf = pykolab.getConf()
-log = pykolab.getLogger('pykolab.auth.plesk')
-
-metadata = MetaData()
-
-##
-## Classes
-##
-
-DeclarativeBase = declarative_base()
-
-class Object(DeclarativeBase):
- __tablename__ = 'objects'
-
- id = Column(Integer, primary_key=True)
- object_type = Column(String(256), index=True, nullable=False)
- object_name = Column(String(256), index=True, nullable=False)
-
- params = relationship('ObjectParam')
-
-class ObjectParam(DeclarativeBase):
- __tablename__ = 'object_params'
-
- id = Column(Integer, primary_key=True)
- object_id = Column(Integer, ForeignKey('objects.id', ondelete="CASCADE"), nullable=False)
- key = Column(String(256), index=True, nullable=False)
- value = Column(Text, nullable=False)
-
-class Plesk(pykolab.base.Base):
- db = None
-
- def __init__(self, domain=None):
- self.domain = domain
-
- def connect(self):
- self.__init_db()
-
- def find_recipient(self, address="*", search_attrs=None):
- """
- Given an address string or list of addresses, find one or more valid
- recipients.
- """
-
- log.debug(_("Finding recipient with filter %r") % (address), level=8)
-
- _objects = self.db.query(Object).filter_by(object_name=address).all()
- return map(lambda _object: (str)(_object.id), _objects)
-
- def get_entry_attribute(self, entry_id, attribute):
- """
- Get an attribute for an entry.
-
- Return the attribute value if successful, or None if not.
- """
-
- entry_attrs = self.get_entry_attributes(entry_id, attribute)
-
- if attribute in entry_attrs:
- return entry_attrsattribute
- elif attribute.lower() in entry_attrs:
- return entry_attrsattribute.lower()
- else:
- return None
-
- def get_entry_attributes(self, entry, attributes):
- print(entry, attributes)
- _object = None
- if isinstance(entry, dict):
- _object = self.db.query(Object).get((int)(entry'dn'))
- else:
- _object = self.db.query(Object).get((int)(entry))
-
- if _object is None:
- return None
-
- attrs = {'id': entry}
-
- attrs'mail' = _object.object_name
-
- for param in _object.params:
- if param.key not in attrs:
- attrsparam.key = 
-
- attrsparam.key.append(param.value)
-
- return attrs
-
- def _disconnect(self):
- self.db.close()
-
- def _find_user_dn(self, recipient_address, kolabuser=False):
- _object = self.db.query(Object).filter_by(object_name=recipient_address).first()
-
- if _object is None:
- return None
-
- return (str)(_object.id)
-
- def __init_db(self):
- if self.db is not None:
- return
-
- db_uri = conf.get('plesk', 'sql_uri')
-
- echo = conf.debuglevel > 8
- engine = create_engine(db_uri, echo=echo)
- Session = sessionmaker(bind=engine)
- self.db = Session()

pykolab-0.8.23.tar.gz/tests/unit/test-012-wallace_footer.py Deleted

@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import pykolab
-import unittest
-
-from wallace import module_footer as Footer
-
-conf = pykolab.getConf()
-
-if not hasattr(conf, 'defaults'):
- conf.finalize_conf()
-
-
-class TestWallaceFooter(unittest.TestCase):
-
- def test_001_append_footer_plain(self):
- # bottom
- content = Footer.append_footer('test', 'footer')
- self.assertEqual('test\n\n-- \nfooter', content)
-
- # top
- content = Footer.append_footer('test', 'footer', 'top')
- self.assertEqual('footer\n\ntest', content)
-
- def test_001_append_footer_html(self):
- foot = "\n\nfooter\n\n"
-
- # bottom
- content = Footer.append_footer('test', 'footer', None, True)
- self.assertEqual('<html><body>test' + foot + '</body></html>', content)
-
- content = Footer.append_footer('<body>test</body>', 'footer', None, True)
- self.assertEqual('<body>test' + foot + '</body>', content)
-
- content = Footer.append_footer('<BODY>test</BODY>', 'footer', None, True)
- self.assertEqual('<BODY>test' + foot + '</BODY>', content)
-
- # top
- content = Footer.append_footer('test', 'footer', 'top', True)
- self.assertEqual('<html><body>' + foot + 'test</body></html>', content)
-
- content = Footer.append_footer('<body color=red">test', 'footer', 'top', True)
- self.assertEqual('<body color=red">' + foot + 'test', content)
-
- content = Footer.append_footer('<BODY\ncolor=red">test', 'footer', 'top', True)
- self.assertEqual('<BODY\ncolor=red">' + foot + 'test', content)

pykolab-0.8.23.tar.gz/wallace/module_signature.py Deleted

@@ -1,254 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2010-2019 Kolab Systems AG (http://www.kolabsys.com)
-#
-# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
-#
-# 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, either version 3 of the License, 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
-# 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 this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-import json
-import os
-import re
-import tempfile
-
-from email.encoders import encode_quopri
-from email.parser import Parser
-from email.utils import getaddresses
-
-import modules
-import pykolab
-
-from pykolab.auth import Auth
-from pykolab.translate import _
-
-# pylint: disable=invalid-name
-log = pykolab.getLogger('pykolab.wallace/signature')
-extra_log_params = {'qid': '-'}
-log = pykolab.logger.LoggerAdapter(log, extra_log_params)
-conf = pykolab.getConf()
-
-mybasepath = '/var/spool/pykolab/wallace/signature/'
-
-
-def __init__():
- modules.register('signature', execute, description=description())
-
-
-def description():
- return """Append a signature to messages."""
-
-
-def set_part_content(part, content):
- # Reset old encoding and use quoted-printable (#5414)
- del part'Content-Transfer-Encoding'
- part.set_payload(content)
- encode_quopri(part)
-
- return True
-
-
-def attr_resolve(sender_info, attr):
- try:
- attr, attr_val = attr.split(':')
- except ValueError:
- return None
-
- auth = Auth()
- auth.connect()
-
- values = 
-
- if not isinstance(sender_infoattr, list):
- sender_infoattr = sender_infoattr
-
- for sender_attr_val in sender_infoattr:
- values.append(auth.get_entry_attribute(None, sender_attr_val, attr_val))
-
- return ", ".join(values)
-
-
-# pylint: disable=too-many-branches,too-many-locals,too-many-statements
-def execute(*args, **kw): # noqa: C901
- global extra_log_params
-
- # TODO: Test for correct call.
- filepath = args0
-
- extra_log_params'qid' = os.path.basename(filepath)
-
- if not os.path.isdir(mybasepath):
- os.makedirs(mybasepath)
-
- for stage in 'incoming', 'ACCEPT':
- if not os.path.isdir(os.path.join(mybasepath, stage)):
- os.makedirs(os.path.join(mybasepath, stage))
-
- if 'stage' in kw:
- log.debug(_("Issuing callback after processing to stage %s") % (kw'stage'), level=8)
- log.debug(_("Testing cb_action_%s()") % (kw'stage'), level=8)
- if hasattr(modules, 'cb_action_%s' % (kw'stage')):
- log.debug(_("Attempting to execute cb_action_%s()") % (kw'stage'), level=8)
- exec('modules.cb_action_%s(%r, %r)' % (kw'stage', 'signature', filepath))
- return
-
- log.debug(_("Executing module signature for %r, %r") % (args, kw), level=8)
-
- new_filepath = os.path.join(
- '/var/spool/pykolab/wallace/signature/incoming',
- os.path.basename(filepath)
- )
-
- os.rename(filepath, new_filepath)
- filepath = new_filepath
-
- # parse message
- message = Parser().parse(open(filepath, 'r'))
-
- sender_address = 
- address for displayname, address in getaddresses(message.get_all('X-Kolab-From'))
- 0
-
- auth = Auth()
- auth.connect()
-
- sender_dn = auth.find_recipient(sender_address)
- if not sender_dn:
- exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT', 'signature', filepath))
- return
-
- sender_info = auth.get_entry_attributes(None, sender_dn, '*', 'entrydn', 'manager')
-
- log.debug("Sender info: %r" % (sender_info), level=7)
-
- signature_rules = conf.get_raw('wallace', 'signature_rules')
-
- if signature_rules:
- signature_rules = json.loads(signature_rules)
-
- log.debug("Signature rules: %r" % (signature_rules), level=7)
-
- signature_html = None
- signature_text = None
-
- sig_html_conf = conf.get_raw('wallace', 'signature_file_html')
- sig_text_conf = conf.get_raw('wallace', 'signature_file_text')
-
- if sig_html_conf and sig_text_conf:
- _sig_html_conf = sig_html_conf % sender_info
- _sig_text_conf = sig_text_conf % sender_info
-
- if not os.path.exists(_sig_html_conf):
- _sig_html_conf = '/etc/kolab/signature.d/default.html'
-
- if not os.path.exists(_sig_text_conf):
- _sig_text_conf = '/etc/kolab/signature.d/default.txt'
-
- if os.path.exists(_sig_html_conf):
- signature_html = open(_sig_html_conf, 'r').read()
-
- if os.path.exists(_sig_text_conf):
- signature_text = open(_sig_text_conf, 'r').read()
-
- if not signature_html and not signature_text and signature_rules is not None:
- for signature_rule in signature_rules:
- try:
- for attr, regex in signature_rule.items():
- if attr == "html":
- if not os.path.exists(signature_rule'html'):
- raise ValueError
- continue
-
- if attr == "text":
- if not os.path.exists(signature_rule'text'):
- raise ValueError
- continue
-
- if attr in sender_info and re.match(regex, sender_infoattr, flags=re.IGNORECASE):
- success = False
-
- while not success:
- try:
- signature_html = open(signature_rule'html', 'r').read() % sender_info
- signature_text = open(signature_rule'text', 'r').read() % sender_info
-
- success = True
-
- except KeyError as errmsg:
- sender_infoerrmsg = attr_resolve(sender_info, errmsg)
- except ValueError:
- continue
-
- if signature_html is None and signature_text is None:
- exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT', 'signature', filepath))
- return
-
- signature_added = False
-
- try:
- _signature_added = message.get("X-Wallace-Signature")
-
- # pylint: disable=broad-except
- except Exception:
- pass
-
- if _signature_added == "YES":
- exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','signature', filepath))
- return
-
- for part in message.walk():
- disposition = None
-
- try:
- content_type = part.get_content_type()
-
- # pylint: disable=broad-except
- except Exception:
- continue
-
- try:
- disposition = part.get("Content-Disposition")
-
- # pylint: disable=broad-except
- except Exception:
- pass
-
- log.debug("Walking message part: %s; disposition = %r" % (content_type, disposition), level=8)
-
- if disposition is not None:
- continue
-
- if content_type == "text/plain":
- content = part.get_payload(decode=True)
- content += "\n\n-- \n%s" % (signature_text)
- signature_added = set_part_content(part, content)
-
- elif content_type == "text/html":
- content = part.get_payload(decode=True)
- append = "\n\n" + signature_html
- if "</body>" in content:
- content = content.replace("</body>", append + "</body>")
- else:
- content = "<html><body>" + content + append + "</body></html>"
- signature_added = set_part_content(part, content)
-
- if signature_added:
- log.debug("Signature attached.", level=8)
- message.add_header("X-Wallace-Signature", "YES")
-
- (fp, new_filepath) = tempfile.mkstemp(dir="/var/spool/pykolab/wallace/signature/ACCEPT")
- os.write(fp, message.as_string())
- os.close(fp)
- os.unlink(filepath)
-
- exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','signature', new_filepath))

pykolab-0.8.23.tar.gz/.arclint -> pykolab-0.8.4.tar.gz/.arclint Changed

pykolab-0.8.23.tar.gz/bin/kolab_smtp_access_policy.py -> pykolab-0.8.4.tar.gz/bin/kolab_smtp_access_policy.py Changed

@@ -20,13 +20,15 @@
 
 import datetime
 import os
-import sqlalchemy
 import sys
 import time
 
 from optparse import OptionParser
 from ConfigParser import SafeConfigParser
 
+cache = None
+
+import sqlalchemy
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import Date
@@ -48,6 +50,8 @@
 from sqlalchemy.schema import Index
 from sqlalchemy.schema import UniqueConstraint
 
+sys.path = '..','.' + sys.path
+
 import pykolab
 
 from pykolab import utils
@@ -55,16 +59,12 @@
 from pykolab.constants import *
 from pykolab.translate import _
 
-cache = None
-
-sys.path = '..', '.' + sys.path
-
 # TODO: Figure out how to make our logger do some syslogging as well.
 log = pykolab.getLogger('pykolab.smtp_access_policy')
 
 # TODO: Removing the stdout handler would mean one can no longer test by
 # means of manual execution in debug mode.
-log.remove_stdout_handler()
+#log.remove_stdout_handler()
 
 conf = pykolab.getConf()
 
@@ -85,29 +85,27 @@
 
 session = None
 policy_result_table = Table(
- 'policy_result', metadata,
- Column('id', Integer, Sequence('seq_id_result'), primary_key=True),
- Column('key', String(16), nullable=False),
- Column('value', Boolean, nullable=False),
- Column('sender', String(254), nullable=True),
- Column('recipient', String(254), nullable=False),
- Column('sasl_username', String(64)),
- Column('sasl_sender', String(64)),
- Column('created', Integer, nullable=False),
- Column('data', PickleType, nullable=True),
- mysql_charset='utf8',
-)
+ 'policy_result', metadata,
+ Column('id', Integer, Sequence('seq_id_result'), primary_key=True),
+ Column('key', String(16), nullable=False),
+ Column('value', Boolean, nullable=False),
+ Column('sender', String(64), nullable=True),
+ Column('recipient', String(64), nullable=False),
+ Column('sasl_username', String(64)),
+ Column('sasl_sender', String(64)),
+ Column('created', Integer, nullable=False),
+ Column('data', PickleType, nullable=True),
+ )
 
 Index(
- 'fsrss',
- policy_result_table.c.key,
- policy_result_table.c.sender,
- policy_result_table.c.recipient,
- policy_result_table.c.sasl_username,
- policy_result_table.c.sasl_sender,
- unique=True
-)
-
+ 'fsrss',
+ policy_result_table.c.key,
+ policy_result_table.c.sender,
+ policy_result_table.c.recipient,
+ policy_result_table.c.sasl_username,
+ policy_result_table.c.sasl_sender,
+ unique=True
+ )
 
 class PolicyResult(object):
 def __init__(
@@ -119,7 +117,7 @@
 sasl_username=None,
 sasl_sender=None,
 data=None
- ):
+ ):
 
 self.key = key
 self.value = value
@@ -130,27 +128,24 @@
 self.created = (int)(time.time())
 self.data = data
 
-
 mapper(PolicyResult, policy_result_table)
 
 statistic_table = Table(
- 'statistic', metadata,
- Column('id', Integer, Sequence('seq_id_statistic'), primary_key=True),
- Column('sender', String(254), nullable=False),
- Column('recipient', String(254), nullable=False),
- Column('date', Date, nullable=False),
- Column('count', Integer, nullable=False),
- mysql_charset='utf8',
-)
+ 'statistic', metadata,
+ Column('id', Integer, Sequence('seq_id_statistic'), primary_key=True),
+ Column('sender', String(64), nullable=False),
+ Column('recipient', String(64), nullable=False),
+ Column('date', Date, nullable=False),
+ Column('count', Integer, nullable=False),
+ )
 
 Index(
- 'srd',
- statistic_table.c.sender,
- statistic_table.c.recipient,
- statistic_table.c.date,
- unique=True
-)
-
+ 'srd',
+ statistic_table.c.sender,
+ statistic_table.c.recipient,
+ statistic_table.c.date,
+ unique=True
+ )
 
 class Statistic(object):
 def __init__(self, sender, recipient, date=datetime.date.today(), count=0):
@@ -159,12 +154,10 @@
 self.date = date
 self.count = count
 
-
 mapper(Statistic, statistic_table)
 
-
 class PolicyRequest(object):
- email_address_keys = 'sender', 'recipient'
+ email_address_keys = 'sender', 'recipient' 
 recipients = 
 
 auth = None
@@ -184,7 +177,7 @@
 
 http://www.postfix.org/SMTPD_POLICY_README.html
 """
- for key in policy_request:
+ for key in policy_request.keys():
 
 # Normalize email addresses (they may contain recipient delimiters)
 if key in self.email_address_keys:
@@ -198,9 +191,7 @@
 
 else:
 if not policy_request'recipient'.strip() == '':
- self.recipients = list(
- set(self.recipients + policy_request'recipient')
- )
+ self.recipients = list(set(self.recipients + policy_request'recipient'))
 
 def add_request(self, policy_request={}):
 """
@@ -220,18 +211,18 @@
 pass
 
 log.debug(
- _("Adding policy request to instance %s") % (self.instance),
- level=8
- )
+ _("Adding policy request to instance %s") % (self.instance),
+ level=8
+ )
 
 # Normalize email addresses (they may contain recipient delimiters)
- if 'recipient' in policy_request:
- policy_request'recipient' = normalize_address(policy_request'recipient')
+ if policy_request.has_key('recipient'):
+ policy_request'recipient' = normalize_address(
+ policy_request'recipient'
+ )
 
 if not policy_request'recipient'.strip() == '':
- self.recipients = list(
- set(self.recipients + policy_request'recipient')
- )
+ self.recipients = list(set(self.recipients + policy_request'recipient'))
 
 def parse_ldap_dn(self, dn):
 """
@@ -253,16 +244,19 @@
 return None
 
 if len(ldap_dn) > 0:
- search_attrs = conf.get_list('kolab_smtp_access_policy', 'address_search_attrs')
+ search_attrs = conf.get_list(
+ 'kolab_smtp_access_policy',
+ 'address_search_attrs'
+ )
 
 rule_subject = self.auth.get_user_attributes(
- self.sasl_domain,
- {'dn': dn},
- search_attrs + 'objectclass'
- )
+ self.sasl_domain,
+ { 'dn': dn },
+ search_attrs + 'objectclass' 
+ )
 
 for search_attr in search_attrs:
- if search_attr in rule_subject:
+ if rule_subject.has_key(search_attr):
 if isinstance(rule_subjectsearch_attr, basestring):
 values.append(rule_subjectsearch_attr)
 else:
@@ -280,25 +274,30 @@
 
 parsed_uri = utils.parse_ldap_uri(uri)
 
- if parsed_uri is None:
+ if parsed_uri == None:
 return None
 
- (_protocol, _server, _port, _base_dn, _attrs, _scope, _filter) = parsed_uri
+ (_protocol, _server, _port, _base_dn, _attrs, _scope, _filter) = \
+ parsed_uri
 
 if len(_attrs) == 0:
- search_attrs = conf.get_list('kolab_smtp_access_policy', 'address_search_attrs')
+ search_attrs = conf.get_list(
+ 'kolab_smtp_access_policy',
+ 'address_search_attrs'
+ )
 else:
- search_attrs = _attrs
+ search_attrs = _attrs 
 
- self.auth._auth._bind()
+ users = 
 
+ self.auth._auth._bind()
 _users = self.auth._auth._search(
- _base_dn,
- scope=LDAP_SCOPE_scope,
- filterstr=_filter,
- attrlist=search_attrs + 'objectclass',
- override_search="_regular_search"
- )
+ _base_dn,
+ scope=LDAP_SCOPE_scope,
+ filterstr=_filter,
+ attrlist=search_attrs + 'objectclass' ,
+ override_search="_regular_search"
+ )
 
 for _user in _users:
 for search_attr in search_attrs:
@@ -323,7 +322,7 @@
 '$mydomains': expand_mydomains
 }
 
- rules = {'allow': , 'deny': }
+ rules = { 'allow': , 'deny': }
 
 if isinstance(policy, basestring):
 policy = policy
@@ -333,7 +332,7 @@
 # mapping the rule onto a key in "special_rule_values", a
 # dictionary with the corresponding value set to a function to
 # execute.
- if rule in special_rule_values:
+ if rule in special_rule_values.keys():
 special_rules = special_rule_valuesrule()
 if rule.startswith("-"):
 rules'deny'.extend(special_rules)
@@ -358,7 +357,7 @@
 # See if the value is an LDAP DN
 ldap_dn = self.parse_ldap_dn(_rule)
 
- if ldap_dn is not None and len(ldap_dn) > 0:
+ if not ldap_dn == None and len(ldap_dn) > 0:
 if _prefix == '-':
 rules'deny'.extend(ldap_dn)
 else:
@@ -366,7 +365,7 @@
 else:
 ldap_uri = self.parse_ldap_uri(_rule)
 
- if ldap_uri is not None and len(ldap_uri) > 0:
+ if not ldap_uri == None and len(ldap_uri) > 0:
 if _prefix == '-':
 rules'deny'.extend(ldap_uri)
 else:
@@ -422,42 +421,46 @@
 
 search_attrs = conf.get_list(self.sasl_domain, 'address_search_attrs')
 
- if search_attrs is None or \
+ if search_attrs == None or \
 (isinstance(search_attrs, list) and len(search_attrs) == 0):
 
 search_attrs = conf.get_list(self.sasl_domain, 'mail_attributes')
 
- if search_attrs is None or \
+ if search_attrs == None or \
 (isinstance(search_attrs, list) and len(search_attrs) == 0):
 
- search_attrs = conf.get_list('kolab_smtp_access_policy', 'address_search_attrs')
+ search_attrs = conf.get_list(
+ 'kolab_smtp_access_policy',
+ 'address_search_attrs'
+ )
 
- if search_attrs is None or \
+ if search_attrs == None or \
 (isinstance(search_attrs, list) and len(search_attrs) == 0):
 
+
 search_attrs = conf.get_list(
- conf.get('kolab', 'auth_mechanism'),
- 'mail_attributes'
- )
+ conf.get('kolab', 'auth_mechanism'),
+ 'mail_attributes'
+ )
 
 want_attrs = 
 
 for search_attr in search_attrs:
- if search_attr not in self.sasl_user:
+ if not self.sasl_user.has_key(search_attr):
 want_attrs.append(search_attr)
 
 if len(want_attrs) > 0:
 self.sasl_user.update(
- self.auth.get_user_attributes(
- self.sasl_domain,
- self.sasl_user,
- want_attrs
+ self.auth.get_user_attributes(
+ self.sasl_domain,
+ self.sasl_user,
+ want_attrs
+ )
 )
- )
 
 # Catch a user using one of its own alias addresses.
 for search_attr in search_attrs:
- if search_attr in self.sasl_user:
+ if self.sasl_user.has_key(search_attr):
 if isinstance(self.sasl_usersearch_attr, list):
 if self.sender.lower() in x.lower() for x in self.sasl_usersearch_attr:
 return True
@@ -476,7 +479,7 @@
 interested in.
 """
 
- if self.sasl_username is None:
+ if self.sasl_username == None:
 if not conf.allow_unauthenticated:
 reject(_("Unauthorized access not allowed"))
 else:
@@ -488,92 +491,93 @@
 # If we have an sasl_username, find the user object in the
 # authentication database, along with the attributes we are
 # interested in.
- if self.sasl_domain is None:
+ if self.sasl_domain == None:
 if len(self.sasl_username.split('@')) > 1:
 self.sasl_domain = self.sasl_username.split('@')1
 else:
 self.sasl_domain = conf.get('kolab', 'primary_domain')
- sasl_username = "%s@%s" % (
- self.sasl_username, self.sasl_domain
- )
+ sasl_username = "%s@%s" % (self.sasl_username, self.sasl_domain)
 
- if self.auth is None:
+ if self.auth == None:
 self.auth = Auth(self.sasl_domain)
 elif not self.auth.domain == self.sasl_domain:
 self.auth = Auth(self.sasl_domain)
 
- sasl_users = self.auth.find_recipient(sasl_username, domain=self.sasl_domain)
+ sasl_users = self.auth.find_recipient(
+ sasl_username,
+ domain=self.sasl_domain
+ )
 
 if isinstance(sasl_users, list):
 if len(sasl_users) == 0:
 log.error(_("Could not find recipient"))
 return False
 else:
- self.sasl_user = {'dn': sasl_users0}
+ self.sasl_user = { 'dn': sasl_users0 }
 elif isinstance(sasl_users, basestring):
- self.sasl_user = {'dn': sasl_users}
+ self.sasl_user = { 'dn': sasl_users }
 
 if not self.sasl_user'dn':
 # Got a final answer here, do the caching thing.
 cache_update(
- function='verify_sender',
- sender=self.sender,
- recipients=self.recipients,
- result=(int)(False),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ function='verify_sender',
+ sender=self.sender,
+ recipients=self.recipients,
+ result=(int)(False),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 reject(
- _("Could not find envelope sender user %s (511)") % (
- self.sasl_username
+ _("Could not find envelope sender user %s (511)") % (
+ self.sasl_username
+ )
 )
- )
 
 attrs = conf.get_list(self.sasl_domain, 'auth_attributes')
 
- if attrs is None or (isinstance(attrs, list) and len(attrs) == 0):
+ if attrs == None or (isinstance(attrs, list) and len(attrs) == 0):
 attrs = conf.get_list(
- conf.get('kolab', 'auth_mechanism'),
- 'auth_attributes'
- )
+ conf.get('kolab', 'auth_mechanism'),
+ 'auth_attributes'
+ )
 
 mail_attrs = conf.get_list(self.sasl_domain, 'mail_attributes')
- if mail_attrs is None or \
+ if mail_attrs == None or \
 (isinstance(mail_attrs, list) and len(mail_attrs) == 0):
 
 mail_attrs = conf.get_list(
- conf.get('kolab', 'auth_mechanism'),
- 'mail_attributes'
- )
+ conf.get('kolab', 'auth_mechanism'),
+ 'mail_attributes'
+ )
 
- if mail_attrs is not None:
+ if not mail_attrs == None:
 attrs.extend(mail_attrs)
 
 attrs.extend(
- 
- 'kolabAllowSMTPRecipient',
- 'kolabAllowSMTPSender'
- 
- )
+ 
+ 'kolabAllowSMTPRecipient',
+ 'kolabAllowSMTPSender'
+ 
+ )
 
 attrs = list(set(attrs))
 
 user_attrs = self.auth.get_user_attributes(
- self.sasl_domain,
- self.sasl_user,
- attrs
- )
+ self.sasl_domain,
+ self.sasl_user,
+ attrs
+ )
 
 user_attrs'dn' = self.sasl_user'dn'
 self.sasl_user = utils.normalize(user_attrs)
 log.debug(
- _("Obtained authenticated user details for %r: %r") % (
- self.sasl_user'dn',
- self.sasl_user.keys()
- ),
- level=8
- )
+ _("Obtained authenticated user details for %r: %r") % (
+ self.sasl_user'dn',
+ self.sasl_user.keys()
+ ),
+ level=8
+ )
 
 def verify_delegate(self):
 """
@@ -582,7 +586,7 @@
 """
 sender_is_delegate = False
 
- if self.sender_domain is None:
+ if self.sender_domain == None:
 if len(self.sender.split('@')) > 1:
 self.sender_domain = self.sender.split('@')1
 else:
@@ -592,159 +596,160 @@
 return True
 
 search_attrs = conf.get_list(self.sender_domain, 'mail_attributes')
- if search_attrs is None:
+ if search_attrs == None:
 search_attrs = conf.get_list(
- conf.get('kolab', 'auth_mechanism'),
- 'mail_attributes'
- )
+ conf.get('kolab', 'auth_mechanism'),
+ 'mail_attributes'
+ )
 
 sender_users = self.auth.find_recipient(
- self.sender,
- domain=self.sender_domain
- )
+ self.sender,
+ domain=self.sender_domain
+ )
 
 if isinstance(sender_users, list):
 if len(sender_users) > 1:
 # More then one sender user with this recipient address.
 # TODO: check each of the sender users found.
- self.sender_user = {'dn': sender_users0}
+ self.sender_user = { 'dn': sender_users0 }
 elif len(sender_users) == 1:
- self.sender_user = {'dn': sender_users}
+ self.sender_user = { 'dn': sender_users }
 else:
- self.sender_user = {'dn': False}
+ self.sender_user = { 'dn': False }
 
 elif isinstance(sender_users, basestring):
- self.sender_user = {'dn': sender_users}
+ self.sender_user = { 'dn': sender_users }
 
 if not self.sender_user'dn':
 cache_update(
- function='verify_sender',
- sender=self.sender,
- recipients=self.recipients,
- result=(int)(False),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ function='verify_sender',
+ sender=self.sender,
+ recipients=self.recipients,
+ result=(int)(False),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 reject(_("Could not find envelope sender user %s") % (self.sender))
 
 attrs = search_attrs
 attrs.extend(
- 
- 'kolabAllowSMTPRecipient',
- 'kolabAllowSMTPSender',
- 'kolabDelegate'
- 
- )
+ 
+ 'kolabAllowSMTPRecipient',
+ 'kolabAllowSMTPSender',
+ 'kolabDelegate'
+ 
+ )
 
 user_attrs = self.auth.get_user_attributes(
- self.sender_domain,
- self.sender_user,
- attrs
- )
+ self.sender_domain,
+ self.sender_user,
+ attrs
+ )
 
 user_attrs'dn' = self.sender_user'dn'
 self.sender_user = utils.normalize(user_attrs)
 
- if 'kolabdelegate' not in self.sender_user:
+ if not self.sender_user.has_key('kolabdelegate'):
 # Got a final answer here, do the caching thing.
- if cache is not False:
- cache_update(
- function='verify_sender',
- sender=self.sender,
- recipients=self.recipients,
- result=(int)(False),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ if not cache == False:
+ record_id = cache_update(
+ function='verify_sender',
+ sender=self.sender,
+ recipients=self.recipients,
+ result=(int)(False),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 reject(
- _("%s is unauthorized to send on behalf of %s") % (
- self.sasl_user'dn',
- self.sender_user'dn'
+ _("%s is unauthorized to send on behalf of %s") % (
+ self.sasl_user'dn',
+ self.sender_user'dn'
+ )
 )
- )
 
- elif self.sender_user'kolabdelegate' is None:
+ elif self.sender_user'kolabdelegate' == None:
 # No delegates for this sender could be found. The user is
 # definitely NOT a delegate of the sender.
 log.warning(
 _("User %s attempted to use envelope sender address %s without authorization") % (
- policy_request"sasl_username",
- policy_request"sender"
+ policy_request"sasl_username",
+ policy_request"sender"
+ )
 )
- )
 
 # Got a final answer here, do the caching thing.
- if cache is not False:
- cache_update(
- function='verify_sender',
- sender=self.sender,
- recipients=self.recipients,
- result=(int)(False),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ if not cache == False:
+ record_id = cache_update(
+ function='verify_sender',
+ sender=self.sender,
+ recipients=self.recipients,
+ result=(int)(False),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 reject(
- _("%s is unauthorized to send on behalf of %s") % (
- self.sasl_user'dn',
- self.sender_user'dn'
+ _("%s is unauthorized to send on behalf of %s") % (
+ self.sasl_user'dn',
+ self.sender_user'dn'
+ )
 )
- )
 
 else:
 # See if we can match the value of the envelope sender delegates to
 # the actual sender sasl_username
- if self.sasl_user is None:
+ if self.sasl_user == None:
 sasl_users = self.auth.find_recipient(
- self.sasl_username,
- domain=self.sasl_domain
- )
+ self.sasl_username,
+ domain=self.sasl_domain
+ )
 
 if isinstance(sasl_users, list):
 if len(sasl_users) == 0:
 log.error(_("Could not find recipient"))
 return False
 else:
- self.sasl_user = {'dn': sasl_users0}
+ self.sasl_user = { 'dn': sasl_users0 }
 elif isinstance(sasl_users, basestring):
- self.sasl_user = {'dn': sasl_users}
+ self.sasl_user = { 'dn': sasl_users }
 
 # Possible values for the kolabDelegate attribute are:
 # a 'uid', a 'dn'.
- if 'uid' not in self.sasl_user:
+ if not self.sasl_user.has_key('uid'):
 self.sasl_user'uid' = self.auth.get_user_attribute(
- self.sasl_domain,
- self.sasl_user,
- 'uid'
- )
+ self.sasl_domain,
+ self.sasl_user,
+ 'uid'
+ )
+
 
 sender_delegates = self.sender_user'kolabdelegate'
 
 if not type(sender_delegates) == list:
- sender_delegates = sender_delegates
+ sender_delegates = sender_delegates 
 
 for sender_delegate in sender_delegates:
 if self.sasl_user'dn' == sender_delegate:
 log.debug(
- _("Found user %s to be a delegate user of %s") % (
- policy_request"sasl_username",
- policy_request"sender"
- ),
- level=8
- )
+ _("Found user %s to be a delegate user of %s") % (
+ policy_request"sasl_username",
+ policy_request"sender"
+ ),
+ level=8
+ )
 
 sender_is_delegate = True
 
 elif self.sasl_user'uid' == sender_delegate:
 log.debug(
- _("Found user %s to be a delegate user of %s") % (
- policy_request"sasl_username",
- policy_request"sender"
- ),
- level=8
- )
+ _("Found user %s to be a delegate user of %s") % (
+ policy_request"sasl_username",
+ policy_request"sender"
+ ),
+ level=8
+ )
 
 sender_is_delegate = True
 
@@ -758,42 +763,31 @@
 
 self.recipient = recipient
 
- if not self.sasl_username == '' and self.sasl_username is not None:
- log.debug(
- _("Verifying authenticated sender '%(sender)s' with sasl_username '%(sasl_username)s' for recipient '%(recipient)s'") % (
- self.__dict__
- ),
- level=8
- )
-
+ if not self.sasl_username == '' and not self.sasl_username == None:
+ log.debug(_("Verifying authenticated sender '%(sender)s' with sasl_username '%(sasl_username)s' for recipient '%(recipient)s'") % (self.__dict__)
+ )
 else:
- log.debug(
- _(
- "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
- ) % (
- self.__dict__
- ),
- level=8
- )
+ log.debug(_("Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'") % (self.__dict__)
+ )
 
 recipient_verified = False
 
- if cache is not False:
+ if not cache == False:
 records = cache_select(
- function='verify_recipient',
- sender=self.sender,
- recipient=recipient,
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender,
- )
+ function='verify_recipient',
+ sender=self.sender,
+ recipient=recipient,
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender,
+ )
 
- if records is not None and len(records) == 1:
+ if not records == None and len(records) == 1:
 log.info(
- _("Reproducing verify_recipient(%s, %s) from cache") % (
- self.sender,
- recipient
+ _("Reproducing verify_recipient(%s, %s) from cache") % (
+ self.sender,
+ recipient
+ )
 )
- )
 
 return records0.value
 
@@ -803,94 +797,100 @@
 sasl_domain = recipient.split('@')1
 else:
 sasl_domain = conf.get('kolab', 'primary_domain')
- recipient = "%s@%s" % (recipient, sasl_domain)
+ recipient = "%s@%s" % (recipient,sasl_domain)
 
 if not verify_domain(sasl_domain):
- if cache is not False:
+ if not cache == False:
 cache_update(
- function='verify_recipient',
- sender=self.sender,
- recipient=recipient,
- result=(int)(True),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ function='verify_recipient',
+ sender=self.sender,
+ recipient=recipient,
+ result=(int)(True),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 return True
 
- if self.auth is None:
+ if self.auth == None:
 self.auth = Auth(sasl_domain)
 elif not self.auth.domain == sasl_domain:
 self.auth = Auth(sasl_domain)
 
 if verify_domain(sasl_domain):
- if self.auth.domains is not None and sasl_domain in self.auth.domains:
+ if not self.auth.domains == None and self.auth.domains.has_key(sasl_domain):
 log.debug(
- _("Using authentication domain %s instead of %s") % (
- self.auth.domainssasl_domain,
- sasl_domain
- ),
- level=8
- )
+ _("Using authentication domain %s instead of %s") % (
+ self.auth.domainssasl_domain,
+ sasl_domain
+ ),
+ level=8
+ )
 
 sasl_domain = self.auth.domainssasl_domain
 else:
 log.debug(
- _("Domain %s is a primary domain") % (sasl_domain),
- level=8
- )
+ _("Domain %s is a primary domain") % (
+ sasl_domain
+ ),
+ level=8
+ )
 
 else:
 log.warning(
- _("Checking the recipient for domain %s that is not ours.") % (sasl_domain)
- )
+ _("Checking the recipient for domain %s that is not ours. This is probably a configuration error.") % (
+ sasl_domain
+ )
+ )
 
 return True
 
 recipients = self.auth.find_recipient(
- normalize_address(recipient),
- domain=sasl_domain,
- )
+ normalize_address(recipient),
+ domain=sasl_domain,
+ )
 
 if isinstance(recipients, list):
 if len(recipients) > 1:
 log.info(
- _("This recipient address is related to multiple object entries and the SMTP Access Policy can therefore not restrict message flow")
- )
+ _("This recipient address is related to multiple object entries and the SMTP Access Policy can therefore not restrict message flow")
+ )
 
 cache_update(
- function='verify_recipient',
- sender=self.sender,
- recipient=normalize_address(recipient),
- result=(int)(True),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ function='verify_recipient',
+ sender=self.sender,
+ recipient=normalize_address(recipient),
+ result=(int)(True),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 return True
 elif len(recipients) == 1:
- _recipient = {'dn': recipients0}
+ _recipient = { 'dn': recipients0 }
 else:
 log.debug(
- _("Recipient address %r not found. Allowing since the MTA was configured to accept the recipient.") % (
- normalize_address(recipient)
- ),
- level=3
- )
+ _("Recipient address %r not found. Allowing since the MTA was configured to accept the recipient.") % (
+ normalize_address(recipient)
+ ),
+ level=3
+ )
 
 cache_update(
- function='verify_recipient',
- sender=self.sender,
- recipient=normalize_address(recipient),
- result=(int)(True),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ function='verify_recipient',
+ sender=self.sender,
+ recipient=normalize_address(recipient),
+ result=(int)(True),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 return True
 
 elif isinstance(recipients, basestring):
- _recipient = {'dn': recipients}
+ _recipient = {
+ 'dn': recipients
+ }
 
 # We have gotten an invalid recipient. We need to catch this case,
 # because testing can input invalid recipients, and so can faulty
@@ -898,45 +898,45 @@
 if not _recipient'dn':
 if not conf.allow_unauthenticated:
 cache_update(
- function='verify_recipient',
- sender=self.sender,
- recipient=normalize_address(recipient),
- result=(int)(False),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ function='verify_recipient',
+ sender=self.sender,
+ recipient=normalize_address(recipient),
+ result=(int)(False),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 reject(_("Invalid recipient"))
 else:
 cache_update(
- function='verify_recipient',
- sender=self.sender,
- recipient=normalize_address(recipient),
- result=(int)(True),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ function='verify_recipient',
+ sender=self.sender,
+ recipient=normalize_address(recipient),
+ result=(int)(True),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 log.debug(_("Could not find this user, accepting"), level=8)
 return True
 
- if _recipient'dn' is not False:
+ if not _recipient'dn' == False:
 recipient_policy = self.auth.get_entry_attribute(
- sasl_domain,
- _recipient'dn',
- 'kolabAllowSMTPSender'
- )
+ sasl_domain,
+ _recipient'dn',
+ 'kolabAllowSMTPSender'
+ )
 
 # If no such attribute has been specified, allow
- if recipient_policy is None:
+ if recipient_policy == None:
 cache_update(
- function='verify_recipient',
- sender=self.sender,
- recipient=normalize_address(recipient),
- result=(int)(True),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ function='verify_recipient',
+ sender=self.sender,
+ recipient=normalize_address(recipient),
+ result=(int)(True),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 recipient_verified = True
 
@@ -945,19 +945,19 @@
 # sender.
 else:
 recipient_verified = self.parse_policy(
- recipient,
- self.sender,
- recipient_policy
- )
+ recipient,
+ self.sender,
+ recipient_policy
+ )
 
 cache_update(
- function='verify_recipient',
- sender=self.sender,
- recipient=normalize_address(recipient),
- result=(int)(recipient_verified),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender
- )
+ function='verify_recipient',
+ sender=self.sender,
+ recipient=normalize_address(recipient),
+ result=(int)(recipient_verified),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender
+ )
 
 return recipient_verified
 
@@ -972,16 +972,16 @@
 
 recipients_verified = True
 
- if cache is not False:
+ if not cache == False:
 records = cache_select(
- function='verify_recipient',
- sender=self.sender,
- recipients=self.recipients,
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender,
- )
+ function='verify_recipient',
+ sender=self.sender,
+ recipients=self.recipients,
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender,
+ )
 
- if records is not None and len(records) == len(self.recipients):
+ if not records == None and len(records) == len(self.recipients):
 log.debug("Euh, what am I doing here?")
 for record in records:
 recipient_found = False
@@ -990,12 +990,7 @@
 recipient_found = True
 
 if not recipient_found:
- reject(
- _("Sender %s is not allowed to send to recipient %s") % (
- self.sender,
- recipient
- )
- )
+ reject(_("Sender %s is not allowed to send to recipient %s") % (self.sender,recipient))
 
 for recipient in self.recipients:
 recipient_verified = self.verify_recipient(recipient)
@@ -1024,11 +1019,11 @@
 
 sender_verified = False
 
- if self.sender is None:
+ if self.sender == None:
 # Trusted host?
 if not hasattr(self, 'client_address') or \
 self.client_address == "" or \
- self.client_address is None:
+ self.client_address == None:
 
 # Nothing to compare to.
 return False
@@ -1037,31 +1032,33 @@
 import netaddr
 
 networks = conf.get_list(
- 'kolab_smtp_access_policy',
- 'empty_sender_hosts'
- )
+ 'kolab_smtp_access_policy',
+ 'empty_sender_hosts'
+ )
 
+ trusted = False
 for network in networks:
 if netaddr.IPNetwork(self.client_address) in netaddr.IPNetwork(network):
 return True
 
- except ImportError as errmsg:
+ except ImportError, errmsg:
 return False
 
- if cache is not False:
+ if not cache == False:
 records = cache_select(
- sender=self.sender,
- recipients=self.recipients,
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender,
- function='verify_sender'
- )
-
- if records is not None and len(records) == len(self.recipients):
- log.info(
- _("Reproducing verify_sender(%r) from cache") % (self.__dict__)
+ sender=self.sender,
+ recipients=self.recipients,
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender,
+ function='verify_sender'
 )
 
+ if not records == None and len(records) == len(self.recipients):
+ log.info(_("Reproducing verify_sender(%r) from cache") % (
+ self.__dict__
+ )
+ )
+
 for record in records:
 recipient_found = False
 for recipient in self.recipients:
@@ -1070,43 +1067,36 @@
 
 if recipient_found:
 if not record.value:
- reject(
- _("Sender %s is not allowed to send to recipient %s") % (
- self.sender,
- recipient
- )
- )
-
+ reject(_("Sender %s is not allowed to send to recipient %s") % (self.sender,recipient))
 if record.data is not None:
 self.__dict__.update(record.data)
 
 return True
 
- if self.verify_authenticity() is False:
+ if self.verify_authenticity() == False:
 reject(_("Unverifiable sender."))
 
- if self.sasl_user is not None:
- self.sasl_user_uses_alias = self.verify_alias()
+ self.sasl_user_uses_alias = self.verify_alias()
 
- if not self.sasl_user_uses_alias:
- log.debug(_("Sender is not using an alias"), level=8)
- self.sasl_user_is_delegate = self.verify_delegate()
+ if not self.sasl_user_uses_alias:
+ log.debug(_("Sender is not using an alias"), level=8)
+ self.sasl_user_is_delegate = self.verify_delegate()
 
 # If the authenticated user is using delegate functionality, apply the
 # recipient policy attribute for the envelope sender.
- if self.sasl_user_is_delegate is False:
- if self.sasl_user_uses_alias is False:
- if not conf.allow_unauthenticated:
- reject(_("Sender uses unauthorized envelope sender address"))
+ if self.sasl_user_is_delegate == False and \
+ self.sasl_user_uses_alias == False:
 
- if self.sasl_user_is_delegate:
+ reject(_("Sender uses unauthorized envelope sender address"))
+
+ elif self.sasl_user_is_delegate:
 # Apply the recipient policy for the sender using the envelope
 # sender user object.
 recipient_policy_domain = self.sender_domain
 recipient_policy_sender = self.sender
 recipient_policy_user = self.sender_user
 
- elif self.sasl_user is not None:
+ elif not self.sasl_user == None:
 # Apply the recipient policy from the authenticated user.
 recipient_policy_domain = self.sasl_domain
 recipient_policy_sender = self.sasl_username
@@ -1121,88 +1111,84 @@
 recipient_policy_user = self.sender_user
 
 log.debug(
- _("Verifying whether sender is allowed to send to recipient using sender policy"),
- level=8
- )
+ _("Verifying whether sender is allowed to send to recipient using sender policy"),
+ level=8
+ )
 
- if 'kolaballowsmtprecipient' in recipient_policy_user:
+ if recipient_policy_user.has_key('kolaballowsmtprecipient'):
 recipient_policy = recipient_policy_user'kolaballowsmtprecipient'
 else:
 recipient_policy = self.auth.get_user_attribute(
- recipient_policy_domain,
- recipient_policy_user,
- 'kolabAllowSMTPRecipient'
- )
+ recipient_policy_domain,
+ recipient_policy_user,
+ 'kolabAllowSMTPRecipient'
+ )
 
 log.debug(_("Result is %r") % (recipient_policy), level=8)
 
 # If no such attribute has been specified, allow
- if recipient_policy is None:
+ if recipient_policy == None:
 log.debug(
- _("No recipient policy restrictions exist for this sender"),
- level=8
- )
+ _("No recipient policy restrictions exist for this sender"),
+ level=8
+ )
 
 sender_verified = True
 
 # Otherwise,parse the policy obtained.
 else:
 log.debug(
- _("Found a recipient policy to apply for this sender."),
- level=8
- )
+ _("Found a recipient policy to apply for this sender."),
+ level=8
+ )
 
 recipient_allowed = None
 
 for recipient in self.recipients:
 recipient_allowed = self.parse_policy(
- recipient_policy_sender,
- recipient,
- recipient_policy
- )
+ recipient_policy_sender,
+ recipient,
+ recipient_policy
+ )
 
 if not recipient_allowed:
 reject(
- _("Sender %s not allowed to send to recipient %s") % (
- recipient_policy_user'dn',
- recipient
+ _("Sender %s not allowed to send to recipient %s") % (recipient_policy_user'dn',recipient)
 )
- )
 
 sender_verified = True
 
- if cache is not False:
+ if not cache == False:
 data = {
- 'sasl_user_uses_alias': self.sasl_user_uses_alias,
- 'sasl_user_is_delegate': self.sasl_user_is_delegate,
- 'sender_domain': self.sender_domain,
- }
+ 'sasl_user_uses_alias': self.sasl_user_uses_alias,
+ 'sasl_user_is_delegate': self.sasl_user_is_delegate,
+ 'sender_domain': self.sender_domain,
+ }
 
- cache_update(
- function='verify_sender',
- sender=self.sender,
- recipients=self.recipients,
- result=(int)(sender_verified),
- sasl_username=self.sasl_username,
- sasl_sender=self.sasl_sender,
- data=data
- )
+ record_id = cache_update(
+ function='verify_sender',
+ sender=self.sender,
+ recipients=self.recipients,
+ result=(int)(sender_verified),
+ sasl_username=self.sasl_username,
+ sasl_sender=self.sasl_sender,
+ data=data
+ )
 
 return sender_verified
 
-
 def cache_cleanup():
- if cache is not True:
+ if not cache == True:
 return
 
 log.debug(_("Cleaning up the cache"), level=8)
- session.query(PolicyResult).filter(
- PolicyResult.created < ((int)(time.time()) - cache_expire)
- ).delete()
-
+ session.query(
+ PolicyResult
+ ).filter(
+ PolicyResult.created < ((int)(time.time()) - cache_expire)
+ ).delete()
 session.commit()
 
-
 def cache_init():
 global cache, cache_expire, session
 
@@ -1212,15 +1198,17 @@
 cache = True
 if conf.has_option('kolab_smtp_access_policy', 'retention'):
 cache_expire = (int)(
- conf.get(
- 'kolab_smtp_access_policy',
- 'retention'
+ conf.get(
+ 'kolab_smtp_access_policy',
+ 'retention'
+ )
 )
- )
-
+ elif conf.has_option('kolab_smtp_access_policy', 'uri'):
+ log.warning(_("The 'uri' setting in the kolab_smtp_access_policy section is soon going to be deprecated in favor of 'cache_uri'"))
+ cache_uri = conf.get('kolab_smtp_access_policy', 'uri')
+ cache = True
 else:
 return False
-
 else:
 return False
 
@@ -1229,15 +1217,9 @@
 else:
 engine = create_engine(cache_uri, echo=False)
 
- if conf.drop_tables:
- log.info(_("Dropping caching tables from database"))
- policy_result_table.drop(engine, checkfirst=True)
- statistic_table.drop(engine, checkfirst=True)
- return False
-
 try:
 metadata.create_all(engine)
- except sqlalchemy.exc.OperationalError as e:
+ except sqlalchemy.exc.OperationalError, e:
 log.error(_("Operational Error in caching: %s" % (e)))
 return False
 
@@ -1247,34 +1229,34 @@
 
 return cache
 
-
 def cache_select(
 function,
 sender,
 recipient='',
 recipients=,
 sasl_username='',
- sasl_sender=''):
+ sasl_sender=''
+ ):
 
- if cache is not True:
+ if not cache == True:
 return None
 
 if not recipient == '' and recipients == :
 recipients = recipient
 
 return session.query(
- PolicyResult
- ).filter_by(
- key=function,
- sender=sender,
- sasl_username=sasl_username,
- sasl_sender=sasl_sender
- ).filter(
- PolicyResult.recipient.in_(recipients)
- ).filter(
- PolicyResult.created >= ((int)(time.time()) - cache_expire)
- ).all()
-
+ PolicyResult
+ ).filter_by(
+ key=function,
+ sender=sender,
+ sasl_username=sasl_username,
+ sasl_sender=sasl_sender
+ ).filter(
+ PolicyResult.recipient.in_(recipients)
+ ).filter(
+ PolicyResult.created >= \
+ ((int)(time.time()) - cache_expire)
+ ).all()
 
 def cache_insert(
 function,
@@ -1284,37 +1266,37 @@
 result=None,
 sasl_username='',
 sasl_sender='',
- data=None):
+ data=None
+ ):
 
- if cache is not True:
+ if not cache == True:
 return 
 
 log.debug(
- _("Caching the policy result with timestamp %d") % (
- (int)(time.time())
- ),
- level=8
- )
+ _("Caching the policy result with timestamp %d") % (
+ (int)(time.time())
+ ),
+ level=8
+ )
 
 if not recipient == '' and recipients == :
 recipients = recipient
 
 for recipient in recipients:
 session.add(
- PolicyResult(
- key=function,
- value=result,
- sender=sender,
- recipient=recipient,
- sasl_username=sasl_username,
- sasl_sender=sasl_sender,
- data=data
+ PolicyResult(
+ key=function,
+ value=result,
+ sender=sender,
+ recipient=recipient,
+ sasl_username=sasl_username,
+ sasl_sender=sasl_sender,
+ data=data
+ )
 )
- )
 
 session.commit()
 
-
 def cache_update(
 function,
 sender,
@@ -1323,25 +1305,26 @@
 result=None,
 sasl_username='',
 sasl_sender='',
- data=None):
+ data=None
+ ):
 
 """
 Insert an updated set of rows into the cache depending on the necessity
 """
 
- if cache is not True:
+ if not cache == True:
 return
 
 records = 
 
 _records = cache_select(
- function,
- sender,
- recipient,
- recipients,
- sasl_username,
- sasl_sender
- )
+ function,
+ sender,
+ recipient,
+ recipients,
+ sasl_username,
+ sasl_sender
+ )
 
 for record in _records:
 if record.value == (int)(result):
@@ -1357,52 +1340,48 @@
 recipient_found = True
 if not recipient_found:
 cache_insert(
- function=function,
- sender=sender,
- recipient=recipient,
- result=result,
- sasl_username=sasl_username,
- sasl_sender=sasl_sender,
- data=data
- )
-
+ function=function,
+ sender=sender,
+ recipient=recipient,
+ result=result,
+ sasl_username=sasl_username,
+ sasl_sender=sasl_sender,
+ data=data
+ )
 
 def defer_if_permit(message, policy_request=None):
 log.info(_("Returning action DEFER_IF_PERMIT: %s") % (message))
- print("action=DEFER_IF_PERMIT %s\n\n" % (message))
+ print "action=DEFER_IF_PERMIT %s\n\n" % (message)
 sys.exit(0)
 
-
 def dunno(message, policy_request=None):
 log.info(_("Returning action DUNNO: %s") % (message))
- print("action=DUNNO %s\n\n" % (message))
+ print "action=DUNNO %s\n\n" % (message)
 sys.exit(0)
 
-
 def hold(message, policy_request=None):
 log.info(_("Returning action HOLD: %s") % (message))
- print("action=HOLD %s\n\n" % (message))
+ print "action=HOLD %s\n\n" % (message)
 sys.exit(0)
 
-
 def permit(message, policy_request=None):
 log.info(_("Returning action PERMIT: %s") % (message))
 
 # If we have no policy request, we have been called for a reason,
 # and everything relevant has been figured out already.
- if policy_request is None:
- print("action=PERMIT\n\n")
+ if policy_request == None:
+ print "action=PERMIT\n\n"
 sys.exit(0)
 
 # If the user is not authenticated, there's no reason to do
 # extra checks here -- to have been performed already.
 if not hasattr(policy_request, 'sasl_username'):
- print("action=PERMIT\n\n")
+ print "action=PERMIT\n\n"
 sys.exit(0)
 
 # Same here.
- if policy_request.sasl_username is None:
- print("action=PERMIT\n\n")
+ if policy_request.sasl_username == None:
+ print "action=PERMIT\n\n"
 sys.exit(0)
 
 delegate_sender_header = None
@@ -1416,15 +1395,15 @@
 #
 if policy_request.sasl_user_is_delegate:
 # Domain-specific setting?
- if policy_request.sender_domain is not None:
+ if not policy_request.sender_domain == None:
 delegate_sender_header = conf.get(policy_request.sender_domain, 'delegate_sender_header')
 
 # Global setting?
- if delegate_sender_header is None:
+ if delegate_sender_header == None:
 delegate_sender_header = conf.get('kolab_smtp_access_policy', 'delegate_sender_header')
 
 # Default
- if delegate_sender_header is None:
+ if delegate_sender_header == None:
 delegate_sender_header = True
 
 # If the sender is using an alias as the envelope sender address, take
@@ -1432,15 +1411,15 @@
 # and/or X-Sender headers.
 elif policy_request.sasl_user_uses_alias:
 # Domain-specific setting?
- if policy_request.sender_domain is not None:
+ if not policy_request.sender_domain == None:
 alias_sender_header = conf.get(policy_request.sender_domain, 'alias_sender_header')
 
 # Global setting?
- if alias_sender_header is None:
+ if alias_sender_header == None:
 alias_sender_header = conf.get('kolab_smtp_access_policy', 'alias_sender_header')
 
 # Default
- if alias_sender_header is None:
+ if alias_sender_header == None:
 alias_sender_header = True
 
 # Make the values booleans
@@ -1466,22 +1445,22 @@
 sender_header = conf.get(policy_request.sender_domain, 'sender_header')
 
 # Global setting?
- if sender_header is None:
+ if sender_header == None:
 sender_header = conf.get('kolab_smtp_access_policy', 'sender_header')
 
 # Default
- if sender_header is None:
+ if sender_header == None:
 sender_header = True
 
 # Domain specific?
 xsender_header = conf.get(policy_request.sender_domain, 'xsender_header')
 
 # Global setting?
- if xsender_header is None:
+ if xsender_header == None:
 xsender_header = conf.get('kolab_smtp_access_policy', 'xsender_header')
 
 # Default
- if xsender_header is None:
+ if xsender_header == None:
 xsender_header = True
 
 # Note that if the user is not a delegatee, and not using an alias, the sender
@@ -1495,7 +1474,7 @@
 
 if sender_header or xsender_header:
 # Do the encoding, if any
- if enc_key is not None:
+ if not enc_key == None:
 header = 'X-Authenticated-As'
 xheader = None
 sender = utils.encode(enc_key, policy_request.sasl_username)
@@ -1505,29 +1484,27 @@
 sender = policy_request.sasl_username
 
 if sender_header:
- print("action=PREPEND %s: %s" % (header, sender))
+ print "action=PREPEND %s: %s" % (header, sender)
 
- if xsender_header and xheader is not None:
- print("action=PREPEND %s: %s" % (xheader, sender))
+ if xsender_header and not xheader == None:
+ print "action=PREPEND %s: %s" % (xheader, sender)
 
- print("action=PERMIT\n\n")
+ print "action=PERMIT\n\n"
 sys.exit(0)
 
-
 def reject(message, policy_request=None):
 log.info(_("Returning action REJECT: %s") % (message))
- print("action=REJECT %s\n\n" % (message))
+ print "action=REJECT %s\n\n" % (message)
 sys.exit(0)
 
-
 def expand_mydomains():
 """
 Return a list of my domains.
 """
 
- global auth, mydomains
+ global auth,mydomains
 
- if mydomains is not None:
+ if not mydomains == None:
 return mydomains
 
 auth.connect()
@@ -1536,7 +1513,6 @@
 
 return mydomains.keys()
 
-
 def normalize_address(email_address):
 """
 Parse an address; Strip off anything after a recipient delimiter.
@@ -1547,16 +1523,14 @@
 # Take the first part split by recipient delimiter and the last part
 # split by '@'.
 return "%s@%s" % (
- email_address.split("+")0.lower(),
- # TODO: Under some conditions, the recipient may not be fully
- # qualified. We'll cross that bridge when we get there, though.
- email_address.split('@')1.lower()
- )
-
+ email_address.split("+")0.lower(),
+ # TODO: Under some conditions, the recipient may not be fully
+ # qualified. We'll cross that bridge when we get there, though.
+ email_address.split('@')1.lower()
+ )
 else:
 return email_address.lower()
 
-
 def read_request_input():
 """
 Read a single policy request from sys.stdin, and return a dictionary
@@ -1571,13 +1545,13 @@
 
 end_of_request = False
 while not end_of_request:
- if (time.time() - start_time) >= conf.timeout:
+ if (time.time()-start_time) >= conf.timeout:
 log.warning(_("Timeout for policy request reading exceeded"))
 sys.exit(0)
 
 request_line = sys.stdin.readline()
 if request_line.strip() == '':
- if 'request' in policy_request:
+ if policy_request.has_key('request'):
 log.debug(_("End of current request"), level=8)
 end_of_request = True
 else:
@@ -1590,16 +1564,15 @@
 
 return policy_request
 
-
 def verify_domain(domain):
 """
 Verify whether the domain is internal (mine) or external.
 """
 
- global auth, mydomains
+ global auth,mydomains
 
- if mydomains is not None:
- return domain in mydomains
+ if not mydomains == None:
+ return domain in mydomains.keys()
 
 auth.connect()
 
@@ -1607,58 +1580,41 @@
 
 mydomains = auth.list_domains()
 
- if mydomains is not None and domain in mydomains:
+ if not mydomains == None and mydomains.has_key(domain):
 domain_verified = True
 else:
 domain_verified = False
 
 return domain_verified
 
-
 if __name__ == "__main__":
 access_policy_group = conf.add_cli_parser_option_group(
- _("Access Policy Options")
- )
-
- access_policy_group.add_option(
- "--drop-tables",
- dest="drop_tables",
- action="store_true",
- default=False,
- help=_("Drop the caching tables from the database and exit.")
- )
-
- access_policy_group.add_option(
- "--timeout",
- dest="timeout",
- action="store",
- default=10,
- help=_("SMTP Policy request timeout.")
- )
-
- access_policy_group.add_option(
- "--verify-recipient",
- dest="verify_recipient",
- action="store_true",
- default=False,
- help=_("Verify the recipient access policy.")
- )
-
- access_policy_group.add_option(
- "--verify-sender",
- dest="verify_sender",
- action="store_true",
- default=False,
- help=_("Verify the sender access policy.")
- )
+ _("Access Policy Options")
+ )
 
- access_policy_group.add_option(
- "--allow-unauthenticated",
- dest="allow_unauthenticated",
- action="store_true",
- default=False,
- help=_("Allow unauthenticated senders.")
- )
+ access_policy_group.add_option( "--timeout",
+ dest = "timeout",
+ action = "store",
+ default = 10,
+ help = _("SMTP Policy request timeout."))
+
+ access_policy_group.add_option( "--verify-recipient",
+ dest = "verify_recipient",
+ action = "store_true",
+ default = False,
+ help = _("Verify the recipient access policy."))
+
+ access_policy_group.add_option( "--verify-sender",
+ dest = "verify_sender",
+ action = "store_true",
+ default = False,
+ help = _("Verify the sender access policy."))
+
+ access_policy_group.add_option( "--allow-unauthenticated",
+ dest = "allow_unauthenticated",
+ action = "store_true",
+ default = False,
+ help = _("Allow unauthenticated senders."))
 
 conf.finalize_conf()
 
@@ -1668,16 +1624,12 @@
 
 policy_requests = {}
 
- if conf.drop_tables:
- sys.exit(0)
-
 # Start the work
 while True:
 policy_request = read_request_input()
 instance = policy_request'instance'
 log.debug(_("Got request instance %s") % (instance))
-
- if instance in policy_requests:
+ if policy_requests.has_key(instance):
 policy_requestsinstance.add_request(policy_request)
 else:
 policy_requestsinstance = PolicyRequest(policy_request)
@@ -1685,14 +1637,14 @@
 protocol_state = policy_request'protocol_state'.strip().lower()
 
 log.debug(
- _("Request instance %s is in state %s") % (
- instance,
- protocol_state
+ _("Request instance %s is in state %s") % (
+ instance,
+ protocol_state
+ )
 )
- )
 
 if not protocol_state == 'data':
- print("action=DUNNO\n\n")
+ print "action=DUNNO\n\n"
 sys.stdout.flush()
 
 # We can recognize being in the DATA part by the recipient_count being
@@ -1709,12 +1661,13 @@
 sender_allowed = True
 
 if conf.verify_recipient:
- recipient_allowed = policy_requestsinstance.verify_recipients()
+ recipient_allowed = \
+ policy_requestsinstance.verify_recipients()
 
 else:
 recipient_allowed = True
 
- except Exception as errmsg:
+ except Exception, errmsg:
 import traceback
 log.error(_("Unhandled exception caught: %r") % (errmsg))
 log.error(traceback.format_exc())

pykolab-0.8.23.tar.gz/conf.py -> pykolab-0.8.4.tar.gz/conf.py Changed

pykolab-0.8.23.tar.gz/conf/kolab.conf -> pykolab-0.8.4.tar.gz/conf/kolab.conf Changed

@@ -167,9 +167,6 @@
 ; The URI to LDAP
 ldap_uri = ldap://localhost:389
 
-; A timeout, in seconds, for regular searches such as authentication requests.
-timeout = 10
-
 ; A list of integers containing supported controls, to increase the efficiency
 ; of individual short-lived connections with LDAP.
 supported_controls = 0,2,3
@@ -431,51 +428,9 @@
 result_attribute = mail
 
 wallace
-; List the modules to load and apply, in order.
-;
-; Available modules include;
-;
-; * resources
-; * invitationpolicy
-; * footer
-; * signature
-;
-modules = resources, invitationpolicy
-
-; Footer module settings
-;footer_text = /etc/kolab/footer.text
-;footer_html = /etc/kolab/footer.html
-
-; Signature module settings
-;
-; Two modes: write out the exact signature in /etc/kolab/ as html and/or text,
-; or use rules.
-;
-; If files are configured, rules do not apply. If files are configured, a
-; fallback is /etc/kolab/signature_default.{html,txt}.
-;
-; signature_file_html = /etc/kolab/signature.d/%(mail)s.html
-; signature_file_text = /etc/kolab/signature.d/%(mail)s.txt
-;
-; A list of dicts, with each dict holding an attribute name ("o", "cn",
-; "entrydn"), and a regular expression to be matched against the attribute
-; value.
-;
-; The module takes the first match, and uses the "html" and "text" files as
-; templates.
-;
-;signature_rules = 
-;        {
-;                "entrydn": "uid=.*,ou=IT,ou=People,dc=example,dc=org",
-;                "html": "/etc/kolab/signature_IT.html",
-;                "text": "/etc/kolab/signature_IT.txt"
-;            },
-;        {
-;                "entrydn": "uid=.*,ou=Finance,ou=People,dc=example,dc=org",
-;                "html": "/etc/kolab/signature_Finance.html",
-;                "text": "/etc/kolab/signature_Finance.txt"
-;            }
-;    
+modules = resources, invitationpolicy, footer
+footer_text = /etc/kolab/footer.text
+footer_html = /etc/kolab/footer.html
 
 ; default settings for kolabInvitationPolicy LDAP attribute on user records
 kolab_invitation_policy = ACT_ACCEPT_IF_NO_CONFLICT:example.org, ACT_MANUAL

pykolab-0.8.23.tar.gz/configure.ac -> pykolab-0.8.4.tar.gz/configure.ac Changed

pykolab-0.8.23.tar.gz/cyruslib.py -> pykolab-0.8.4.tar.gz/cyruslib.py Changed

@@ -18,11 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-# Requires python >= 2.6
+# Requires python >= 2.3
 #
 
-from __future__ import print_function
-
 __version__ = '0.8.5'
 __all__ = 'CYRUS' 
 __doc__ = """Cyrus admin wrapper
@@ -37,8 +35,8 @@
 import imaplib
 import re
 from binascii import b2a_base64
-except ImportError as e:
- print(e)
+except ImportError, e:
+ print e
 exit(1)
 
 Commands = {
@@ -344,7 +342,7 @@
 
 def __verbose(self, msg):
 if self.VERBOSE:
- print(msg, file=self.LOGFD)
+ print >> self.LOGFD, msg
 
 def __doexception(self, function, msg=None, *args):
 if msg is None:
@@ -384,7 +382,7 @@
 res, msg = wrapped(*args)
 if ok(res):
 return res, msg
- except Exception as info:
+ except Exception, info:
 error = str(info).split(':').pop().strip()
 if error.upper().startswith('BAD'):
 error = error.split('BAD', 1).pop().strip()
@@ -415,7 +413,7 @@
 self.AUTH = True
 self.id()
 admin = self.m.isadmin()
- except Exception as info:
+ except Exception, info:
 self.AUTH = False
 error = str(info).split(':').pop().strip()
 self.__doexception("LOGIN", error)
@@ -448,7 +446,7 @@
 def logout(self):
 try:
 res, msg = self.m.logout()
- except Exception as info:
+ except Exception, info:
 error = str(info).split(':').pop().strip()
 self.__doexception("LOGOUT", error)
 self.AUTH = False
@@ -577,7 +575,7 @@
 try:
 userid = self.encode(aclListi)
 rights = aclListi + 1
- except Exception as info:
+ except Exception, info:
 self.__verbose( 'GETACL %s BAD: %s' % (mailbox, info.args0) )
 raise self.__doraise("GETACL")
 self.__verbose( 'GETACL %s %s %s' % (mailbox, userid, rights) )
@@ -637,7 +635,7 @@
 self.__prepare('SETQUOTA', mailbox)
 try:
 limit = int(limit)
- except ValueError:
+ except ValueError, e:
 self.__verbose( 'SETQUOTA %s BAD: %s %s' % (mailbox, self.ERROR.get("SETQUOTA")1, limit) )
 raise self.__doraise("SETQUOTA")
 res, msg = self.__docommand("setquota", self.decode(mailbox), limit)
@@ -689,21 +687,21 @@
 key = annotation.split('"')3.replace('"','').replace("'","").strip()
 _annot = annotation.split('(')1.split(')')0.strip()
 
- if folder not in ann:
+ if not ann.has_key(folder):
 annfolder = {}
 
 try:
 value_priv = _annot(_annot.index('"value.priv"')+len('"value.priv"')):_annot.index('"size.priv"').strip()
- except ValueError:
+ except ValueError, errmsg:
 value_priv = None
 
 try:
 size_priv = _annot(_annot.index('"size.priv"')+len('"size.priv"')):.strip().split('"')1.strip()
 try:
 value_priv = value_privvalue_priv.index('{%s}' % (size_priv))+len('{%s}' % (size_priv)):.strip()
- except Exception:
+ except Exception, errmsg:
 pass
- except Exception:
+ except Exception, errmsg:
 pass
 
 if value_priv in empty_values:
@@ -730,16 +728,16 @@
 
 try:
 value_shared = _annot(_annot.index('"value.shared"')+len('"value.shared"')):_annot.index('"size.shared"').strip()
- except ValueError:
+ except ValueError, errmsg:
 value_shared = None
 
 try:
 size_shared = _annot(_annot.index('"size.shared"')+len('"size.shared"')):.strip().split('"')1.strip()
 try:
 value_shared = value_sharedvalue_shared.index('{%s}' % (size_shared))+len('{%s}' % (size_shared)):.strip()
- except Exception:
+ except Exception, errmsg:
 pass
- except Exception:
+ except Exception, errmsg:
 pass
 
 if value_shared in empty_values:

pykolab-0.8.23.tar.gz/ext/python/Tools/freeze/checkextensions.py -> pykolab-0.8.4.tar.gz/ext/python/Tools/freeze/checkextensions.py Changed

pykolab-0.8.23.tar.gz/ext/python/Tools/freeze/checkextensions_win32.py -> pykolab-0.8.4.tar.gz/ext/python/Tools/freeze/checkextensions_win32.py Changed

pykolab-0.8.23.tar.gz/ext/python/Tools/freeze/freeze.py -> pykolab-0.8.4.tar.gz/ext/python/Tools/freeze/freeze.py Changed

@@ -145,7 +145,7 @@
         if sys.argvpos == '-i':
             try:
                 options = open(sys.argvpos+1).read().split()
-            except IOError as why:
+            except IOError, why:
                 usage("File name '%s' specified with the -i option "
                       "can not be read - %s" % (sys.argvpos+1, why) )
             # Replace the '-i' and the filename with the read params.
@@ -156,13 +156,13 @@
     # Now parse the command line with the extras inserted.
     try:
         opts, args = getopt.getopt(sys.argv1:, 'r:a:dEe:hmo:p:P:b:qs:wX:x:l:')
-    except getopt.error as msg:
+    except getopt.error, msg:
         usage('getopt error: ' + str(msg))
 
     # process option arguments
     for o, a in opts:
         if o == '-h':
-            print(__doc__)
+            print __doc__
             return
         if o == '-b':
             binlib = a
@@ -224,7 +224,7 @@
     if win:
         extensions_c = 'frozen_extensions.c'
     if ishome:
-        print("(Using Python source directory)")
+        print "(Using Python source directory)"
         binlib = exec_prefix
         incldir = os.path.join(prefix, 'Include')
         config_h_dir = exec_prefix
@@ -316,8 +316,8 @@
     if odir and not os.path.isdir(odir):
         try:
             os.mkdir(odir)
-            print("Created output directory", odir)
-        except os.error as msg:
+            print "Created output directory", odir
+        except os.error, msg:
             usage('%s: mkdir failed (%s)' % (odir, str(msg)))
     base = ''
     if odir:
@@ -339,7 +339,7 @@
         try:
             custom_entry_point, python_entry_is_main = \
                 winmakemakefile.get_custom_entry_point(subsystem)
-        except ValueError as why:
+        except ValueError, why:
             usage(why)
 
 
@@ -377,7 +377,7 @@
 
     if debug > 0:
         mf.report()
-        print()
+        print
     dict = mf.modules
 
     if error_if_any_missing:
@@ -467,7 +467,7 @@
     somevars = {}
     if os.path.exists(makefile_in):
         makevars = parsesetup.getmakevars(makefile_in)
-        for key in makevars:
+        for key in makevars.keys():
             somevarskey = makevarskey
 
     somevars'CFLAGS' = ' '.join(cflags) # override
@@ -485,18 +485,18 @@
     # Done!
 
     if odir:
-        print('Now run "make" in', odir, end=' ')
-        print('to build the target:', base_target)
+        print 'Now run "make" in', odir,
+        print 'to build the target:', base_target
     else:
-        print('Now run "make" to build the target:', base_target)
+        print 'Now run "make" to build the target:', base_target
 
 
 # Print usage message and exit
 
 def usage(msg):
     sys.stdout = sys.stderr
-    print("Error:", msg)
-    print("Use ``%s -h'' for help" % sys.argv0)
+    print "Error:", msg
+    print "Use ``%s -h'' for help" % sys.argv0
     sys.exit(2)

pykolab-0.8.23.tar.gz/ext/python/Tools/freeze/hello.py -> pykolab-0.8.4.tar.gz/ext/python/Tools/freeze/hello.py Changed

pykolab-0.8.23.tar.gz/ext/python/Tools/freeze/makeconfig.py -> pykolab-0.8.4.tar.gz/ext/python/Tools/freeze/makeconfig.py Changed

pykolab-0.8.23.tar.gz/ext/python/Tools/freeze/makefreeze.py -> pykolab-0.8.4.tar.gz/ext/python/Tools/freeze/makefreeze.py Changed

pykolab-0.8.23.tar.gz/ext/python/Tools/freeze/parsesetup.py -> pykolab-0.8.4.tar.gz/ext/python/Tools/freeze/parsesetup.py Changed

@@ -84,29 +84,29 @@
     import sys
     import os
     if not sys.argv1::
-        print('usage: python parsesetup.py Makefile*|Setup* ...')
+        print 'usage: python parsesetup.py Makefile*|Setup* ...'
         sys.exit(2)
     for arg in sys.argv1::
         base = os.path.basename(arg)
         if base:8 == 'Makefile':
-            print('Make style parsing:', arg)
+            print 'Make style parsing:', arg
             v = getmakevars(arg)
             prdict(v)
         elif base:5 == 'Setup':
-            print('Setup style parsing:', arg)
+            print 'Setup style parsing:', arg
             m, v = getsetupinfo(arg)
             prdict(m)
             prdict(v)
         else:
-            print(arg, 'is neither a Makefile nor a Setup file')
-            print('(name must begin with "Makefile" or "Setup")')
+            print arg, 'is neither a Makefile nor a Setup file'
+            print '(name must begin with "Makefile" or "Setup")'
 
 def prdict(d):
     keys = d.keys()
     keys.sort()
     for key in keys:
         value = dkey
-        print("%-15s" % key, str(value))
+        print "%-15s" % key, str(value)
 
 if __name__ == '__main__':
     test()

pykolab-0.8.23.tar.gz/ext/python/Tools/freeze/winmakemakefile.py -> pykolab-0.8.4.tar.gz/ext/python/Tools/freeze/winmakemakefile.py Changed

@@ -39,7 +39,7 @@
     try:
         return subsystem_detailssubsystem:2
     except KeyError:
-        raise ValueError("The subsystem %s is not known" % subsystem)
+        raise ValueError, "The subsystem %s is not known" % subsystem
 
 
 def makemakefile(outfp, vars, files, target):
@@ -52,29 +52,29 @@
 
 def realwork(vars, moddefns, target):
     version_suffix = "%r%r" % sys.version_info:2
-    print("# Makefile for Microsoft Visual C++ generated by freeze.py script")
-    print()
-    print('target = %s' % target)
-    print('pythonhome = %s' % vars'prefix')
-    print()
-    print('DEBUG=0 # Set to 1 to use the _d versions of Python.')
-    print('!IF $(DEBUG)')
-    print('debug_suffix=_d')
-    print('c_debug=/Zi /Od /DDEBUG /D_DEBUG')
-    print('l_debug=/DEBUG')
-    print('temp_dir=Build\\Debug')
-    print('!ELSE')
-    print('debug_suffix=')
-    print('c_debug=/Ox')
-    print('l_debug=')
-    print('temp_dir=Build\\Release')
-    print('!ENDIF')
-    print()
-
-    print('# The following line assumes you have built Python using the standard instructions')
-    print('# Otherwise fix the following line to point to the library.')
-    print('pythonlib = "$(pythonhome)/pcbuild/python%s$(debug_suffix).lib"' % version_suffix)
-    print()
+    print "# Makefile for Microsoft Visual C++ generated by freeze.py script"
+    print
+    print 'target = %s' % target
+    print 'pythonhome = %s' % vars'prefix'
+    print
+    print 'DEBUG=0 # Set to 1 to use the _d versions of Python.'
+    print '!IF $(DEBUG)'
+    print 'debug_suffix=_d'
+    print 'c_debug=/Zi /Od /DDEBUG /D_DEBUG'
+    print 'l_debug=/DEBUG'
+    print 'temp_dir=Build\\Debug'
+    print '!ELSE'
+    print 'debug_suffix='
+    print 'c_debug=/Ox'
+    print 'l_debug='
+    print 'temp_dir=Build\\Release'
+    print '!ENDIF'
+    print
+
+    print '# The following line assumes you have built Python using the standard instructions'
+    print '# Otherwise fix the following line to point to the library.'
+    print 'pythonlib = "$(pythonhome)/pcbuild/python%s$(debug_suffix).lib"' % version_suffix
+    print
 
     # We only ever write one "entry point" symbol - either
     # "main" or "WinMain".  Therefore, there is no need to
@@ -88,59 +88,59 @@
         target_ext = ".dll"
 
 
-    print("# As the target uses Python%s.dll, we must use this compiler option!" % version_suffix)
-    print("cdl = /MD")
-    print()
-    print("all: $(target)$(debug_suffix)%s" % (target_ext))
-    print()
+    print "# As the target uses Python%s.dll, we must use this compiler option!" % version_suffix
+    print "cdl = /MD"
+    print
+    print "all: $(target)$(debug_suffix)%s" % (target_ext)
+    print
 
-    print('$(temp_dir):')
-    print('  if not exist $(temp_dir)\. mkdir $(temp_dir)')
-    print()
+    print '$(temp_dir):'
+    print '  if not exist $(temp_dir)\. mkdir $(temp_dir)'
+    print
 
     objects = 
     libs = "shell32.lib", "comdlg32.lib", "wsock32.lib", "user32.lib", "oleaut32.lib"
     for moddefn in moddefns:
-        print("# Module", moddefn.name)
+        print "# Module", moddefn.name
         for file in moddefn.sourceFiles:
             base = os.path.basename(file)
             base, ext = os.path.splitext(base)
             objects.append(base + ".obj")
-            print('$(temp_dir)\%s.obj: "%s"' % (base, file))
-            print("\t@$(CC) -c -nologo /Fo$* $(cdl) $(c_debug) /D BUILD_FREEZE", end=' ')
-            print('"-I$(pythonhome)/Include"  "-I$(pythonhome)/PC" \\')
-            print("\t\t$(cflags) $(cdebug) $(cinclude) \\")
+            print '$(temp_dir)\%s.obj: "%s"' % (base, file)
+            print "\t@$(CC) -c -nologo /Fo$* $(cdl) $(c_debug) /D BUILD_FREEZE",
+            print '"-I$(pythonhome)/Include"  "-I$(pythonhome)/PC" \\'
+            print "\t\t$(cflags) $(cdebug) $(cinclude) \\"
             extra = moddefn.GetCompilerOptions()
             if extra:
-                print("\t\t%s \\" % (' '.join(extra),))
-            print('\t\t"%s"' % file)
-            print()
+                print "\t\t%s \\" % (' '.join(extra),)
+            print '\t\t"%s"' % file
+            print
 
         # Add .lib files this module needs
         for modlib in moddefn.GetLinkerLibs():
             if modlib not in libs:
                 libs.append(modlib)
 
-    print("ADDN_LINK_FILES=", end=' ')
-    for addn in vars'addn_link': print('"%s"' % (addn), end=' ')
-    print() ; print()
-
-    print("OBJS=", end=' ')
-    for obj in objects: print('"$(temp_dir)\%s"' % (obj), end=' ')
-    print() ; print()
-
-    print("LIBS=", end=' ')
-    for lib in libs: print('"%s"' % (lib), end=' ')
-    print() ; print()
-
-    print("$(target)$(debug_suffix)%s: $(temp_dir) $(OBJS)" % (target_ext))
-    print("\tlink -out:$(target)$(debug_suffix)%s %s" % (target_ext, target_link_flags), end=' ')
-    print("\t$(OBJS) \\")
-    print("\t$(LIBS) \\")
-    print("\t$(ADDN_LINK_FILES) \\")
-    print("\t$(pythonlib) $(lcustom) $(l_debug)\\")
-    print("\t$(resources)")
-    print()
-    print("clean:")
-    print("\t-rm -f *.obj")
-    print("\t-rm -f $(target).exe")
+    print "ADDN_LINK_FILES=",
+    for addn in vars'addn_link': print '"%s"' % (addn),
+    print ; print
+
+    print "OBJS=",
+    for obj in objects: print '"$(temp_dir)\%s"' % (obj),
+    print ; print
+
+    print "LIBS=",
+    for lib in libs: print '"%s"' % (lib),
+    print ; print
+
+    print "$(target)$(debug_suffix)%s: $(temp_dir) $(OBJS)" % (target_ext)
+    print "\tlink -out:$(target)$(debug_suffix)%s %s" % (target_ext, target_link_flags),
+    print "\t$(OBJS) \\"
+    print "\t$(LIBS) \\"
+    print "\t$(ADDN_LINK_FILES) \\"
+    print "\t$(pythonlib) $(lcustom) $(l_debug)\\"
+    print "\t$(resources)"
+    print
+    print "clean:"
+    print "\t-rm -f *.obj"
+    print "\t-rm -f $(target).exe"

pykolab-0.8.23.tar.gz/kolab-cli.py -> pykolab-0.8.4.tar.gz/kolab-cli.py Changed

pykolab-0.8.23.tar.gz/kolabd.py -> pykolab-0.8.4.tar.gz/kolabd.py Changed

@@ -8,33 +8,28 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, 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
 # 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 this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
-import os
 import sys
 
 # For development purposes
-if os.path.isdir(os.path.join(os.path.dirname(__file__), '.git')):
- sys.path.insert(0, '.')
+sys.path = '.' + sys.path
 
 from pykolab.translate import _
 
-
 try:
 from pykolab.constants import *
-except ImportError as errmsg:
- print(_("Cannot load pykolab/constants.py:"), file=sys.stderr)
- print("%s" % (errmsg), file=sys.stderr)
+except ImportError, e:
+ print >> sys.stderr, _("Cannot load pykolab/constants.py:")
+ print >> sys.stderr, "%s" % e
 sys.exit(1)
 
 import kolabd

pykolab-0.8.23.tar.gz/kolabd/__init__.py -> pykolab-0.8.4.tar.gz/kolabd/__init__.py Changed

@@ -20,8 +20,6 @@
 The Kolab daemon.
 """
 
-from __future__ import print_function
-
 import grp
 import os
 import pwd
@@ -29,84 +27,83 @@
 import sys
 import time
 import traceback
-import multiprocessing
 
 import pykolab
 
 from pykolab.auth import Auth
 from pykolab import constants
 from pykolab import utils
-from pykolab.translate import _ as _l
+from pykolab.translate import _
 
-from .process import KolabdProcess as Process
+from process import KolabdProcess as Process
 
-# pylint: disable=invalid-name
 log = pykolab.getLogger('pykolab.daemon')
 conf = pykolab.getConf()
 
 
-class KolabDaemon:
+class KolabDaemon(object):
 def __init__(self):
 """
 The main Kolab Groupware daemon process.
 """
 
- daemon_group = conf.add_cli_parser_option_group(_l("Daemon Options"))
+ daemon_group = conf.add_cli_parser_option_group(_("Daemon Options"))
 
 daemon_group.add_option(
- "--fork",
- dest="fork_mode",
- action="store_true",
- default=False,
- help=_l("Fork to the background.")
- )
+ "--fork",
+ dest = "fork_mode",
+ action = "store_true",
+ default = False,
+ help = _("Fork to the background.")
+ )
 
 daemon_group.add_option(
- "-p", "--pid-file",
- dest="pidfile",
- action="store",
- default="/var/run/kolabd/kolabd.pid",
- help=_l("Path to the PID file to use.")
- )
+ "-p",
+ "--pid-file",
+ dest = "pidfile",
+ action = "store",
+ default = "/var/run/kolabd/kolabd.pid",
+ help = _("Path to the PID file to use.")
+ )
 
 daemon_group.add_option(
- "-u", "--user",
- dest="process_username",
- action="store",
- default="kolab",
- help=_l("Run as user USERNAME"),
- metavar="USERNAME"
- )
+ "-u",
+ "--user",
+ dest = "process_username",
+ action = "store",
+ default = "kolab",
+ help = _("Run as user USERNAME"),
+ metavar = "USERNAME"
+ )
 
 daemon_group.add_option(
- "-g", "--group",
- dest="process_groupname",
- action="store",
- default="kolab",
- help=_l("Run as group GROUPNAME"),
- metavar="GROUPNAME"
- )
+ "-g",
+ "--group",
+ dest = "process_groupname",
+ action = "store",
+ default = "kolab",
+ help = _("Run as group GROUPNAME"),
+ metavar = "GROUPNAME"
+ )
 
 conf.finalize_conf()
 
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-statements
 def run(self):
 """Run Forest, RUN!"""
 
 exitcode = 0
 
 utils.ensure_directory(
- os.path.dirname(conf.pidfile),
- conf.process_username,
- conf.process_groupname
- )
+ os.path.dirname(conf.pidfile),
+ conf.process_username,
+ conf.process_groupname
+ )
 
 try:
 try:
- (ruid, _, _) = os.getresuid()
- (rgid, _, _) = os.getresgid()
- except AttributeError:
+ (ruid, euid, suid) = os.getresuid()
+ (rgid, egid, sgid) = os.getresgid()
+ except AttributeError, errmsg:
 ruid = os.getuid()
 rgid = os.getgid()
 
@@ -115,47 +112,64 @@
 if rgid == 0:
 # Get group entry details
 try:
- (_, _, group_gid, _) = grp.getgrnam(conf.process_groupname)
+ (
+ group_name,
+ group_password,
+ group_gid,
+ group_members
+ ) = grp.getgrnam(conf.process_groupname)
 
 except KeyError:
- log.error(
- _l("Group %s does not exist") % (conf.process_groupname)
- )
+ print >> sys.stderr, _("Group %s does not exist") % (
+ conf.process_groupname
+ )
 
 sys.exit(1)
 
 # Set real and effective group if not the same as current.
 if not group_gid == rgid:
 log.debug(
- _l("Switching real and effective group id to %d") % (group_gid),
- level=8
- )
+ _("Switching real and effective group id to %d") % (
+ group_gid
+ ),
+ level=8
+ )
 
 os.setregid(group_gid, group_gid)
 
 if ruid == 0:
 # Means we haven't switched yet.
 try:
- (_, _, user_uid, _, _, _, _) = pwd.getpwnam(conf.process_username)
+ (
+ user_name,
+ user_password,
+ user_uid,
+ user_gid,
+ user_gecos,
+ user_homedir,
+ user_shell
+ ) = pwd.getpwnam(conf.process_username)
 
 except KeyError:
- log.error(
- _l("User %s does not exist") % (conf.process_username)
- )
+ print >> sys.stderr, _("User %s does not exist") % (
+ conf.process_username
+ )
 
 sys.exit(1)
 
 # Set real and effective user if not the same as current.
 if not user_uid == ruid:
 log.debug(
- _l("Switching real and effective user id to %d") % (user_uid),
- level=8
- )
+ _("Switching real and effective user id to %d") % (
+ user_uid
+ ),
+ level=8
+ )
 
 os.setreuid(user_uid, user_uid)
 
- except Exception:
- log.error(_l("Could not change real and effective uid and/or gid"))
+ except:
+ log.error(_("Could not change real and effective uid and/or gid"))
 
 try:
 pid = os.getpid()
@@ -173,7 +187,7 @@
 # Give up the session, all control,
 # all open file descriptors, see #5151
 os.chdir("/")
- old_umask = os.umask(0)
+ os.umask(0)
 os.setsid()
 
 pid = os.fork()
@@ -188,47 +202,42 @@
 os.close(1)
 os.close(2)
 
- os.open(os.devnull, os.O_RDONLY)
- os.open(os.devnull, os.O_WRONLY)
- os.open(os.devnull, os.O_WRONLY)
-
- os.umask(old_umask)
-
 log.remove_stdout_handler()
 self.set_signal_handlers()
 self.write_pid()
 self.do_sync()
 
- except SystemExit as errcode:
+ except SystemExit, errcode:
 exitcode = errcode
 
 except KeyboardInterrupt:
 exitcode = 1
- log.info(_l("Interrupted by user"))
+ log.info(_("Interrupted by user"))
 
- except AttributeError:
+ except AttributeError, errmsg:
 exitcode = 1
 traceback.print_exc()
- print(_l("Traceback occurred, please report a bug"), file=sys.stderr)
+ print >> sys.stderr, _("Traceback occurred, please report a " +
+ "bug at https://issues.kolab.org")
 
- except TypeError as errmsg:
+ except TypeError, errmsg:
 exitcode = 1
 traceback.print_exc()
- log.error(_l("Type Error: %s") % errmsg)
+ log.error(_("Type Error: %s") % errmsg)
 
- except Exception:
+ except:
 exitcode = 2
 traceback.print_exc()
- print(_l("Traceback occurred, please report a bug"), file=sys.stderr)
+ print >> sys.stderr, _("Traceback occurred, please report a " +
+ "bug at https://issues.kolab.org")
 
 sys.exit(exitcode)
 
- # pylint: disable=no-self-use
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-locals
 def do_sync(self):
 domain_auth = {}
 
+ pid = os.getpid()
+
 primary_domain = conf.get('kolab', 'primary_domain')
 
 while 1:
@@ -239,23 +248,23 @@
 try:
 primary_auth.connect()
 connected = True
- except Exception as errmsg:
+ except Exception, errmsg:
 connected = False
- log.error(_l("Could not connect to LDAP, is it running?"))
- log.error(_l("Error: %r") % (errmsg))
- log.error("Traceback: %r" % (traceback.format_exc()))
+ log.error(_("Could not connect to LDAP, is it running?"))
 time.sleep(5)
 
- log.debug(_l("Listing domains..."), level=5)
+ log.debug(_("Listing domains..."), level=5)
+
+ start = time.time()
 
 try:
 domains = primary_auth.list_domains()
- except Exception:
+ except:
 time.sleep(60)
 continue
 
- if not domains:
- log.error(_l("No domains. Not syncing"))
+ if isinstance(domains, list) and len(domains) < 1:
+ log.error(_("No domains. Not syncing"))
 time.sleep(5)
 continue
 
@@ -276,32 +285,29 @@
 
 for primary in primaries:
 naming_context = primary_auth.domain_naming_context(primary)
-
- # pylint: disable=protected-access
 domain_root_dn = primary_auth._auth._kolab_domain_root_dn(primary)
-
 log.debug(
- _l("Domain %r naming context: %r, root dn: %r") % (
- primary,
- naming_context,
- domain_root_dn
- ),
- level=8
- )
+ _("Domain %r naming context: %r, root dn: %r") % (
+ primary,
+ naming_context,
+ domain_root_dn
+ ),
+ level=8
+ )
 
- domain_root_dnsprimary = domain_root_dn.lower()
- naming_contextsprimary = naming_context.lower()
+ domain_root_dnsprimary = domain_root_dn
+ naming_contextsprimary = naming_context
 
 log.debug(
- _l("Naming contexts to synchronize: %r") % (
- list(set(naming_contexts.values()))
- ),
- level=8
- )
+ _("Naming contexts to synchronize: %r") % (
+ list(set(naming_contexts.values()))
+ ),
+ level=8
+ )
 
 # Find however many naming contexts we have, and what the
 # corresponding domain name is for them.
- primary_domains = x for x, y in naming_contexts.items() if domain_root_dnsx == y
+ primary_domains = x for x,y in naming_contexts.iteritems() if domain_root_dnsx == y
 
 # Now we can check if any changes happened.
 added_domains = 
@@ -311,44 +317,41 @@
 # accounted for locally.
 all_domains = list(set(primary_domains + domain_auth.keys()))
 
- log.debug(_l("Result set of domains: %r") % (all_domains), level=8)
+ log.debug(_("Result set of domains: %r") % (all_domains), level=8)
 
 for domain in all_domains:
- log.debug(_l("Checking for domain %s") % (domain), level=8)
+ log.debug(_("Checking for domain %s") % (domain), level=8)
 
- if domain in domain_auth and domain in primary_domains:
+ if domain in domain_auth.keys() and domain in primary_domains:
 if not domain_authdomain.is_alive():
- log.debug(_l("Domain %s isn't alive anymore.") % (domain), level=8)
+ log.debug(_("Domain %s isn't alive anymore.") % (domain), level=8)
 domain_authdomain.terminate()
 added_domains.append(domain)
 else:
- log.debug(_l("Domain %s already there and alive.") % (domain), level=8)
+ log.debug(_("Domain %s already there and alive.") % (domain), level=8)
 continue
 
- elif domain in domain_auth:
- log.debug(_l("Domain %s should not exist any longer.") % (domain), level=8)
+ elif domain in domain_auth.keys():
+ log.debug(_("Domain %s should not exist any longer.") % (domain), level=8)
 removed_domains.append(domain)
 else:
- log.debug(_l("Domain %s does not have a process yet.") % (domain), level=8)
+ log.debug(_("Domain %s does not have a process yet.") % (domain), level=8)
 added_domains.append(domain)
 
- if not removed_domains and not added_domains:
+ if len(removed_domains) == 0 and len(added_domains) == 0:
 try:
- sleep_between_domain_operations_in_seconds = (float)(
- conf.get(
- 'kolab',
- 'domain_sync_interval'
- )
- )
-
+ sleep_between_domain_operations_in_seconds = (float)(conf.get('kolab', 'domain_sync_interval'))
 time.sleep(sleep_between_domain_operations_in_seconds)
 except ValueError:
 time.sleep(600)
 
 log.debug(
- _l("added domains: %r, removed domains: %r") % (added_domains, removed_domains),
- level=8
- )
+ _("added domains: %r, removed domains: %r") % (
+ added_domains,
+ removed_domains
+ ),
+ level=8
+ )
 
 for domain in added_domains:
 domain_authdomain = Process(domain)
@@ -373,15 +376,11 @@
 at the same time, and therefore we need to test if the PID file
 exists, and only try/except removing it.
 """
- try:
- for p in multiprocessing.active_children():
- p.terminate()
-
- if os.access(conf.pidfile, os.R_OK):
+ if os.access(conf.pidfile, os.R_OK):
+ try:
 os.remove(conf.pidfile)
-
- except Exception:
- pass
+ except:
+ pass
 
 raise SystemExit

pykolab-0.8.23.tar.gz/kolabd/process.py -> pykolab-0.8.4.tar.gz/kolabd/process.py Changed

@@ -17,13 +17,13 @@
 #
 
 import multiprocessing
+import os
 import time
 
 import pykolab
 from pykolab.auth import Auth
 from pykolab.translate import _
 
-# pylint: disable=invalid-name
 log = pykolab.getLogger('pykolab.daemon')
 conf = pykolab.getConf()
 
@@ -33,11 +33,11 @@
         self.domain = domain
         log.debug(_("Process created for domain %s") % (domain), level=8)
         multiprocessing.Process.__init__(
-            self,
-            target=self.synchronize,
-            args=(domain,),
-            name="Kolab(%s)" % domain
-        )
+                self,
+                target=self.synchronize,
+                args=(domain,),
+                name="Kolab(%s)" % domain
+            )
 
     def synchronize(self, domain):
         log.debug(_("Synchronizing for domain %s") % (domain), level=8)
@@ -56,7 +56,7 @@
                 time.sleep(sync_interval)
             except KeyboardInterrupt:
                 break
-            except Exception as errmsg:
+            except Exception, errmsg:
                 log.error(_("Error in process %r, terminating:\n\t%r") % (self.name, errmsg))
                 import traceback
                 traceback.print_exc()

pykolab-0.8.23.tar.gz/po/POTFILES.skip -> pykolab-0.8.4.tar.gz/po/POTFILES.skip Changed

pykolab-0.8.23.tar.gz/po/de.po -> pykolab-0.8.4.tar.gz/po/de.po Changed

@@ -22,9 +22,9 @@
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:22+0100\n"
-"PO-Revision-Date: 2016-12-02 14:22+0000\n"
-"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-09-27 07:33+0000\n"
+"Last-Translator: Mads <mads@batmads.com>\n"
 "Language-Team: German (http://www.transifex.com/kolab/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -150,151 +150,151 @@
 msgid "Unverifiable sender."
 msgstr "Nicht überprüfbarer Absender."
 
-#: ../bin/kolab_smtp_access_policy.py:1083
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr "Absender nutzt keinen Alias"
 
-#: ../bin/kolab_smtp_access_policy.py:1092
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Absender nutzt unerlaubte Absender-Umschlag Adresse"
 
-#: ../bin/kolab_smtp_access_policy.py:1109
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Konnte den Absender nicht verifizieren"
 
-#: ../bin/kolab_smtp_access_policy.py:1116
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr "Überprüfe ob Absender an Empfänger gemäß Absender-Richtlinie senden darf"
 
-#: ../bin/kolab_smtp_access_policy.py:1129
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Das Ergebnis ist %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1134
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Es existiert keine Empfängerrichtlinie für diesen Absender"
 
-#: ../bin/kolab_smtp_access_policy.py:1143
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Empfänger-Richtlinie für diesen Benutzer gefunden"
 
-#: ../bin/kolab_smtp_access_policy.py:1158
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr "Absender %s darf nicht an Empfänger %s senden"
 
-#: ../bin/kolab_smtp_access_policy.py:1186
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Aufräumen des Cache"
 
-#: ../bin/kolab_smtp_access_policy.py:1209
+#: ../bin/kolab_smtp_access_policy.py:1207
 msgid ""
 "The 'uri' setting in the kolab_smtp_access_policy section is soon going to "
 "be deprecated in favor of 'cache_uri'"
 msgstr "Die 'uri' Einstellung im Abschnitt kolab_smtp_access_policy wird bald überholt sein. Nutzen Sie 'cache_uri' stattdessen "
 
-#: ../bin/kolab_smtp_access_policy.py:1225
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr "Betriebsbedingter Fehler beim Cachen: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1278
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr "Cachen des Richtlinienergebnisses mit Zeitstempel %d"
 
-#: ../bin/kolab_smtp_access_policy.py:1355
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr "Antwort Aktion DEFER_IF_PERMIT: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1360
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr "Antwort Aktion DUNNO: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1365
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr "Antwort Aktion HOLD: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1370
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr "Antwort Aktion PERMIT: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1498
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr "Antwort Aktion REJECT: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1544
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr "Starte Schleife für neue Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1551
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr "Zeitüberschreitung beim Lesen der Richtlinienanfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Ende der aktuellen Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1561
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr "Lese Zeile: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1565
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr "Rückgabe Richtlinenanfordung"
 
-#: ../bin/kolab_smtp_access_policy.py:1594
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr "Zugriffsrichtlinien-Einstellungen"
 
-#: ../bin/kolab_smtp_access_policy.py:1601
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr "Zeitüberschreitung der SMTP Richtlinien-Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1607
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr "Verifiziere die Empfänger-Zugriffs-Richtlinie."
 
-#: ../bin/kolab_smtp_access_policy.py:1613
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr "Verifiziere die Sender-Zugriffs-Richtlinie."
 
-#: ../bin/kolab_smtp_access_policy.py:1619
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr "Erlaube nicht authentisierte Sender."
 
-#: ../bin/kolab_smtp_access_policy.py:1633
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr "Anfrage bekommen für Instanz %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1642
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr "Anfrage-Instanz %s ist im Status %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1674
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr "Unbehandelte Ausnahme abgefangen: %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1678
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr "Sender Zugriff verweigert"
 
-#: ../bin/kolab_smtp_access_policy.py:1680
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr "Empfänger Zugriff verweigert"
 
-#: ../bin/kolab_smtp_access_policy.py:1682
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr "Keine Einwände"
 
@@ -377,7 +377,7 @@
 msgid "Could not connect to LDAP, is it running?"
 msgstr "Konnte nicht zu LDAP verbinden, läuft es?"
 
-#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2528
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
 #: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr "Liste Domains auf..."
@@ -511,16 +511,16 @@
 msgid "Authentication cache failed: %r"
 msgstr "Authentifizierungscache fehlgeschlagen: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1445
-#: ../pykolab/auth/ldap/__init__.py:1471 ../pykolab/auth/ldap/__init__.py:3070
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
 #, python-format
 msgid "LDAP server unavailable: %r"
 msgstr "LDAP-Server nicht erreichbar: %r"
 
 #: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
-#: ../pykolab/auth/ldap/__init__.py:1320 ../pykolab/auth/ldap/__init__.py:1446
-#: ../pykolab/auth/ldap/__init__.py:1472 ../pykolab/auth/ldap/__init__.py:1760
-#: ../pykolab/auth/ldap/__init__.py:3071 ../pykolab/auth/ldap/__init__.py:3081
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
 #, python-format
 msgid "%s"
 msgstr "%s"
@@ -597,319 +597,319 @@
 msgid "Attempting to use LDAP URI %s"
 msgstr "Versuche LDAP URI %s zu benutzen"
 
-#: ../pykolab/auth/ldap/__init__.py:525
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr "Eintragkennung: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:527
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr "Eintrag DN: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:530
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist= 'dn' + %r"
 msgstr "LDAP Suche: (%r, %r, filterstr='(objectclass=*)', attrlist= 'dn' + %r"
 
-#: ../pykolab/auth/ldap/__init__.py:649 ../pykolab/auth/ldap/__init__.py:805
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr "Finde Ressource mit Filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:725
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr "Finde Empfänger mit Filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:836
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr "Zeitstempel %r wird verwendet"
 
-#: ../pykolab/auth/ldap/__init__.py:873
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
 msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:883
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr "Anwendung Empfängerrichtlinie zu %r"
 
-#: ../pykolab/auth/ldap/__init__.py:900
+#: ../pykolab/auth/ldap/__init__.py:896
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:911
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr "Key %r nicht im Eintrag"
 
-#: ../pykolab/auth/ldap/__init__.py:913
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr "Key %r ist das primäre Mailattr."
 
-#: ../pykolab/auth/ldap/__init__.py:915
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr "Primäre Mailrichtlinie ist nicht leer"
 
-#: ../pykolab/auth/ldap/__init__.py:918
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr "Key %r ist das sekundäre Mailattr."
 
-#: ../pykolab/auth/ldap/__init__.py:920
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr "Sekundäre Mailrichtlinie ist nicht leer"
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:938
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr "Attribute %r sind für Eintrag %r noch nicht verfügbar"
 
-#: ../pykolab/auth/ldap/__init__.py:977
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr "Keine Ergebnisse für E-Mail-Adresse %s gefunden"
 
-#: ../pykolab/auth/ldap/__init__.py:988
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr "1 Ergebnis für Adresse %s gefunden, prüfe"
 
-#: ../pykolab/auth/ldap/__init__.py:998
+#: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
 msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1009 ../pykolab/auth/ldap/__init__.py:1098
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr "Uns zugewiesene Adresse"
 
-#: ../pykolab/auth/ldap/__init__.py:1064
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr "Keine Ergebnisse für Adresse %s gefunden"
 
-#: ../pykolab/auth/ldap/__init__.py:1075
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
 msgid "1 result for address %s found, verifying..."
 msgstr "1 Ergebnis für Adresse %s gefunden, wird überprüft..."
 
-#: ../pykolab/auth/ldap/__init__.py:1086
+#: ../pykolab/auth/ldap/__init__.py:1082
 #, python-format
 msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1113
+#: ../pykolab/auth/ldap/__init__.py:1109
 #, python-format
 msgid ""
 "Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1124
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr "Gewünschte sekundäre E-Mail-Adresse ist nicht leer: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1135
+#: ../pykolab/auth/ldap/__init__.py:1131
 #, python-format
 msgid ""
 "Avoiding the duplication of the primary mail address %r in the list of "
 "secondary mail addresses"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1146
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr "Eintrag erhält die sekundären E-Mail-Adressen: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1154
+#: ../pykolab/auth/ldap/__init__.py:1150
 #, python-format
 msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1171 ../pykolab/auth/ldap/__init__.py:1177
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1172 ../pykolab/auth/ldap/__init__.py:1178
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry%s: %r"
 msgstr "Eintrag%s: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1189
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1223
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1259
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr "Konnte dn %r nicht aktualisieren:\n%r"
 
-#: ../pykolab/auth/ldap/__init__.py:1285
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr "Filter %r wird verwendet"
 
-#: ../pykolab/auth/ldap/__init__.py:1300
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1347
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, python-format
 msgid ""
 "About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
 "default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1406
 msgid "Attempting to bind without a DN but with a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1415
+#: ../pykolab/auth/ldap/__init__.py:1411
 msgid "Attempting to bind with a DN but without a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1433
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
 msgid "Binding with bind_dn: %s and password: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1451 ../pykolab/auth/ldap/__init__.py:1475
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
 msgid "Invalid DN, username and/or password."
 msgstr "Ungültiger DN, Nutzername und/oder Passwort."
 
-#: ../pykolab/auth/ldap/__init__.py:1456
+#: ../pykolab/auth/ldap/__init__.py:1452
 msgid "bind() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1478
+#: ../pykolab/auth/ldap/__init__.py:1474
 msgid "bind_priv() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1690
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr "Eintrag %s Attributwert: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1698
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr "imap.user_mailbox_server(%r)-Ergebnis: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1759
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
 msgid "An error occured: %r"
 msgstr "Ein Fehler ist aufgetreten: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1997 ../pykolab/auth/ldap/__init__.py:2191
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr "Ergebnis der Empfängerrichtlinie: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2246
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2271
+#: ../pykolab/auth/ldap/__init__.py:2267
 #, python-format
 msgid "Naming contexts found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2278
+#: ../pykolab/auth/ldap/__init__.py:2274
 #, python-format
 msgid "Domains/Root DNs found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2438
+#: ../pykolab/auth/ldap/__init__.py:2434
 #, python-format
 msgid "Searching root dn for domain %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2443
+#: ../pykolab/auth/ldap/__init__.py:2439
 #, python-format
 msgid "Returning from cache: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2448
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr "Suche root dn für die Domain %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2478
+#: ../pykolab/auth/ldap/__init__.py:2474
 #, python-format
 msgid "Setting domain root dn from LDAP for domain %r: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2624 ../pykolab/auth/ldap/__init__.py:2672
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr "Eintragtyp: %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2750
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr "LDAP-Suchergebnisdateneintrag:"
 
-#: ../pykolab/auth/ldap/__init__.py:2766
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2771
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr "Typ ändern: %r (%r)"
 
-#: ../pykolab/auth/ldap/__init__.py:2779
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr "Vorheriger DN: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2834
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "Das gesuchte Objekt %s existiert nicht mehr"
 
-#: ../pykolab/auth/ldap/__init__.py:2844
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr "%d Ergebnisse..."
 
-#: ../pykolab/auth/ldap/__init__.py:2947
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr "Suchvorgang mit Filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2999
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3018
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr "Unterstützung für %s gefunden"
 
-#: ../pykolab/auth/ldap/__init__.py:3072
+#: ../pykolab/auth/ldap/__init__.py:3068
 msgid "-- reconnecting in 10 seconds."
 msgstr "-- erneuter Verbindungsaufbau in 10 Sekunden."
 
-#: ../pykolab/auth/ldap/__init__.py:3080
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 msgstr ""
@@ -1378,44 +1378,44 @@
 msgid "Display changes, do not apply them."
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:91
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:88
 #, python-format
 msgid "Domains in IMAP not in LDAP: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:108
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:156
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, python-format
 msgid ""
 "No recipients for '%s' (would have deleted the mailbox if not for --dry-"
 "run)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:113
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:161
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, python-format
 msgid "Deleting mailbox '%s' because it has no recipients"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:117
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:165
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, python-format
 msgid "An error occurred removing mailbox %r: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:119
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:167
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, python-format
 msgid "Not automatically deleting shared folder '%s'"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:121
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:169
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:150
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
@@ -1823,7 +1823,7 @@
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr "Verbindung zum Cyrus IMAP-Server %r nicht möglich"
 
-#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:287
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
@@ -1864,22 +1864,22 @@
 msgstr "Server für EINGANGS-Ordner %s ist %s"
 
 #. Removed server reconnection for dovecot, we only have one server
-#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:313
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr "Kontingent für Ordner %s auf %s wird festgelegt"
 
-#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:317
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr "Kontingent für Mailordner %s konnte nicht festgelegt werden"
 
-#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:322
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr "EINGANGS-Ordner wird von %s nach %s auf Partition %s verschoben"
 
-#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:324
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr "EINGANGS-Ordner wird von %s nach %s verschoben"
@@ -1894,12 +1894,12 @@
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr "Konnte Annotation %r auf Verzeichnis %r nicht setzen: %r"
 
-#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:453
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr "Übertrage Verzeichnis %s von %s nach %s"
 
-#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:513
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr "Wiederherstellen %s nach %s"
@@ -1909,26 +1909,26 @@
 msgid "Would have transferred %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:526
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:222
+#: ../pykolab/imap/dovecot.py:220
 #, python-format
 msgid "Could not connect to Dovecot IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:294
+#: ../pykolab/imap/dovecot.py:292
 msgid "Detected METADATA support"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:297
+#: ../pykolab/imap/dovecot.py:295
 #, python-format
 msgid "This system does not support METADATA: '%s'"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:524
+#: ../pykolab/imap/dovecot.py:522
 #, python-format
 msgid "Would have transfered %s from %s to %s"
 msgstr "Haben %s von %s nach %s übertragen"
@@ -2012,186 +2012,181 @@
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:429 ../pykolab/imap/__init__.py:465
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr "Erzeuge einen neuen geteilten Ordner %s"
 
-#: ../pykolab/imap/__init__.py:494 ../pykolab/imap/__init__.py:786
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:498
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr "Erzeuge eine neue Mailbox für Benutzer %s"
 
-#: ../pykolab/imap/__init__.py:511
-#, python-format
-msgid "Could not create the mailbox for user %s, aborting."
-msgstr ""
-
-#: ../pykolab/imap/__init__.py:525 ../pykolab/imap/__init__.py:654
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:600
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr "Erzeuge weitere Order für Benutzer %s"
 
-#: ../pykolab/imap/__init__.py:628
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:643
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:659
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr "Mailbox existiert bereits: %s"
 
-#: ../pykolab/imap/__init__.py:699
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr "Abonniere weitere Ordner für den Benutzer"
 
-#: ../pykolab/imap/__init__.py:713
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:715
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid " %r"
 msgstr " %r"
 
-#: ../pykolab/imap/__init__.py:718
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr "Ordner %s"
 
-#: ../pykolab/imap/__init__.py:730
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:734
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:760
+#: ../pykolab/imap/__init__.py:750
 #, python-format
 msgid "Could not set quota on %s"
 msgstr "Kontingent auf %s konnte nicht festgelegt werden"
 
-#: ../pykolab/imap/__init__.py:767
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:804
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr "Umzubenennender EINGANGS-Ordner (%s) ist nicht vorhanden"
 
-#: ../pykolab/imap/__init__.py:807 ../pykolab/imap/__init__.py:915
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr "EINGANGS-Ordner wird von %s in %s umbenannt"
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr "Konnte EINGANGS-Ordner nicht von %s in %s umbenennen"
 
-#: ../pykolab/imap/__init__.py:813 ../pykolab/imap/__init__.py:919
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr "EINGANGS-Ordner %s kann nicht verschoben werden, weil der Zielordner %s bereits vorhanden ist"
 
-#: ../pykolab/imap/__init__.py:817
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr "Server für Postfach %r ist %r"
 
-#: ../pykolab/imap/__init__.py:825
+#: ../pykolab/imap/__init__.py:815
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr "Auf der Suche nach dem Ordner '%s' haben wir diese Ordner gefunden: %r"
 
-#: ../pykolab/imap/__init__.py:839 ../pykolab/imap/__init__.py:882
-#: ../pykolab/imap/__init__.py:896
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
 msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:871
+#: ../pykolab/imap/__init__.py:861
 #, python-format
 msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:912
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr "Alter EINGANGS-Ordner %s gefunden"
 
-#: ../pykolab/imap/__init__.py:921
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr "Konnte alten Ordner user/%s nicht zum umbenennen finden."
 
-#: ../pykolab/imap/__init__.py:923
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
 msgstr "Der Wert für user ist kein dictionary"
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:991
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr "Kann aktuelles IMAP-Kontingent für den Ordner %s nicht holen"
 
-#: ../pykolab/imap/__init__.py:1004
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr "Kontingent für %s ist aktuell %s"
 
-#: ../pykolab/imap/__init__.py:1010
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1015
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr "Kontingent für %s wird zu %s korrigiert (aktuell %s)"
 
-#: ../pykolab/imap/__init__.py:1092
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr "Überprüfe Ordner: %s"
 
-#: ../pykolab/imap/__init__.py:1097
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1100
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1115
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1118
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Lösche Verzeichnis %s"
@@ -2200,52 +2195,52 @@
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:47
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:53
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:66
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr "Konnte iTip nicht aus Nachricht lesen."
 
-#: ../pykolab/itip/__init__.py:74
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr "Verdopple iTip Objekt: %s"
 
-#: ../pykolab/itip/__init__.py:99
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr "iTip Termin ohne einen Beginn"
 
-#: ../pykolab/itip/__init__.py:144
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr "Nachricht ist keine iTip Nachricht (keine Multipart Nachricht)"
 
-#: ../pykolab/itip/__init__.py:310
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr "Sende iTip Antwort %s für %s %r"
 
-#: ../pykolab/itip/__init__.py:326
+#: ../pykolab/itip/__init__.py:277
 #, python-format
 msgid "Failed to compose iTip reply message: %r: %s"
 msgstr "Erstellung iTip Antwortnachricht fehlgeschlagen: %r: %s"
 
-#: ../pykolab/itip/__init__.py:337 ../pykolab/itip/__init__.py:381
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
 #: ../wallace/module_invitationpolicy.py:1253
 #: ../wallace/module_invitationpolicy.py:1328
-#: ../wallace/module_resources.py:1364
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr "SMTP sendmail-Fehler: %r"
 
-#: ../pykolab/itip/__init__.py:369
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr "Erstellung iTip Anforderungsnachricht fehlgeschlagen: %r"
@@ -2795,19 +2790,11 @@
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:459
-msgid "Configuring and refreshing Anti-Virus..."
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:472
-msgid "Could not find a ClamAV update configuration file"
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:515
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:533
+#: ../pykolab/setup/setup_mta.py:500
 msgid ""
 "Could not configure to start on boot, the postfix, clamav and amavisd "
 "services."
@@ -2953,13 +2940,13 @@
 msgid "Cannot find the configuration directory for roundcube."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:305
-#: ../pykolab/setup/setup_syncroton.py:104
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:314
-#: ../pykolab/setup/setup_syncroton.py:113
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
 msgid "Could not configure to start on boot, the webserver server service."
 msgstr ""
 
@@ -3263,7 +3250,7 @@
 msgid "Every %d seconds"
 msgstr "Alle %d Sekunden"
 
-#: ../pykolab/xml/todo.py:165
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
@@ -3405,7 +3392,7 @@
 msgstr ""
 
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
-#: ../wallace/module_resources.py:1268
+#: ../wallace/module_resources.py:1251
 #, python-format
 msgid "Reservation Request for %(summary)s was %(status)s"
 msgstr ""
@@ -3416,7 +3403,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
-#: ../wallace/module_resources.py:1352
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr "Buchung für %s wurde %s"
@@ -3432,7 +3419,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
-#: ../wallace/module_resources.py:1450
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr "Buchungsanfrage für %s benötigt eine Bestätigung"
@@ -3470,7 +3457,7 @@
 msgid "\"%s\" has been updated"
 msgstr "\"%s\" wurde aktualisiert"
 
-#: ../tests/unit/test-011-itip.py:534
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr "Einladung für %(summary)s war %(status)s"
@@ -3527,21 +3514,21 @@
 
 #: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
 #: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:129
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
 #: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
 #: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
 #: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
 #: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:138
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
@@ -3817,48 +3804,48 @@
 msgstr "Ordnersuche %r nach %s %r"
 
 #: ../wallace/module_invitationpolicy.py:852
-#: ../wallace/module_resources.py:691 ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
 #, python-format
 msgid "No UID found in IMAP response: %r"
-msgstr "Keine UID in der IMAP Antwort gefunden: %r"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:878
 #, python-format
 msgid "Failed to parse %s from message %s/%s: %s"
-msgstr "Fehler beim Auslesen von %s aus Nachricht %s/%s: %s"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:906
 #, python-format
 msgid "Listing events from folder %r"
-msgstr "Auflisten der Ereignisse aus Ordner \"%r\""
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:919
-#: ../wallace/module_resources.py:498 ../wallace/module_resources.py:699
-#: ../wallace/module_resources.py:779
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
-msgstr "Fehler beim Auslesen des Ereignisses aus Nachricht %s/%s: %r"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:925
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
-msgstr "Das bestehende Ereignis \"%r\" kollidiert mit der Einladung \"%r\""
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:932
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
-msgstr "Start: %r, Ende: %r, Gesamt: %r, Nachrichten: %d"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:960
 #, python-format
 msgid "%r is locked, waiting..."
-msgstr "%r ist gesperrt, warte..."
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1040
 #, python-format
 msgid "Failed to save %s: no target folder found for user %r"
-msgstr "Fehler beim Speichern von \"%s\" Zielordner für Benutzer %r nicht vorhanden."
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1051
 #, python-format
@@ -3868,7 +3855,7 @@
 #: ../wallace/module_invitationpolicy.py:1064
 #, python-format
 msgid "Failed to save %s to user folder at %r: %r"
-msgstr "Fehler beim Speichern von \"%s\" im Ordner %r: %r"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1083
 #, python-format
@@ -3883,29 +3870,29 @@
 #: ../wallace/module_invitationpolicy.py:1102
 #, python-format
 msgid "Failed to delete %s from folder %r: %r"
-msgstr "Fehler beim Löschen von \"%s\" aus dem Ordner %r: %r"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1130
 #: ../wallace/module_invitationpolicy.py:1304
 #, python-format
 msgid "%s commented: %s"
-msgstr "%s kommentiert: %s"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1133
 #, python-format
 msgid "Compose participation status summary for %s %r to user %r"
-msgstr "Erzeuge Teilnahmestatusübersicht für \"%s\" %r an Benutzer %r"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1171
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
-msgstr "Warte auf weitere automatische Antworten (bereits erhalten %d von %d); überspringe Benachrichtigung"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1192
 #, python-format
 msgid "Changes submitted by %s have been automatically applied."
-msgstr "Die von %s durchgeführten Änderungen wurden automatischen angewendet."
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1201
 msgid "(removed)"
@@ -3931,7 +3918,7 @@
 
 #: ../wallace/module_invitationpolicy.py:1225
 msgid "NOTE: This update only refers to this single occurrence!"
-msgstr "BEACHTE: Die Änderung bezieht sich nur auf diesen einzelnen Eintrag."
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1227
 #: ../wallace/module_invitationpolicy.py:1309
@@ -3942,7 +3929,7 @@
 #: ../wallace/module_invitationpolicy.py:1249
 #, python-format
 msgid "Sent update notification to %r: %r"
-msgstr "Aktualisierungsbenachrichtigung an %r: %r gesendet"
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1274
 #, python-format
@@ -3956,7 +3943,7 @@
 
 #: ../wallace/module_invitationpolicy.py:1289
 msgid "The copy in your tasklist has been removed accordingly."
-msgstr "Der Eintrag wurde entsprechend aus Ihrer Aufgabenliste entfernt."
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1291
 msgid "The copy in your tasklist has been marked as cancelled accordingly."
@@ -3970,7 +3957,7 @@
 
 #: ../wallace/module_invitationpolicy.py:1299
 msgid "The copy in your calendar has been removed accordingly."
-msgstr "Der Eintrag wurde entsprechend aus Ihrem Kalender entfernt."
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1301
 msgid "The copy in your calendar has been marked as cancelled accordingly."
@@ -3978,7 +3965,7 @@
 
 #: ../wallace/module_invitationpolicy.py:1307
 msgid "NOTE: This cancellation only refers to this single occurrence!"
-msgstr "BEACHTE: Die Absage bezieht sich nur auf diesen einzelnen Eintrag."
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1401
 #, python-format
@@ -3998,12 +3985,12 @@
 #: ../wallace/module_invitationpolicy.py:1414
 #, python-format
 msgid "%(name)s has %(status)s your assignment for %(summary)s."
-msgstr "%(name)s hat die Zuweisung für \"%(summary)s\" %(status)s."
+msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:1416
 #, python-format
 msgid "%(name)s has %(status)s your invitation for %(summary)s."
-msgstr "%(name)s hat ihre Einladung für den Termin \"%(summary)s\" %(status)s."
+msgstr ""
 
 #. modules.next_module('optout')
 #: ../wallace/module_optout.py:70
@@ -4027,314 +4014,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:119
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:184
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:189
+#: ../wallace/module_resources.py:187
 msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:197
+#: ../wallace/module_resources.py:195
 #, python-format
 msgid ""
 "iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:228
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:239
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:248
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:258
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr "Ressourcen: %r; %r"
 
-#: ../wallace/module_resources.py:272
+#: ../wallace/module_resources.py:270
 #, python-format
 msgid "iTip REPLY to %r, %r; matches %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:278
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
 #, python-format
 msgid "Could not find envelope sender attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:285
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:304
+#: ../wallace/module_resources.py:302
 #, python-format
 msgid "Invalid response (%r) received from resource owner for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:306
 #, python-format
 msgid "Event referenced by this REPLY (%r) not found in resource calendar"
 msgstr ""
 
-#: ../wallace/module_resources.py:311
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:320
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr "Empfange Ressource: %r; %r"
 
-#: ../wallace/module_resources.py:322
+#: ../wallace/module_resources.py:320
 #, python-format
 msgid "Could not find envelope attendee: %r"
 msgstr "Kann Umschlag-Teilnehmer nicht finden: %r"
 
-#: ../wallace/module_resources.py:328
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr "Empfänger %r ist kein Teilnehmer, ignoriere Nachricht"
 
-#: ../wallace/module_resources.py:338
+#: ../wallace/module_resources.py:336
 #, python-format
 msgid "Cancellation for entire event %r: deleting"
 msgstr "Absage für gesamtes Ereignis %r: lösche"
 
-#: ../wallace/module_resources.py:342
+#: ../wallace/module_resources.py:340
 #, python-format
 msgid "Cancellation for a single occurrence %r of %r: updating..."
 msgstr "Absage für einzelne Wiederholung %r von %r: aktualisiere..."
 
-#: ../wallace/module_resources.py:392
-#, python-format
-msgid "Delegate invitation for resource collection %r to %r"
-msgstr "Delegiere Einladung für Ressourcen-Gruppe %r zu %r"
-
-#: ../wallace/module_resources.py:398 ../wallace/module_resources.py:802
-#, python-format
-msgid "Apply invitation policies %r"
-msgstr "Anwenden der Einladungsrichtlinie %r"
-
-#: ../wallace/module_resources.py:407
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr "Akzeptiere Einladung für individuelle Ressource %r / %r"
 
-#. this is the receiving resource record
-#: ../wallace/module_resources.py:411
+#: ../wallace/module_resources.py:390
 #, python-format
-msgid "Decline invitation for individual resource %r / %r"
-msgstr ""
+msgid "Delegate invitation for resource collection %r to %r"
+msgstr "Delegiere Einladung für Ressourcen-Gruppe %r zu %r"
 
-#: ../wallace/module_resources.py:427
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr "module_resources.heartbeat(%d)"
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr "Entfernen Ressourcen-Kalender für %s (%s) fehlgeschlagen: %r"
 
-#: ../wallace/module_resources.py:474
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr "Entferne Ereignisse in Ressourcen-Verzeichnis %r älter als %d Tage"
 
-#: ../wallace/module_resources.py:487
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr "Lade Nachrichten-ID %r aus Verzeichnis %r"
 
-#: ../wallace/module_resources.py:513
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr "Kennzeiche Ereigniss %s aus Nachricht %s/%s als gelöscht (Alter = %d Tage)"
 
-#: ../wallace/module_resources.py:538
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr "Lesen des Ressourcen-Kalender for %r fehlgeschlagen: %r"
 
-#: ../wallace/module_resources.py:548
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr "Suchen für Ressource %r"
 
-#: ../wallace/module_resources.py:551
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr "Resource %r wurde von Liste entfernt"
 
-#: ../wallace/module_resources.py:555
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr "Ressource ist eine Sammlung"
 
-#: ../wallace/module_resources.py:566
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr "Kollidierende Ressourcen von %r entfernt: (%r) => %r"
 
-#: ../wallace/module_resources.py:578
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr "Kollidierende Ereignisse: %r für Ressource %r"
 
-#: ../wallace/module_resources.py:601
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr "Delegiere an anderes Ressource-Gruppenmitglied: %r zu %r"
 
-#: ../wallace/module_resources.py:663
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr "Prüfe Ereignisse in Ressourcen-Verzeichnis %r"
 
-#: ../wallace/module_resources.py:682
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr "Lade Nachricht UID %r aus Verzeichnis %r"
 
-#: ../wallace/module_resources.py:715
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr "Ereignis %r kollidiert mit Ereignis %r"
 
-#: ../wallace/module_resources.py:737
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr "Suchvorgang %r nach Ereignis %r"
 
-#: ../wallace/module_resources.py:743
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr "Zugriff auf Ressourcenkalender fehlgeschlagen: %r"
 
-#: ../wallace/module_resources.py:770
+#: ../wallace/module_resources.py:754
 #, python-format
 msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
 msgstr "Recurrence-ID stimmt nicht mit Nachricht %s überein, überspringe: %r != %r"
 
-#: ../wallace/module_resources.py:821
+#: ../wallace/module_resources.py:785
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr "Anwenden der Einladungsrichtlinie %r"
+
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr "Hinzufügen Termin zu %r: %r"
 
-#: ../wallace/module_resources.py:905
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr "Speichern des Termins im Ressourcenkalender fehlgeschlagen in %r: %r"
 
-#: ../wallace/module_resources.py:924
+#: ../wallace/module_resources.py:907
 #, python-format
 msgid "Delete resource calendar object from %r by UID %r"
 msgstr "Lösche Ressourcen-Kalenderobjekt %r mittels UID %r"
 
-#: ../wallace/module_resources.py:932
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr "Lösche Kalenderobjekt der Ressource %r in %r: %r"
 
-#: ../wallace/module_resources.py:943
+#: ../wallace/module_resources.py:926
 #, python-format
 msgid "Failed to delete calendar object %r from folder %r: %r"
 msgstr "Löschen des Kalenderobjekts %r aus Verzeichnis %r fehlgeschlagen: %r"
 
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr "Prüfe ob E-Mail-Adresse %r zu einer Ressource (Sammlung) gehört"
 
-#: ../wallace/module_resources.py:991 ../wallace/module_resources.py:1063
-#: ../wallace/module_resources.py:1097
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr "Ressourcen-Eintrag/Einträge: %r"
 
-#: ../wallace/module_resources.py:993 ../wallace/module_resources.py:1065
-#: ../wallace/module_resources.py:1100
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr "Kein Ressourcen (Sammlung) - Eintrag für %r gefunden"
 
-#: ../wallace/module_resources.py:997 ../wallace/module_resources.py:1069
-#: ../wallace/module_resources.py:1104
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr "Ressourceneinträge: %r"
 
-#: ../wallace/module_resources.py:1015
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr "Originale itip_events: %r"
 
-#: ../wallace/module_resources.py:1023
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr "Originalset der Teilnehmer: %r"
 
-#: ../wallace/module_resources.py:1031
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr "Originalset der Ressourcen: %r"
 
-#: ../wallace/module_resources.py:1036
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr "Originalset der Organisatoren: %r"
 
-#: ../wallace/module_resources.py:1056
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr "Prüfe ob Teilnehmer %r eine Ressource (Sammlung) ist"
 
-#: ../wallace/module_resources.py:1072 ../wallace/module_resources.py:1106
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr "Ressourcenbuchung erfolgt, jedoch keine Ressourceneinträge gefunden"
 
-#: ../wallace/module_resources.py:1091
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr "Prüfe ob Resource %r eine Resource (Sammlung)"
 
-#: ../wallace/module_resources.py:1109
+#: ../wallace/module_resources.py:1092
 #, python-format
 msgid "The following resources are being referred to in the iTip: %r"
-msgstr "Auf die folgenden Ressourcen wurde im iTip Bezug genommen: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1219
 #, python-format
 msgid "Check collections %r for kolabinvitationpolicy attributes"
 msgstr "Prüfe Gruppe %r auf kolabinvitationpolicy Attribute"
 
-#: ../wallace/module_resources.py:1274
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -4344,7 +4325,7 @@
 " "
 msgstr "\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***\n\nIhre Reservierung wurde an \"%s\" delegiert, welche(r) zum angeforderten Termin verfügbar ist.\n "
 
-#: ../wallace/module_resources.py:1293
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -4354,7 +4335,7 @@
 " "
 msgstr "\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***\n\nHiermit informieren wir Sie, dass die Buchung %s wurde.\n "
 
-#: ../wallace/module_resources.py:1300
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -4363,16 +4344,16 @@
 " "
 msgstr "\nWenn Sie Fragen zu dieser Reservierung haben, kontaktieren Sie bitte\n%s <%s> %s\n "
 
-#: ../wallace/module_resources.py:1335
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr "Sende Buchungsbenachrichtigung für Termin %r zu %r von %r"
 
-#: ../wallace/module_resources.py:1353
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr "fehlgeschlagen"
 
-#: ../wallace/module_resources.py:1373
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -4382,7 +4363,7 @@
 " "
 msgstr "\nDie Buchungsanfrage für %(resource)s durch %(orgname)s <%(orgemail)s> ist %(status)s für %(date)s.\n\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***\n "
 
-#: ../wallace/module_resources.py:1379
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -4393,12 +4374,12 @@
 " "
 msgstr "\nEine Buchungsanfrage für %(resource)s konnte nicht automatisch verarbeitet werden.\nBitte kontaktieren Sie %(orgname)s <%(orgemail)s>, welcher die Resource für den %(date)s angefragt hat.\nSubject: %(summary)s.\n\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***"
 
-#: ../wallace/module_resources.py:1410
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr "Kopiere Einladung für Eigentümer Bestätigung: %r von %r"
 
-#: ../wallace/module_resources.py:1429
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"
@@ -4434,7 +4415,7 @@
 #: ../wallace/modules.py:120 ../wallace/modules.py:172
 #, python-format
 msgid "Unknown error occurred; %r"
-msgstr "Unbekannter Fehler aufgetreten; %r"
+msgstr ""
 
 #: ../wallace/modules.py:178
 #, python-format

pykolab-0.8.23.tar.gz/po/de_DE.po -> pykolab-0.8.4.tar.gz/po/de_DE.po Changed

@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:22+0100\n"
-"PO-Revision-Date: 2016-12-02 14:22+0000\n"
-"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-09-16 12:28+0000\n"
+"Last-Translator: Colja Vendel <vendel.colja@googlemail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/kolab/kolab/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -139,151 +139,151 @@
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1083
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1092
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1109
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Konnte den Absender nicht verifizieren"
 
-#: ../bin/kolab_smtp_access_policy.py:1116
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1129
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Das Ergebnis ist %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1134
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Es existiert keine Empfängerrichtlinie für diesen Absender"
 
-#: ../bin/kolab_smtp_access_policy.py:1143
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Empfänger-Richtlinie für diesen Benutzer gefunden"
 
-#: ../bin/kolab_smtp_access_policy.py:1158
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1186
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Aufräumen des Cache"
 
-#: ../bin/kolab_smtp_access_policy.py:1209
+#: ../bin/kolab_smtp_access_policy.py:1207
 msgid ""
 "The 'uri' setting in the kolab_smtp_access_policy section is soon going to "
 "be deprecated in favor of 'cache_uri'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1225
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1278
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1355
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1360
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1365
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1370
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1498
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1544
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr "Starte Schleife für neue Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1551
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Ende der aktuellen Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1561
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1565
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1594
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr "Zugriffsrichtlinien-Einstellungen"
 
-#: ../bin/kolab_smtp_access_policy.py:1601
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr "Zeitüberschreitung der SMTP Richtlinien-Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1607
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1613
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1619
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1633
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1642
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1674
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1678
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1680
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1682
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr ""
 
@@ -366,7 +366,7 @@
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2528
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
 #: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr "Domänen werden geladen…"
@@ -500,16 +500,16 @@
 msgid "Authentication cache failed: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1445
-#: ../pykolab/auth/ldap/__init__.py:1471 ../pykolab/auth/ldap/__init__.py:3070
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
 #, python-format
 msgid "LDAP server unavailable: %r"
 msgstr ""
 
 #: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
-#: ../pykolab/auth/ldap/__init__.py:1320 ../pykolab/auth/ldap/__init__.py:1446
-#: ../pykolab/auth/ldap/__init__.py:1472 ../pykolab/auth/ldap/__init__.py:1760
-#: ../pykolab/auth/ldap/__init__.py:3071 ../pykolab/auth/ldap/__init__.py:3081
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
 #, python-format
 msgid "%s"
 msgstr ""
@@ -586,319 +586,319 @@
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:525
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:527
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:530
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist= 'dn' + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:649 ../pykolab/auth/ldap/__init__.py:805
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:725
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:836
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:873
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
 msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:883
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:900
+#: ../pykolab/auth/ldap/__init__.py:896
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:911
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:913
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:915
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:918
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:920
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:938
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:977
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:988
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:998
+#: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
 msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1009 ../pykolab/auth/ldap/__init__.py:1098
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1064
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1075
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
 msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1086
+#: ../pykolab/auth/ldap/__init__.py:1082
 #, python-format
 msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1113
+#: ../pykolab/auth/ldap/__init__.py:1109
 #, python-format
 msgid ""
 "Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1124
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1135
+#: ../pykolab/auth/ldap/__init__.py:1131
 #, python-format
 msgid ""
 "Avoiding the duplication of the primary mail address %r in the list of "
 "secondary mail addresses"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1146
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1154
+#: ../pykolab/auth/ldap/__init__.py:1150
 #, python-format
 msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1171 ../pykolab/auth/ldap/__init__.py:1177
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1172 ../pykolab/auth/ldap/__init__.py:1178
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry%s: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1189
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1223
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1259
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1285
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1300
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1347
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, python-format
 msgid ""
 "About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
 "default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1406
 msgid "Attempting to bind without a DN but with a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1415
+#: ../pykolab/auth/ldap/__init__.py:1411
 msgid "Attempting to bind with a DN but without a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1433
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
 msgid "Binding with bind_dn: %s and password: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1451 ../pykolab/auth/ldap/__init__.py:1475
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
 msgid "Invalid DN, username and/or password."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1456
+#: ../pykolab/auth/ldap/__init__.py:1452
 msgid "bind() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1478
+#: ../pykolab/auth/ldap/__init__.py:1474
 msgid "bind_priv() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1690
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1698
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1759
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
 msgid "An error occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1997 ../pykolab/auth/ldap/__init__.py:2191
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2246
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2271
+#: ../pykolab/auth/ldap/__init__.py:2267
 #, python-format
 msgid "Naming contexts found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2278
+#: ../pykolab/auth/ldap/__init__.py:2274
 #, python-format
 msgid "Domains/Root DNs found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2438
+#: ../pykolab/auth/ldap/__init__.py:2434
 #, python-format
 msgid "Searching root dn for domain %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2443
+#: ../pykolab/auth/ldap/__init__.py:2439
 #, python-format
 msgid "Returning from cache: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2448
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2478
+#: ../pykolab/auth/ldap/__init__.py:2474
 #, python-format
 msgid "Setting domain root dn from LDAP for domain %r: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2624 ../pykolab/auth/ldap/__init__.py:2672
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2750
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2766
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2771
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2779
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2834
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "Das gesuchte Objekt %s existiert nicht mehr"
 
-#: ../pykolab/auth/ldap/__init__.py:2844
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr "%d Ergebnisse…"
 
-#: ../pykolab/auth/ldap/__init__.py:2947
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2999
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3018
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3072
+#: ../pykolab/auth/ldap/__init__.py:3068
 msgid "-- reconnecting in 10 seconds."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3080
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 msgstr ""
@@ -1367,44 +1367,44 @@
 msgid "Display changes, do not apply them."
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:91
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:88
 #, python-format
 msgid "Domains in IMAP not in LDAP: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:108
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:156
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, python-format
 msgid ""
 "No recipients for '%s' (would have deleted the mailbox if not for --dry-"
 "run)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:113
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:161
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, python-format
 msgid "Deleting mailbox '%s' because it has no recipients"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:117
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:165
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, python-format
 msgid "An error occurred removing mailbox %r: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:119
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:167
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, python-format
 msgid "Not automatically deleting shared folder '%s'"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:121
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:169
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:150
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
@@ -1812,7 +1812,7 @@
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:287
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
@@ -1853,22 +1853,22 @@
 msgstr ""
 
 #. Removed server reconnection for dovecot, we only have one server
-#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:313
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:317
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:322
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:324
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
@@ -1883,12 +1883,12 @@
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:453
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:513
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
@@ -1898,26 +1898,26 @@
 msgid "Would have transferred %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:526
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:222
+#: ../pykolab/imap/dovecot.py:220
 #, python-format
 msgid "Could not connect to Dovecot IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:294
+#: ../pykolab/imap/dovecot.py:292
 msgid "Detected METADATA support"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:297
+#: ../pykolab/imap/dovecot.py:295
 #, python-format
 msgid "This system does not support METADATA: '%s'"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:524
+#: ../pykolab/imap/dovecot.py:522
 #, python-format
 msgid "Would have transfered %s from %s to %s"
 msgstr ""
@@ -2001,186 +2001,181 @@
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:429 ../pykolab/imap/__init__.py:465
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:494 ../pykolab/imap/__init__.py:786
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:498
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:511
-#, python-format
-msgid "Could not create the mailbox for user %s, aborting."
-msgstr ""
-
-#: ../pykolab/imap/__init__.py:525 ../pykolab/imap/__init__.py:654
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:600
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:628
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:643
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:659
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:699
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:713
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:715
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid " %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:718
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:730
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:734
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:760
+#: ../pykolab/imap/__init__.py:750
 #, python-format
 msgid "Could not set quota on %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:767
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:804
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:807 ../pykolab/imap/__init__.py:915
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:813 ../pykolab/imap/__init__.py:919
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:817
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:825
+#: ../pykolab/imap/__init__.py:815
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:839 ../pykolab/imap/__init__.py:882
-#: ../pykolab/imap/__init__.py:896
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
 msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:871
+#: ../pykolab/imap/__init__.py:861
 #, python-format
 msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:912
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:921
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:923
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
 msgstr ""
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:991
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1004
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1010
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1015
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1092
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1097
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1100
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1115
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1118
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr ""
@@ -2189,52 +2184,52 @@
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:47
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:53
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:66
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:74
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:99
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:144
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:310
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:326
+#: ../pykolab/itip/__init__.py:277
 #, python-format
 msgid "Failed to compose iTip reply message: %r: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:337 ../pykolab/itip/__init__.py:381
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
 #: ../wallace/module_invitationpolicy.py:1253
 #: ../wallace/module_invitationpolicy.py:1328
-#: ../wallace/module_resources.py:1364
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:369
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr ""
@@ -2784,19 +2779,11 @@
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:459
-msgid "Configuring and refreshing Anti-Virus..."
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:472
-msgid "Could not find a ClamAV update configuration file"
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:515
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:533
+#: ../pykolab/setup/setup_mta.py:500
 msgid ""
 "Could not configure to start on boot, the postfix, clamav and amavisd "
 "services."
@@ -2942,13 +2929,13 @@
 msgid "Cannot find the configuration directory for roundcube."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:305
-#: ../pykolab/setup/setup_syncroton.py:104
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:314
-#: ../pykolab/setup/setup_syncroton.py:113
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
 msgid "Could not configure to start on boot, the webserver server service."
 msgstr ""
 
@@ -3252,7 +3239,7 @@
 msgid "Every %d seconds"
 msgstr ""
 
-#: ../pykolab/xml/todo.py:165
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
@@ -3394,7 +3381,7 @@
 msgstr ""
 
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
-#: ../wallace/module_resources.py:1268
+#: ../wallace/module_resources.py:1251
 #, python-format
 msgid "Reservation Request for %(summary)s was %(status)s"
 msgstr ""
@@ -3405,7 +3392,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
-#: ../wallace/module_resources.py:1352
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
@@ -3421,7 +3408,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
-#: ../wallace/module_resources.py:1450
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
@@ -3459,7 +3446,7 @@
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/unit/test-011-itip.py:534
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3516,21 +3503,21 @@
 
 #: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
 #: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:129
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
 #: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
 #: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
 #: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
 #: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:138
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
@@ -3806,7 +3793,7 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:852
-#: ../wallace/module_resources.py:691 ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
 #, python-format
 msgid "No UID found in IMAP response: %r"
 msgstr ""
@@ -3822,8 +3809,8 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:919
-#: ../wallace/module_resources.py:498 ../wallace/module_resources.py:699
-#: ../wallace/module_resources.py:779
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
@@ -3834,7 +3821,7 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:932
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
@@ -4016,314 +4003,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:119
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:184
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:189
+#: ../wallace/module_resources.py:187
 msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:197
+#: ../wallace/module_resources.py:195
 #, python-format
 msgid ""
 "iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:228
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:239
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:248
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:258
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:272
+#: ../wallace/module_resources.py:270
 #, python-format
 msgid "iTip REPLY to %r, %r; matches %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:278
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
 #, python-format
 msgid "Could not find envelope sender attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:285
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:304
+#: ../wallace/module_resources.py:302
 #, python-format
 msgid "Invalid response (%r) received from resource owner for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:306
 #, python-format
 msgid "Event referenced by this REPLY (%r) not found in resource calendar"
 msgstr ""
 
-#: ../wallace/module_resources.py:311
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:320
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:322
+#: ../wallace/module_resources.py:320
 #, python-format
 msgid "Could not find envelope attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:328
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:338
+#: ../wallace/module_resources.py:336
 #, python-format
 msgid "Cancellation for entire event %r: deleting"
 msgstr ""
 
-#: ../wallace/module_resources.py:342
+#: ../wallace/module_resources.py:340
 #, python-format
 msgid "Cancellation for a single occurrence %r of %r: updating..."
 msgstr ""
 
-#: ../wallace/module_resources.py:392
-#, python-format
-msgid "Delegate invitation for resource collection %r to %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:398 ../wallace/module_resources.py:802
-#, python-format
-msgid "Apply invitation policies %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:407
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#. this is the receiving resource record
-#: ../wallace/module_resources.py:411
+#: ../wallace/module_resources.py:390
 #, python-format
-msgid "Decline invitation for individual resource %r / %r"
+msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:427
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr ""
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:474
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr ""
 
-#: ../wallace/module_resources.py:487
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:513
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr ""
 
-#: ../wallace/module_resources.py:538
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:548
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:551
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:555
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:566
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:578
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:601
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:663
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:682
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:715
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:737
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:743
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:770
+#: ../wallace/module_resources.py:754
 #, python-format
 msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:821
+#: ../wallace/module_resources.py:785
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:905
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:924
+#: ../wallace/module_resources.py:907
 #, python-format
 msgid "Delete resource calendar object from %r by UID %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:932
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:943
+#: ../wallace/module_resources.py:926
 #, python-format
 msgid "Failed to delete calendar object %r from folder %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:991 ../wallace/module_resources.py:1063
-#: ../wallace/module_resources.py:1097
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:993 ../wallace/module_resources.py:1065
-#: ../wallace/module_resources.py:1100
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:997 ../wallace/module_resources.py:1069
-#: ../wallace/module_resources.py:1104
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1015
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1023
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1031
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1036
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1056
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:1072 ../wallace/module_resources.py:1106
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:1091
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:1109
+#: ../wallace/module_resources.py:1092
 #, python-format
 msgid "The following resources are being referred to in the iTip: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1219
 #, python-format
 msgid "Check collections %r for kolabinvitationpolicy attributes"
 msgstr ""
 
-#: ../wallace/module_resources.py:1274
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -4333,7 +4314,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1293
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -4343,7 +4324,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1300
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -4352,16 +4333,16 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1335
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1353
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr ""
 
-#: ../wallace/module_resources.py:1373
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -4371,7 +4352,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1379
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -4382,12 +4363,12 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1410
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1429
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"

pykolab-0.8.23.tar.gz/po/es.po -> pykolab-0.8.4.tar.gz/po/es.po Changed

@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:22+0100\n"
-"PO-Revision-Date: 2016-12-02 14:22+0000\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -136,151 +136,151 @@
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1083
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1092
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1109
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "No es posible verificar el remitente"
 
-#: ../bin/kolab_smtp_access_policy.py:1116
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1129
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "El resultado es %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1134
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1143
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1158
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1186
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Limpiando la caché"
 
-#: ../bin/kolab_smtp_access_policy.py:1209
+#: ../bin/kolab_smtp_access_policy.py:1207
 msgid ""
 "The 'uri' setting in the kolab_smtp_access_policy section is soon going to "
 "be deprecated in favor of 'cache_uri'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1225
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1278
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1355
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1360
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1365
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1370
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1498
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1544
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1551
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Finalizada la petición actual"
 
-#: ../bin/kolab_smtp_access_policy.py:1561
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr "Obteniendo la línea: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1565
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr "Returning request"
 
-#: ../bin/kolab_smtp_access_policy.py:1594
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1601
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1607
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr "Verificar la política de acceso para los destinatarios"
 
-#: ../bin/kolab_smtp_access_policy.py:1613
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr "Verificar la política de acceso para los remitentes"
 
-#: ../bin/kolab_smtp_access_policy.py:1619
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr "Permitir remitentes no autenticados."
 
-#: ../bin/kolab_smtp_access_policy.py:1633
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr "Hay una solicitud de instancia %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1642
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr "La instancia solicitada %s, se encuentra en estado %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1674
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1678
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr "Acceso denegado al destinatario"
 
-#: ../bin/kolab_smtp_access_policy.py:1680
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr "Acceso denegado al destinatario"
 
-#: ../bin/kolab_smtp_access_policy.py:1682
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr "No hay objeciones"
 
@@ -363,7 +363,7 @@
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2528
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
 #: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr "Listando dominios..."
@@ -497,16 +497,16 @@
 msgid "Authentication cache failed: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1445
-#: ../pykolab/auth/ldap/__init__.py:1471 ../pykolab/auth/ldap/__init__.py:3070
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
 #, python-format
 msgid "LDAP server unavailable: %r"
 msgstr ""
 
 #: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
-#: ../pykolab/auth/ldap/__init__.py:1320 ../pykolab/auth/ldap/__init__.py:1446
-#: ../pykolab/auth/ldap/__init__.py:1472 ../pykolab/auth/ldap/__init__.py:1760
-#: ../pykolab/auth/ldap/__init__.py:3071 ../pykolab/auth/ldap/__init__.py:3081
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
 #, python-format
 msgid "%s"
 msgstr ""
@@ -583,319 +583,319 @@
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:525
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:527
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:530
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist= 'dn' + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:649 ../pykolab/auth/ldap/__init__.py:805
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:725
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:836
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:873
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
 msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:883
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:900
+#: ../pykolab/auth/ldap/__init__.py:896
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:911
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:913
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:915
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:918
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:920
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:938
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:977
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr "No se han encontrado resultados para la dirección de correo %s"
 
-#: ../pykolab/auth/ldap/__init__.py:988
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr "Encontrado 1 resultado para la dirección %s, verificando"
 
-#: ../pykolab/auth/ldap/__init__.py:998
+#: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
 msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1009 ../pykolab/auth/ldap/__init__.py:1098
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1064
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr "No se han encontrado resultados para la dirección %s"
 
-#: ../pykolab/auth/ldap/__init__.py:1075
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
 msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1086
+#: ../pykolab/auth/ldap/__init__.py:1082
 #, python-format
 msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1113
+#: ../pykolab/auth/ldap/__init__.py:1109
 #, python-format
 msgid ""
 "Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1124
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1135
+#: ../pykolab/auth/ldap/__init__.py:1131
 #, python-format
 msgid ""
 "Avoiding the duplication of the primary mail address %r in the list of "
 "secondary mail addresses"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1146
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1154
+#: ../pykolab/auth/ldap/__init__.py:1150
 #, python-format
 msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1171 ../pykolab/auth/ldap/__init__.py:1177
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1172 ../pykolab/auth/ldap/__init__.py:1178
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry%s: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1189
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1223
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1259
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1285
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr "Utilizando el filtro %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1300
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1347
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, python-format
 msgid ""
 "About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
 "default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1406
 msgid "Attempting to bind without a DN but with a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1415
+#: ../pykolab/auth/ldap/__init__.py:1411
 msgid "Attempting to bind with a DN but without a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1433
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
 msgid "Binding with bind_dn: %s and password: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1451 ../pykolab/auth/ldap/__init__.py:1475
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
 msgid "Invalid DN, username and/or password."
 msgstr "DN inválido, usuario y/o contraseña"
 
-#: ../pykolab/auth/ldap/__init__.py:1456
+#: ../pykolab/auth/ldap/__init__.py:1452
 msgid "bind() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1478
+#: ../pykolab/auth/ldap/__init__.py:1474
 msgid "bind_priv() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1690
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1698
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1759
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
 msgid "An error occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1997 ../pykolab/auth/ldap/__init__.py:2191
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2246
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2271
+#: ../pykolab/auth/ldap/__init__.py:2267
 #, python-format
 msgid "Naming contexts found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2278
+#: ../pykolab/auth/ldap/__init__.py:2274
 #, python-format
 msgid "Domains/Root DNs found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2438
+#: ../pykolab/auth/ldap/__init__.py:2434
 #, python-format
 msgid "Searching root dn for domain %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2443
+#: ../pykolab/auth/ldap/__init__.py:2439
 #, python-format
 msgid "Returning from cache: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2448
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2478
+#: ../pykolab/auth/ldap/__init__.py:2474
 #, python-format
 msgid "Setting domain root dn from LDAP for domain %r: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2624 ../pykolab/auth/ldap/__init__.py:2672
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr "Tipo de entrada: %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2750
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2766
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2771
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2779
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr "DN anterior: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2834
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2844
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2947
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr "Buscando con el filtro %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2999
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr "Comprobando el soporte para %s en %s"
 
-#: ../pykolab/auth/ldap/__init__.py:3018
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3072
+#: ../pykolab/auth/ldap/__init__.py:3068
 msgid "-- reconnecting in 10 seconds."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3080
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 msgstr ""
@@ -1364,44 +1364,44 @@
 msgid "Display changes, do not apply them."
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:91
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:88
 #, python-format
 msgid "Domains in IMAP not in LDAP: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:108
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:156
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, python-format
 msgid ""
 "No recipients for '%s' (would have deleted the mailbox if not for --dry-"
 "run)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:113
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:161
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, python-format
 msgid "Deleting mailbox '%s' because it has no recipients"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:117
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:165
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, python-format
 msgid "An error occurred removing mailbox %r: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:119
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:167
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, python-format
 msgid "Not automatically deleting shared folder '%s'"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:121
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:169
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:150
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
@@ -1809,7 +1809,7 @@
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:287
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
@@ -1850,22 +1850,22 @@
 msgstr ""
 
 #. Removed server reconnection for dovecot, we only have one server
-#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:313
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:317
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:322
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:324
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
@@ -1880,12 +1880,12 @@
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:453
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:513
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
@@ -1895,26 +1895,26 @@
 msgid "Would have transferred %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:526
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:222
+#: ../pykolab/imap/dovecot.py:220
 #, python-format
 msgid "Could not connect to Dovecot IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:294
+#: ../pykolab/imap/dovecot.py:292
 msgid "Detected METADATA support"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:297
+#: ../pykolab/imap/dovecot.py:295
 #, python-format
 msgid "This system does not support METADATA: '%s'"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:524
+#: ../pykolab/imap/dovecot.py:522
 #, python-format
 msgid "Would have transfered %s from %s to %s"
 msgstr ""
@@ -1998,186 +1998,181 @@
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:429 ../pykolab/imap/__init__.py:465
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:494 ../pykolab/imap/__init__.py:786
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:498
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:511
-#, python-format
-msgid "Could not create the mailbox for user %s, aborting."
-msgstr ""
-
-#: ../pykolab/imap/__init__.py:525 ../pykolab/imap/__init__.py:654
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:600
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:628
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:643
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:659
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:699
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:713
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:715
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid " %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:718
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:730
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:734
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:760
+#: ../pykolab/imap/__init__.py:750
 #, python-format
 msgid "Could not set quota on %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:767
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:804
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:807 ../pykolab/imap/__init__.py:915
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:813 ../pykolab/imap/__init__.py:919
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:817
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:825
+#: ../pykolab/imap/__init__.py:815
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:839 ../pykolab/imap/__init__.py:882
-#: ../pykolab/imap/__init__.py:896
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
 msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:871
+#: ../pykolab/imap/__init__.py:861
 #, python-format
 msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:912
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:921
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:923
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
 msgstr ""
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:991
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1004
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1010
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1015
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1092
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1097
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1100
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1115
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1118
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Borrando la carpeta %s"
@@ -2186,52 +2181,52 @@
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:47
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:53
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:66
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:74
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:99
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:144
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:310
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:326
+#: ../pykolab/itip/__init__.py:277
 #, python-format
 msgid "Failed to compose iTip reply message: %r: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:337 ../pykolab/itip/__init__.py:381
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
 #: ../wallace/module_invitationpolicy.py:1253
 #: ../wallace/module_invitationpolicy.py:1328
-#: ../wallace/module_resources.py:1364
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:369
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr ""
@@ -2781,19 +2776,11 @@
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:459
-msgid "Configuring and refreshing Anti-Virus..."
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:472
-msgid "Could not find a ClamAV update configuration file"
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:515
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:533
+#: ../pykolab/setup/setup_mta.py:500
 msgid ""
 "Could not configure to start on boot, the postfix, clamav and amavisd "
 "services."
@@ -2939,13 +2926,13 @@
 msgid "Cannot find the configuration directory for roundcube."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:305
-#: ../pykolab/setup/setup_syncroton.py:104
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:314
-#: ../pykolab/setup/setup_syncroton.py:113
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
 msgid "Could not configure to start on boot, the webserver server service."
 msgstr ""
 
@@ -3249,7 +3236,7 @@
 msgid "Every %d seconds"
 msgstr ""
 
-#: ../pykolab/xml/todo.py:165
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
@@ -3391,7 +3378,7 @@
 msgstr ""
 
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
-#: ../wallace/module_resources.py:1268
+#: ../wallace/module_resources.py:1251
 #, python-format
 msgid "Reservation Request for %(summary)s was %(status)s"
 msgstr ""
@@ -3402,7 +3389,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
-#: ../wallace/module_resources.py:1352
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
@@ -3418,7 +3405,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
-#: ../wallace/module_resources.py:1450
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
@@ -3456,7 +3443,7 @@
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/unit/test-011-itip.py:534
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3513,21 +3500,21 @@
 
 #: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
 #: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:129
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
 #: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
 #: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
 #: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
 #: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:138
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
@@ -3803,7 +3790,7 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:852
-#: ../wallace/module_resources.py:691 ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
 #, python-format
 msgid "No UID found in IMAP response: %r"
 msgstr ""
@@ -3819,8 +3806,8 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:919
-#: ../wallace/module_resources.py:498 ../wallace/module_resources.py:699
-#: ../wallace/module_resources.py:779
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
@@ -3831,7 +3818,7 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:932
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
@@ -4013,314 +4000,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:119
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:184
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:189
+#: ../wallace/module_resources.py:187
 msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:197
+#: ../wallace/module_resources.py:195
 #, python-format
 msgid ""
 "iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:228
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:239
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:248
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:258
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:272
+#: ../wallace/module_resources.py:270
 #, python-format
 msgid "iTip REPLY to %r, %r; matches %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:278
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
 #, python-format
 msgid "Could not find envelope sender attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:285
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:304
+#: ../wallace/module_resources.py:302
 #, python-format
 msgid "Invalid response (%r) received from resource owner for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:306
 #, python-format
 msgid "Event referenced by this REPLY (%r) not found in resource calendar"
 msgstr ""
 
-#: ../wallace/module_resources.py:311
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:320
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:322
+#: ../wallace/module_resources.py:320
 #, python-format
 msgid "Could not find envelope attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:328
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:338
+#: ../wallace/module_resources.py:336
 #, python-format
 msgid "Cancellation for entire event %r: deleting"
 msgstr ""
 
-#: ../wallace/module_resources.py:342
+#: ../wallace/module_resources.py:340
 #, python-format
 msgid "Cancellation for a single occurrence %r of %r: updating..."
 msgstr ""
 
-#: ../wallace/module_resources.py:392
-#, python-format
-msgid "Delegate invitation for resource collection %r to %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:398 ../wallace/module_resources.py:802
-#, python-format
-msgid "Apply invitation policies %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:407
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#. this is the receiving resource record
-#: ../wallace/module_resources.py:411
+#: ../wallace/module_resources.py:390
 #, python-format
-msgid "Decline invitation for individual resource %r / %r"
+msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:427
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr ""
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:474
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr ""
 
-#: ../wallace/module_resources.py:487
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:513
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr ""
 
-#: ../wallace/module_resources.py:538
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:548
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:551
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:555
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr "El recurso es una colección"
 
-#: ../wallace/module_resources.py:566
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:578
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:601
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:663
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:682
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:715
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:737
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:743
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:770
+#: ../wallace/module_resources.py:754
 #, python-format
 msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:821
+#: ../wallace/module_resources.py:785
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:905
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:924
+#: ../wallace/module_resources.py:907
 #, python-format
 msgid "Delete resource calendar object from %r by UID %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:932
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:943
+#: ../wallace/module_resources.py:926
 #, python-format
 msgid "Failed to delete calendar object %r from folder %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:991 ../wallace/module_resources.py:1063
-#: ../wallace/module_resources.py:1097
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:993 ../wallace/module_resources.py:1065
-#: ../wallace/module_resources.py:1100
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:997 ../wallace/module_resources.py:1069
-#: ../wallace/module_resources.py:1104
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1015
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1023
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1031
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1036
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1056
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:1072 ../wallace/module_resources.py:1106
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:1091
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:1109
+#: ../wallace/module_resources.py:1092
 #, python-format
 msgid "The following resources are being referred to in the iTip: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1219
 #, python-format
 msgid "Check collections %r for kolabinvitationpolicy attributes"
 msgstr ""
 
-#: ../wallace/module_resources.py:1274
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -4330,7 +4311,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1293
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -4340,7 +4321,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1300
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -4349,16 +4330,16 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1335
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1353
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr ""
 
-#: ../wallace/module_resources.py:1373
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -4368,7 +4349,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1379
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -4379,12 +4360,12 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1410
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1429
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"

pykolab-0.8.23.tar.gz/po/fr.po -> pykolab-0.8.4.tar.gz/po/fr.po Changed

@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:22+0100\n"
-"PO-Revision-Date: 2016-12-02 14:22+0000\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:51+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
 "Language-Team: French (http://www.transifex.com/kolab/kolab/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -140,151 +140,151 @@
 msgid "Unverifiable sender."
 msgstr "Expéditeur non vérifiables"
 
-#: ../bin/kolab_smtp_access_policy.py:1083
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr "Expéditeur n'utilise pas un alias"
 
-#: ../bin/kolab_smtp_access_policy.py:1092
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Expéditeur utilise une adresse mail expéditeur non autorisée"
 
-#: ../bin/kolab_smtp_access_policy.py:1109
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Impossible de vérifier l'expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:1116
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr "Verifie si l'expéditeur est autorisé d'envoyer au destinateur utilisant politique d'expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:1129
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Résultat est %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1134
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Aucune restrictions politique de destinateur existe pour cet expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:1143
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Une politique de destinateur à appliquer à cet expéditeur trouvée"
 
-#: ../bin/kolab_smtp_access_policy.py:1158
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr "Expéditeur %s n'est pas autorisé d'envoyer au destinateur %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1186
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Nettoyage de la mémoire cache "
 
-#: ../bin/kolab_smtp_access_policy.py:1209
+#: ../bin/kolab_smtp_access_policy.py:1207
 msgid ""
 "The 'uri' setting in the kolab_smtp_access_policy section is soon going to "
 "be deprecated in favor of 'cache_uri'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1225
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr "Erreur opérationnelle dans la mise en cache: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1278
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr "La mise en cache du résultat politique avec horodatage %d"
 
-#: ../bin/kolab_smtp_access_policy.py:1355
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1360
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr "Retourne action SAIS PAS: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1365
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr "Retourne action EN ATTENTE: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1370
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr "Retourne action PERMIS: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1498
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr "Retourne action REJET: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1544
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr "Démarrage en boucle pour une nouvelle demande"
 
-#: ../bin/kolab_smtp_access_policy.py:1551
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr "Délai pour la lecture de politique de demande est dépassé"
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Fin de requête actuelle"
 
-#: ../bin/kolab_smtp_access_policy.py:1561
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr "Reçoit ligne: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1565
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr "Demande retour"
 
-#: ../bin/kolab_smtp_access_policy.py:1594
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr "Options de la stratégie d'accès"
 
-#: ../bin/kolab_smtp_access_policy.py:1601
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr "Délai de demande de Politique SMTP"
 
-#: ../bin/kolab_smtp_access_policy.py:1607
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr "Vérification de la stratégie d'accès du destinataire."
 
-#: ../bin/kolab_smtp_access_policy.py:1613
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr "Vérification de la stratégie d'accès de l'expéditeur."
 
-#: ../bin/kolab_smtp_access_policy.py:1619
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr "Autorise les expéditeurs non authentifiés."
 
-#: ../bin/kolab_smtp_access_policy.py:1633
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr "Demande d'instance obtenue %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1642
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr "Demande d'instance %s est en état %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1674
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1678
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr "Accès d'expéditeur refus"
 
-#: ../bin/kolab_smtp_access_policy.py:1680
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr "Accès de destinateur "
 
-#: ../bin/kolab_smtp_access_policy.py:1682
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr "Pas d'objections"
 
@@ -367,7 +367,7 @@
 msgid "Could not connect to LDAP, is it running?"
 msgstr " Impossible de se connecter au LDAP, est-il en cours d'exécution?"
 
-#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2528
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
 #: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr "Liste des domaines ..."
@@ -501,16 +501,16 @@
 msgid "Authentication cache failed: %r"
 msgstr "Cache d'authentification a échoué: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1445
-#: ../pykolab/auth/ldap/__init__.py:1471 ../pykolab/auth/ldap/__init__.py:3070
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
 #, python-format
 msgid "LDAP server unavailable: %r"
 msgstr ""
 
 #: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
-#: ../pykolab/auth/ldap/__init__.py:1320 ../pykolab/auth/ldap/__init__.py:1446
-#: ../pykolab/auth/ldap/__init__.py:1472 ../pykolab/auth/ldap/__init__.py:1760
-#: ../pykolab/auth/ldap/__init__.py:3071 ../pykolab/auth/ldap/__init__.py:3081
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
 #, python-format
 msgid "%s"
 msgstr "%s"
@@ -587,319 +587,319 @@
 msgid "Attempting to use LDAP URI %s"
 msgstr "Tentative d'utilisation de l'URI LDAP %s"
 
-#: ../pykolab/auth/ldap/__init__.py:525
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr "ID d'entré: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:527
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr "DN d'entré: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:530
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist= 'dn' + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:649 ../pykolab/auth/ldap/__init__.py:805
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr "Recherche de ressource à partir du filtre %r"
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:725
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr "Recherche de destinataire à partir du filtre %r"
 
-#: ../pykolab/auth/ldap/__init__.py:836
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr "Utilisation de horodatage %r"
 
-#: ../pykolab/auth/ldap/__init__.py:873
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
 msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr "La politique de récepteur n'applique pas pour %s (désactivé à travers la configuration)"
 
-#: ../pykolab/auth/ldap/__init__.py:883
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr "Application de la stratégie destinataire pour %r"
 
-#: ../pykolab/auth/ldap/__init__.py:900
+#: ../pykolab/auth/ldap/__init__.py:896
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:911
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr "la clé %r n'est pas dans l'entrée"
 
-#: ../pykolab/auth/ldap/__init__.py:913
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr "la clé %r est l'attribut mail primaire"
 
-#: ../pykolab/auth/ldap/__init__.py:915
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr "le pol. mail primaire n'est pas vide"
 
-#: ../pykolab/auth/ldap/__init__.py:918
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr "la clé %r est l'attribut mail secondaire"
 
-#: ../pykolab/auth/ldap/__init__.py:920
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr "le pol. mail secondaire n'est pas vide"
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:938
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr "Les attributs %r n'existent pas pour le moment dans l'entrée %r"
 
-#: ../pykolab/auth/ldap/__init__.py:977
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr "Aucun résultat pour l'adresse mail %s"
 
-#: ../pykolab/auth/ldap/__init__.py:988
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr "1 résultat trouvé pour l'adresse %s, vérification en cours"
 
-#: ../pykolab/auth/ldap/__init__.py:998
+#: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
 msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr "Désolé, l'adresse e-mail principale %s déjà utilisé pour %s (nous sommes %s)"
 
-#: ../pykolab/auth/ldap/__init__.py:1009 ../pykolab/auth/ldap/__init__.py:1098
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr "Cette adresse vous est assignée"
 
-#: ../pykolab/auth/ldap/__init__.py:1064
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr "Aucun résultat pour l'adresse %s"
 
-#: ../pykolab/auth/ldap/__init__.py:1075
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
 msgid "1 result for address %s found, verifying..."
 msgstr "1 résultat trouvé pour l'adresse %s, en vérification..."
 
-#: ../pykolab/auth/ldap/__init__.py:1086
+#: ../pykolab/auth/ldap/__init__.py:1082
 #, python-format
 msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr "Désolé, l'adresse e-mail secondaire %s déjà utilisé pour %s (nous sommes %s)"
 
-#: ../pykolab/auth/ldap/__init__.py:1113
+#: ../pykolab/auth/ldap/__init__.py:1109
 #, python-format
 msgid ""
 "Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1124
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr "Les adresses e-mail secondaire que nous avons besoin n'est aucune: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1135
+#: ../pykolab/auth/ldap/__init__.py:1131
 #, python-format
 msgid ""
 "Avoiding the duplication of the primary mail address %r in the list of "
 "secondary mail addresses"
 msgstr "Évitant la duplication d'adresse mail principal %r dans la liste d'adresses mail secondaire"
 
-#: ../pykolab/auth/ldap/__init__.py:1146
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr "L'entré reçois des adresses mail secondaire:"
 
-#: ../pykolab/auth/ldap/__init__.py:1154
+#: ../pykolab/auth/ldap/__init__.py:1150
 #, python-format
 msgid "Entry did not have any secondary mail addresses in %r"
 msgstr "Entré n'as aucune adresses mail secondaire dans %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1171 ../pykolab/auth/ldap/__init__.py:1177
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr "Adresses_mail_secondaire: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1172 ../pykolab/auth/ldap/__init__.py:1178
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry%s: %r"
 msgstr "Entré%s: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1189
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr "Entrée : liste des modifications : %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1223
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr "La mise en place d'entrée attribue %r à %r pour %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1259
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr "N'a pas pu mettre à jour dn %r:\n%r"
 
-#: ../pykolab/auth/ldap/__init__.py:1285
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr "Utilisation du filtre %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1300
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr "La synchronisation cherche contre la base DN: %s"
 
-#: ../pykolab/auth/ldap/__init__.py:1347
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, python-format
 msgid ""
 "About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
 "default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1406
 msgid "Attempting to bind without a DN but with a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1415
+#: ../pykolab/auth/ldap/__init__.py:1411
 msgid "Attempting to bind with a DN but without a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1433
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
 msgid "Binding with bind_dn: %s and password: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1451 ../pykolab/auth/ldap/__init__.py:1475
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
 msgid "Invalid DN, username and/or password."
 msgstr "DN invalide, nom d'utilisateur et/ou mot de passe."
 
-#: ../pykolab/auth/ldap/__init__.py:1456
+#: ../pykolab/auth/ldap/__init__.py:1452
 msgid "bind() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1478
+#: ../pykolab/auth/ldap/__init__.py:1474
 msgid "bind_priv() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1690
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr "Entré %s valeur attribue: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1698
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1759
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
 msgid "An error occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1997 ../pykolab/auth/ldap/__init__.py:2191
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr "Résultat de la stratégie de destinataire : %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2246
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr "Utilisateur de Kolab %s n'a pas un attribut de résultat %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2271
+#: ../pykolab/auth/ldap/__init__.py:2267
 #, python-format
 msgid "Naming contexts found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2278
+#: ../pykolab/auth/ldap/__init__.py:2274
 #, python-format
 msgid "Domains/Root DNs found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2438
+#: ../pykolab/auth/ldap/__init__.py:2434
 #, python-format
 msgid "Searching root dn for domain %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2443
+#: ../pykolab/auth/ldap/__init__.py:2439
 #, python-format
 msgid "Returning from cache: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2448
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr "Recherche du nom distinctif racine pour le domaine %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2478
+#: ../pykolab/auth/ldap/__init__.py:2474
 #, python-format
 msgid "Setting domain root dn from LDAP for domain %r: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2624 ../pykolab/auth/ldap/__init__.py:2672
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr "Type de l'enregistrement : %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2750
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr "Résultat de la recherche LDAP :"
 
-#: ../pykolab/auth/ldap/__init__.py:2766
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr "Notification de modification des attributs de l'enregistrement :"
 
-#: ../pykolab/auth/ldap/__init__.py:2771
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr "Changement de type : %r(%r)"
 
-#: ../pykolab/auth/ldap/__init__.py:2779
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr "Non distinctif précédent : %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2834
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "L'objet %s recherché n'existe pas"
 
-#: ../pykolab/auth/ldap/__init__.py:2844
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr "%d résultats ..."
 
-#: ../pykolab/auth/ldap/__init__.py:2947
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr "Recherche avec le filtre %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2999
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr "Vérification du support de %s pour %s"
 
-#: ../pykolab/auth/ldap/__init__.py:3018
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr "Soutien trouvé pour %s"
 
-#: ../pykolab/auth/ldap/__init__.py:3072
+#: ../pykolab/auth/ldap/__init__.py:3068
 msgid "-- reconnecting in 10 seconds."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3080
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 msgstr "Une erreur est survenu en utilisant %s: %r"
@@ -1368,44 +1368,44 @@
 msgid "Display changes, do not apply them."
 msgstr "Afficher changements, ne les appliquent pas"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:91
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:88
 #, python-format
 msgid "Domains in IMAP not in LDAP: %r"
 msgstr "Domaines dans IMAP pas dans LDAP: %r"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:108
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:156
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, python-format
 msgid ""
 "No recipients for '%s' (would have deleted the mailbox if not for --dry-"
 "run)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:113
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:161
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, python-format
 msgid "Deleting mailbox '%s' because it has no recipients"
 msgstr "Efface boite de messagerie '%s' car elle a aucun destinateurs"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:117
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:165
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, python-format
 msgid "An error occurred removing mailbox %r: %r"
 msgstr "Une erreur est survenue en effaçant la boite de messagerie %r: %r"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:119
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:167
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, python-format
 msgid "Not automatically deleting shared folder '%s'"
 msgstr "N’efface pas automatiquement le dossier partagé '%s'"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:121
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:169
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr "Aucun destinateurs pour '%s' (utilisé -supprimer pour supprimer)!"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:150
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr "Destinateurs multiples pour '%s'!"
@@ -1813,7 +1813,7 @@
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr "Impossible de se connecter au serveur Cyrus IMAP %r"
 
-#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:287
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr "Continuation avec séparateur: %r"
@@ -1854,22 +1854,22 @@
 msgstr "Serveur pour dossier de BOITE DE RÉCEPTION %s est %s"
 
 #. Removed server reconnection for dovecot, we only have one server
-#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:313
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr " Fixation de quota pour dossier %s à %s"
 
-#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:317
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr "Impossible d'attribuer un quota pour le dossier de messagerie %s"
 
-#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:322
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr "Déplacement de dossier de BOITE DE RÉCEPTION %s au %s sur la partition %s"
 
-#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:324
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr "Déplacement de dossier de BOITE DE RÉCEPTION %s au %s "
@@ -1884,12 +1884,12 @@
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr "Impossible de définir une annotation %r sur dossier de courrier %r: %r"
 
-#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:453
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr " Transfert de dossier %s de %s au %s"
 
-#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:513
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr "Reconstitution %s au %s"
@@ -1899,26 +1899,26 @@
 msgid "Would have transferred %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:526
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr "Aurait renommé %s à %s"
 
-#: ../pykolab/imap/dovecot.py:222
+#: ../pykolab/imap/dovecot.py:220
 #, python-format
 msgid "Could not connect to Dovecot IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:294
+#: ../pykolab/imap/dovecot.py:292
 msgid "Detected METADATA support"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:297
+#: ../pykolab/imap/dovecot.py:295
 #, python-format
 msgid "This system does not support METADATA: '%s'"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:524
+#: ../pykolab/imap/dovecot.py:522
 #, python-format
 msgid "Would have transfered %s from %s to %s"
 msgstr "Aurait transféré %s de %s au %s"
@@ -2002,186 +2002,181 @@
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:429 ../pykolab/imap/__init__.py:465
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr "Création d'un nouvel dossier partagé %s"
 
-#: ../pykolab/imap/__init__.py:494 ../pykolab/imap/__init__.py:786
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:498
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr "Création d'une nouvelle boîte aux lettres pour l'utilisateur %s"
 
-#: ../pykolab/imap/__init__.py:511
-#, python-format
-msgid "Could not create the mailbox for user %s, aborting."
-msgstr ""
-
-#: ../pykolab/imap/__init__.py:525 ../pykolab/imap/__init__.py:654
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:600
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr "Création de dossiers additionnels pour l'utilisateur %s"
 
-#: ../pykolab/imap/__init__.py:628
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:643
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:659
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr "La boîte aux lettres existe déjà : %s "
 
-#: ../pykolab/imap/__init__.py:699
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:713
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:715
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid " %r"
 msgstr "%r"
 
-#: ../pykolab/imap/__init__.py:718
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr "Dossier %s"
 
-#: ../pykolab/imap/__init__.py:730
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr "Souscription %s au fichier %s"
 
-#: ../pykolab/imap/__init__.py:734
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:760
+#: ../pykolab/imap/__init__.py:750
 #, python-format
 msgid "Could not set quota on %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:767
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr "Impossible de renommer %s pour résider sur la partition %s"
 
-#: ../pykolab/imap/__init__.py:804
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:807 ../pykolab/imap/__init__.py:915
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr "Impossible de renommer le dossier INBOX %s en %s"
 
-#: ../pykolab/imap/__init__.py:813 ../pykolab/imap/__init__.py:919
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr "Impossible de déplacer la boite de réception %s, le répertoire de destination %s existe déjà"
 
-#: ../pykolab/imap/__init__.py:817
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr "Serveur pour boite de courrier %r est %r"
 
-#: ../pykolab/imap/__init__.py:825
+#: ../pykolab/imap/__init__.py:815
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr "Recherche du répertoire '%s', les répertoires trouvés sont : %r"
 
-#: ../pykolab/imap/__init__.py:839 ../pykolab/imap/__init__.py:882
-#: ../pykolab/imap/__init__.py:896
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
 msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:871
+#: ../pykolab/imap/__init__.py:861
 #, python-format
 msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:912
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr "Ancienne boite de réception %s trouvée"
 
-#: ../pykolab/imap/__init__.py:921
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr "Impossible de trouver l'ancien répertoire user/%s pour le renommer"
 
-#: ../pykolab/imap/__init__.py:923
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
 msgstr "La valeur pour l'utilisateur n'est pas un dictionnaire"
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:991
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr "Impossible de récupérer le quota IMAP du répertoire %s"
 
-#: ../pykolab/imap/__init__.py:1004
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr "Le quota pour %s est actuellement %s"
 
-#: ../pykolab/imap/__init__.py:1010
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr "Ajustement du quota de la base d'authentification pour le répertoire %s à %d"
 
-#: ../pykolab/imap/__init__.py:1015
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1092
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr "Vérification du répertoire : %s"
 
-#: ../pykolab/imap/__init__.py:1097
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr "Le répertoire ne dispose pas d'utilisateur (1) correspondant : %s"
 
-#: ../pykolab/imap/__init__.py:1100
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr "Le répertoire ne dispose pas d'utilisateur (2) correspondant : %s"
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1115
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr "Veuillez ne pas nous fournir un nom d'utilisateur simplement"
 
-#: ../pykolab/imap/__init__.py:1118
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Suppression de dossier %s"
@@ -2190,52 +2185,52 @@
 msgid "Returning thread local configuration"
 msgstr "retourne le fil d’exécution : configuration locale "
 
-#: ../pykolab/itip/__init__.py:47
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr "Méthode %r pas vraiment intéressant pour nous"
 
-#: ../pykolab/itip/__init__.py:53
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:66
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:74
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr "Dupliquez l'objet iTip: %s"
 
-#: ../pykolab/itip/__init__.py:99
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:144
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:310
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr "Envoi une réponse iTip %s pour %s %r"
 
-#: ../pykolab/itip/__init__.py:326
+#: ../pykolab/itip/__init__.py:277
 #, python-format
 msgid "Failed to compose iTip reply message: %r: %s"
 msgstr "Impossible de composer une réponse de messagerie iTip: %r: %s"
 
-#: ../pykolab/itip/__init__.py:337 ../pykolab/itip/__init__.py:381
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
 #: ../wallace/module_invitationpolicy.py:1253
 #: ../wallace/module_invitationpolicy.py:1328
-#: ../wallace/module_resources.py:1364
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:369
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr ""
@@ -2785,19 +2780,11 @@
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:459
-msgid "Configuring and refreshing Anti-Virus..."
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:472
-msgid "Could not find a ClamAV update configuration file"
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:515
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:533
+#: ../pykolab/setup/setup_mta.py:500
 msgid ""
 "Could not configure to start on boot, the postfix, clamav and amavisd "
 "services."
@@ -2943,13 +2930,13 @@
 msgid "Cannot find the configuration directory for roundcube."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:305
-#: ../pykolab/setup/setup_syncroton.py:104
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:314
-#: ../pykolab/setup/setup_syncroton.py:113
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
 msgid "Could not configure to start on boot, the webserver server service."
 msgstr ""
 
@@ -3253,7 +3240,7 @@
 msgid "Every %d seconds"
 msgstr ""
 
-#: ../pykolab/xml/todo.py:165
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
@@ -3395,7 +3382,7 @@
 msgstr ""
 
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
-#: ../wallace/module_resources.py:1268
+#: ../wallace/module_resources.py:1251
 #, python-format
 msgid "Reservation Request for %(summary)s was %(status)s"
 msgstr ""
@@ -3406,7 +3393,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
-#: ../wallace/module_resources.py:1352
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
@@ -3422,7 +3409,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
-#: ../wallace/module_resources.py:1450
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
@@ -3460,7 +3447,7 @@
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/unit/test-011-itip.py:534
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3517,21 +3504,21 @@
 
 #: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
 #: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:129
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr "Appel de la fonction callback après traitement de la procédure %s"
 
 #: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
 #: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr "Test de cb_action_%s()"
 
 #: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
 #: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:138
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr "Tentative d'exécution de cb_action_%s()"
@@ -3807,7 +3794,7 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:852
-#: ../wallace/module_resources.py:691 ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
 #, python-format
 msgid "No UID found in IMAP response: %r"
 msgstr ""
@@ -3823,8 +3810,8 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:919
-#: ../wallace/module_resources.py:498 ../wallace/module_resources.py:699
-#: ../wallace/module_resources.py:779
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
@@ -3835,7 +3822,7 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:932
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
@@ -4017,314 +4004,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr "Impossible d'envoyer la requête opt-out via l'URL %s"
 
-#: ../wallace/module_resources.py:119
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:184
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:189
+#: ../wallace/module_resources.py:187
 msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:197
+#: ../wallace/module_resources.py:195
 #, python-format
 msgid ""
 "iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:228
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:239
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:248
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:258
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:272
+#: ../wallace/module_resources.py:270
 #, python-format
 msgid "iTip REPLY to %r, %r; matches %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:278
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
 #, python-format
 msgid "Could not find envelope sender attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:285
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:304
+#: ../wallace/module_resources.py:302
 #, python-format
 msgid "Invalid response (%r) received from resource owner for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:306
 #, python-format
 msgid "Event referenced by this REPLY (%r) not found in resource calendar"
 msgstr ""
 
-#: ../wallace/module_resources.py:311
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:320
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:322
+#: ../wallace/module_resources.py:320
 #, python-format
 msgid "Could not find envelope attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:328
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:338
+#: ../wallace/module_resources.py:336
 #, python-format
 msgid "Cancellation for entire event %r: deleting"
 msgstr ""
 
-#: ../wallace/module_resources.py:342
+#: ../wallace/module_resources.py:340
 #, python-format
 msgid "Cancellation for a single occurrence %r of %r: updating..."
 msgstr ""
 
-#: ../wallace/module_resources.py:392
-#, python-format
-msgid "Delegate invitation for resource collection %r to %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:398 ../wallace/module_resources.py:802
-#, python-format
-msgid "Apply invitation policies %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:407
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#. this is the receiving resource record
-#: ../wallace/module_resources.py:411
+#: ../wallace/module_resources.py:390
 #, python-format
-msgid "Decline invitation for individual resource %r / %r"
+msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:427
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr ""
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:474
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr ""
 
-#: ../wallace/module_resources.py:487
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:513
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr ""
 
-#: ../wallace/module_resources.py:538
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:548
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:551
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:555
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:566
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:578
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:601
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:663
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:682
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:715
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:737
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:743
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:770
+#: ../wallace/module_resources.py:754
 #, python-format
 msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:821
+#: ../wallace/module_resources.py:785
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:905
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr "Echec d'enregistrer l'événement à la ressource de calandrier au "
 
-#: ../wallace/module_resources.py:924
+#: ../wallace/module_resources.py:907
 #, python-format
 msgid "Delete resource calendar object from %r by UID %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:932
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:943
+#: ../wallace/module_resources.py:926
 #, python-format
 msgid "Failed to delete calendar object %r from folder %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr "Contrôle si l'adresse émail %r appartient à une ressource (collection)"
 
-#: ../wallace/module_resources.py:991 ../wallace/module_resources.py:1063
-#: ../wallace/module_resources.py:1097
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr "Registre(s) de ressource: %r"
 
-#: ../wallace/module_resources.py:993 ../wallace/module_resources.py:1065
-#: ../wallace/module_resources.py:1100
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr "Aucun registres (collection) de ressource trouvé pour %r"
 
-#: ../wallace/module_resources.py:997 ../wallace/module_resources.py:1069
-#: ../wallace/module_resources.py:1104
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr "Registre de ressource: %r"
 
-#: ../wallace/module_resources.py:1015
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1023
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1031
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1036
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr "Forme brute d'organisateurs: %r"
 
-#: ../wallace/module_resources.py:1056
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr "Contrôle si le participant %r est une ressource (collection)"
 
-#: ../wallace/module_resources.py:1072 ../wallace/module_resources.py:1106
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr "Réservation de ressource faite mais aucun enregistrement de ressource trouvé"
 
-#: ../wallace/module_resources.py:1091
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr "Contrôle si la ressource %r est une ressource (collection)"
 
-#: ../wallace/module_resources.py:1109
+#: ../wallace/module_resources.py:1092
 #, python-format
 msgid "The following resources are being referred to in the iTip: %r"
 msgstr "Les ressources suivantes sont mentionnées dans le iTip: %"
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1219
 #, python-format
 msgid "Check collections %r for kolabinvitationpolicy attributes"
 msgstr ""
 
-#: ../wallace/module_resources.py:1274
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -4334,7 +4315,7 @@
 " "
 msgstr "\n*** Ceci est une réponse automatique, merci de ne pas répondre! ***\n\nVotre réservation a été délégué au \"%s\" qui est disponible pour la durée demandée."
 
-#: ../wallace/module_resources.py:1293
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -4344,7 +4325,7 @@
 " "
 msgstr "\n*** Ceci est une réponse automatique, merci de ne pas répondre! ***\n\nNous vous informons ainsi que votre réservation était %s.\n "
 
-#: ../wallace/module_resources.py:1300
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -4353,16 +4334,16 @@
 " "
 msgstr "\nAu cas où vous auriez des questions concernant cette réservation, veuillez contacter \n%s <%s> %s"
 
-#: ../wallace/module_resources.py:1335
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr "L'envoie de la notification de réservation pour événement %r à %r de %r"
 
-#: ../wallace/module_resources.py:1353
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr "échoué"
 
-#: ../wallace/module_resources.py:1373
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -4372,7 +4353,7 @@
 " "
 msgstr "\nLa ressource de réservation pour %(resource)s par %(orgname)s <%(orgemail)s> a été %(status)s pour %(date)s. \n\n*** Ceci est un message automatique, envoyé à vous en tant que propriétaire de la ressource. ***\n "
 
-#: ../wallace/module_resources.py:1379
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -4383,12 +4364,12 @@
 " "
 msgstr "\nUne requête de réservation pour %(resource)s n'a pas pu être procédé. \nVeuillez contacter %(orgname)s <%(orgemail)s> qui a demandé la ressource %(date)s. Suject: %(summary)s. \n\n***Ceci est un message automatique, envoyé à vous en tant que propriétaire de la ressource. ***"
 
-#: ../wallace/module_resources.py:1410
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr "Cloner l'invitation pour la confirmation de propriétaire: %r de %r"
 
-#: ../wallace/module_resources.py:1429
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"

pykolab-0.8.23.tar.gz/po/nl.po -> pykolab-0.8.4.tar.gz/po/nl.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:22+0100\n"
-"PO-Revision-Date: 2016-12-02 14:22+0000\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/kolab/kolab/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -137,151 +137,151 @@
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1083
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1092
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Verstuurder gebruikt een niet geauthorizeerd envelope zender adres"
 
-#: ../bin/kolab_smtp_access_policy.py:1109
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Kan de verstuurder niet verifieren"
 
-#: ../bin/kolab_smtp_access_policy.py:1116
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1129
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Het resultaat is %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1134
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Er zijn geen ontvanger restricties voor deze afzender"
 
-#: ../bin/kolab_smtp_access_policy.py:1143
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Ontvanger-beleid gevonden voor deze afzender"
 
-#: ../bin/kolab_smtp_access_policy.py:1158
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1186
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Cache aan het schoonmaken"
 
-#: ../bin/kolab_smtp_access_policy.py:1209
+#: ../bin/kolab_smtp_access_policy.py:1207
 msgid ""
 "The 'uri' setting in the kolab_smtp_access_policy section is soon going to "
 "be deprecated in favor of 'cache_uri'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1225
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr "Operationele fout in caching: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1278
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr "Policy resultaat aan het cachen met tijd %d"
 
-#: ../bin/kolab_smtp_access_policy.py:1355
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr "Actie DEFER_IF_PERMIT retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1360
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr "Actie DUNNO retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1365
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr "Actie HOLD retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1370
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr "Actie PERMIT retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1498
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr "Actie REJECT retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1544
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr "Loop aan het starten in afwachting van nieuw verzoek"
 
-#: ../bin/kolab_smtp_access_policy.py:1551
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr "Maximale tijd voor het lezen van een policy verzoek verstreken"
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Einde van huidige verzoek"
 
-#: ../bin/kolab_smtp_access_policy.py:1561
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr "Gegeven regel: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1565
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr "Verzoek aan het retourneren"
 
-#: ../bin/kolab_smtp_access_policy.py:1594
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr "Opties voor Toegangs-beleid"
 
-#: ../bin/kolab_smtp_access_policy.py:1601
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr "Maximale tijd voor SMTP Toegangs-beleid verzoek verstreken"
 
-#: ../bin/kolab_smtp_access_policy.py:1607
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr "Verifieer het toegangs-beleid voor de ontvanger."
 
-#: ../bin/kolab_smtp_access_policy.py:1613
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr "Verifieer het toegangs-beleid voor de afzender."
 
-#: ../bin/kolab_smtp_access_policy.py:1619
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr "Sta niet geauthentificeerde afzenders toe."
 
-#: ../bin/kolab_smtp_access_policy.py:1633
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr "Verzoek %s verkregen"
 
-#: ../bin/kolab_smtp_access_policy.py:1642
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr "Verzoek %s is in staat %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1674
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1678
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr "Toegang voor afzender geweigerd"
 
-#: ../bin/kolab_smtp_access_policy.py:1680
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr "Toegang voor ontvanger geweigerd"
 
-#: ../bin/kolab_smtp_access_policy.py:1682
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr "Geen bezwaren"
 
@@ -364,7 +364,7 @@
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2528
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
 #: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr "Lijst van domeinen verkrijgen..."
@@ -498,16 +498,16 @@
 msgid "Authentication cache failed: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1445
-#: ../pykolab/auth/ldap/__init__.py:1471 ../pykolab/auth/ldap/__init__.py:3070
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
 #, python-format
 msgid "LDAP server unavailable: %r"
 msgstr ""
 
 #: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
-#: ../pykolab/auth/ldap/__init__.py:1320 ../pykolab/auth/ldap/__init__.py:1446
-#: ../pykolab/auth/ldap/__init__.py:1472 ../pykolab/auth/ldap/__init__.py:1760
-#: ../pykolab/auth/ldap/__init__.py:3071 ../pykolab/auth/ldap/__init__.py:3081
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
 #, python-format
 msgid "%s"
 msgstr ""
@@ -584,319 +584,319 @@
 msgid "Attempting to use LDAP URI %s"
 msgstr "Bezig LDAP URI %s te gebruiken..."
 
-#: ../pykolab/auth/ldap/__init__.py:525
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:527
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:530
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist= 'dn' + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:649 ../pykolab/auth/ldap/__init__.py:805
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:725
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr "Ontvanger vinden met filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:836
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:873
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
 msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:883
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:900
+#: ../pykolab/auth/ldap/__init__.py:896
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:911
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:913
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:915
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:918
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:920
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:938
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr "Attributen %r zijn nog niet beschikbaar voor entry %r"
 
-#: ../pykolab/auth/ldap/__init__.py:977
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr "Geen resultaten voor email adres %s gevonden"
 
-#: ../pykolab/auth/ldap/__init__.py:988
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr "1 resultaat voor adres %s gevonden, aan het verifieren"
 
-#: ../pykolab/auth/ldap/__init__.py:998
+#: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
 msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1009 ../pykolab/auth/ldap/__init__.py:1098
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1064
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1075
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
 msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1086
+#: ../pykolab/auth/ldap/__init__.py:1082
 #, python-format
 msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1113
+#: ../pykolab/auth/ldap/__init__.py:1109
 #, python-format
 msgid ""
 "Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1124
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1135
+#: ../pykolab/auth/ldap/__init__.py:1131
 #, python-format
 msgid ""
 "Avoiding the duplication of the primary mail address %r in the list of "
 "secondary mail addresses"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1146
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr "Entry verkrijgt secundaire email adressen: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1154
+#: ../pykolab/auth/ldap/__init__.py:1150
 #, python-format
 msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1171 ../pykolab/auth/ldap/__init__.py:1177
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1172 ../pykolab/auth/ldap/__init__.py:1178
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry%s: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1189
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1223
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1259
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1285
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1300
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1347
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, python-format
 msgid ""
 "About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
 "default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1406
 msgid "Attempting to bind without a DN but with a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1415
+#: ../pykolab/auth/ldap/__init__.py:1411
 msgid "Attempting to bind with a DN but without a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1433
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
 msgid "Binding with bind_dn: %s and password: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1451 ../pykolab/auth/ldap/__init__.py:1475
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
 msgid "Invalid DN, username and/or password."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1456
+#: ../pykolab/auth/ldap/__init__.py:1452
 msgid "bind() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1478
+#: ../pykolab/auth/ldap/__init__.py:1474
 msgid "bind_priv() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1690
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1698
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1759
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
 msgid "An error occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1997 ../pykolab/auth/ldap/__init__.py:2191
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2246
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr "Kolab gebruiker %s heeft geen resultaat attribuut %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2271
+#: ../pykolab/auth/ldap/__init__.py:2267
 #, python-format
 msgid "Naming contexts found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2278
+#: ../pykolab/auth/ldap/__init__.py:2274
 #, python-format
 msgid "Domains/Root DNs found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2438
+#: ../pykolab/auth/ldap/__init__.py:2434
 #, python-format
 msgid "Searching root dn for domain %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2443
+#: ../pykolab/auth/ldap/__init__.py:2439
 #, python-format
 msgid "Returning from cache: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2448
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr "Root DN voor domein %s aan het vinden"
 
-#: ../pykolab/auth/ldap/__init__.py:2478
+#: ../pykolab/auth/ldap/__init__.py:2474
 #, python-format
 msgid "Setting domain root dn from LDAP for domain %r: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2624 ../pykolab/auth/ldap/__init__.py:2672
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2750
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr "LDAP Zoek Resultaat:"
 
-#: ../pykolab/auth/ldap/__init__.py:2766
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr "Wijzigingsnotificatie attributen:"
 
-#: ../pykolab/auth/ldap/__init__.py:2771
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2779
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2834
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "Gezocht object %s bestaat niet meer"
 
-#: ../pykolab/auth/ldap/__init__.py:2844
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr "%d resultaten..."
 
-#: ../pykolab/auth/ldap/__init__.py:2947
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr "Zoeken met filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2999
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3018
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3072
+#: ../pykolab/auth/ldap/__init__.py:3068
 msgid "-- reconnecting in 10 seconds."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3080
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 msgstr ""
@@ -1365,44 +1365,44 @@
 msgid "Display changes, do not apply them."
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:91
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:88
 #, python-format
 msgid "Domains in IMAP not in LDAP: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:108
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:156
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, python-format
 msgid ""
 "No recipients for '%s' (would have deleted the mailbox if not for --dry-"
 "run)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:113
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:161
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, python-format
 msgid "Deleting mailbox '%s' because it has no recipients"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:117
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:165
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, python-format
 msgid "An error occurred removing mailbox %r: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:119
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:167
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, python-format
 msgid "Not automatically deleting shared folder '%s'"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:121
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:169
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:150
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
@@ -1810,7 +1810,7 @@
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:287
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
@@ -1851,22 +1851,22 @@
 msgstr ""
 
 #. Removed server reconnection for dovecot, we only have one server
-#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:313
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:317
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:322
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:324
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
@@ -1881,12 +1881,12 @@
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:453
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr "Map %s van %s naar %s aan het verhuizen"
 
-#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:513
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
@@ -1896,26 +1896,26 @@
 msgid "Would have transferred %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:526
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:222
+#: ../pykolab/imap/dovecot.py:220
 #, python-format
 msgid "Could not connect to Dovecot IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:294
+#: ../pykolab/imap/dovecot.py:292
 msgid "Detected METADATA support"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:297
+#: ../pykolab/imap/dovecot.py:295
 #, python-format
 msgid "This system does not support METADATA: '%s'"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:524
+#: ../pykolab/imap/dovecot.py:522
 #, python-format
 msgid "Would have transfered %s from %s to %s"
 msgstr ""
@@ -1999,186 +1999,181 @@
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:429 ../pykolab/imap/__init__.py:465
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:494 ../pykolab/imap/__init__.py:786
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:498
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr "Nieuwe mailbox voor gebruiker %s aan het creeren"
 
-#: ../pykolab/imap/__init__.py:511
-#, python-format
-msgid "Could not create the mailbox for user %s, aborting."
-msgstr ""
-
-#: ../pykolab/imap/__init__.py:525 ../pykolab/imap/__init__.py:654
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:600
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:628
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:643
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:659
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr "Mailbox bestaat reeds: %s"
 
-#: ../pykolab/imap/__init__.py:699
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:713
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:715
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid " %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:718
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:730
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:734
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:760
+#: ../pykolab/imap/__init__.py:750
 #, python-format
 msgid "Could not set quota on %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:767
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:804
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:807 ../pykolab/imap/__init__.py:915
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:813 ../pykolab/imap/__init__.py:919
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr "Het verplaatsen van INBOX map %s zal niet slagen sinds doel map %s reeds bestaat"
 
-#: ../pykolab/imap/__init__.py:817
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:825
+#: ../pykolab/imap/__init__.py:815
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr "Zoekende naar map '%s' zijn de volgende mappen gevonden: %r"
 
-#: ../pykolab/imap/__init__.py:839 ../pykolab/imap/__init__.py:882
-#: ../pykolab/imap/__init__.py:896
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
 msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:871
+#: ../pykolab/imap/__init__.py:861
 #, python-format
 msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:912
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr "Oude INBOX map %s gevonden"
 
-#: ../pykolab/imap/__init__.py:921
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr "Oude te hernoemen map user/%s niet gevonden"
 
-#: ../pykolab/imap/__init__.py:923
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
 msgstr "Waarde voor gebruiker is niet een associatieve array"
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:991
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr "Kan huidig IMAP quota voor map %s niet verkrijgen"
 
-#: ../pykolab/imap/__init__.py:1004
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr "Quota voor %s is op dit moment %s"
 
-#: ../pykolab/imap/__init__.py:1010
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr "Bijwerken van authenticatie database quota voor map %s to %d"
 
-#: ../pykolab/imap/__init__.py:1015
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1092
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr "Bezig met controleren van map: %s"
 
-#: ../pykolab/imap/__init__.py:1097
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr "Map heeft geen corresponderende gebruiker (1): %s"
 
-#: ../pykolab/imap/__init__.py:1100
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr "Map heeft geen corresponderende gebruiker (2): %s"
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1115
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1118
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Map %s aan het verwijderen"
@@ -2187,52 +2182,52 @@
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:47
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:53
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:66
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:74
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:99
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:144
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:310
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:326
+#: ../pykolab/itip/__init__.py:277
 #, python-format
 msgid "Failed to compose iTip reply message: %r: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:337 ../pykolab/itip/__init__.py:381
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
 #: ../wallace/module_invitationpolicy.py:1253
 #: ../wallace/module_invitationpolicy.py:1328
-#: ../wallace/module_resources.py:1364
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:369
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr ""
@@ -2782,19 +2777,11 @@
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:459
-msgid "Configuring and refreshing Anti-Virus..."
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:472
-msgid "Could not find a ClamAV update configuration file"
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:515
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:533
+#: ../pykolab/setup/setup_mta.py:500
 msgid ""
 "Could not configure to start on boot, the postfix, clamav and amavisd "
 "services."
@@ -2940,13 +2927,13 @@
 msgid "Cannot find the configuration directory for roundcube."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:305
-#: ../pykolab/setup/setup_syncroton.py:104
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:314
-#: ../pykolab/setup/setup_syncroton.py:113
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
 msgid "Could not configure to start on boot, the webserver server service."
 msgstr ""
 
@@ -3250,7 +3237,7 @@
 msgid "Every %d seconds"
 msgstr ""
 
-#: ../pykolab/xml/todo.py:165
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
@@ -3392,7 +3379,7 @@
 msgstr ""
 
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
-#: ../wallace/module_resources.py:1268
+#: ../wallace/module_resources.py:1251
 #, python-format
 msgid "Reservation Request for %(summary)s was %(status)s"
 msgstr ""
@@ -3403,7 +3390,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
-#: ../wallace/module_resources.py:1352
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
@@ -3419,7 +3406,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
-#: ../wallace/module_resources.py:1450
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
@@ -3457,7 +3444,7 @@
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/unit/test-011-itip.py:534
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3514,21 +3501,21 @@
 
 #: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
 #: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:129
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
 #: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
 #: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
 #: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
 #: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:138
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
@@ -3804,7 +3791,7 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:852
-#: ../wallace/module_resources.py:691 ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
 #, python-format
 msgid "No UID found in IMAP response: %r"
 msgstr ""
@@ -3820,8 +3807,8 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:919
-#: ../wallace/module_resources.py:498 ../wallace/module_resources.py:699
-#: ../wallace/module_resources.py:779
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
@@ -3832,7 +3819,7 @@
 msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:932
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
@@ -4014,314 +4001,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:119
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:184
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:189
+#: ../wallace/module_resources.py:187
 msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:197
+#: ../wallace/module_resources.py:195
 #, python-format
 msgid ""
 "iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:228
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:239
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:248
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:258
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:272
+#: ../wallace/module_resources.py:270
 #, python-format
 msgid "iTip REPLY to %r, %r; matches %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:278
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
 #, python-format
 msgid "Could not find envelope sender attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:285
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:304
+#: ../wallace/module_resources.py:302
 #, python-format
 msgid "Invalid response (%r) received from resource owner for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:306
 #, python-format
 msgid "Event referenced by this REPLY (%r) not found in resource calendar"
 msgstr ""
 
-#: ../wallace/module_resources.py:311
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:320
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:322
+#: ../wallace/module_resources.py:320
 #, python-format
 msgid "Could not find envelope attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:328
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:338
+#: ../wallace/module_resources.py:336
 #, python-format
 msgid "Cancellation for entire event %r: deleting"
 msgstr ""
 
-#: ../wallace/module_resources.py:342
+#: ../wallace/module_resources.py:340
 #, python-format
 msgid "Cancellation for a single occurrence %r of %r: updating..."
 msgstr ""
 
-#: ../wallace/module_resources.py:392
-#, python-format
-msgid "Delegate invitation for resource collection %r to %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:398 ../wallace/module_resources.py:802
-#, python-format
-msgid "Apply invitation policies %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:407
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#. this is the receiving resource record
-#: ../wallace/module_resources.py:411
+#: ../wallace/module_resources.py:390
 #, python-format
-msgid "Decline invitation for individual resource %r / %r"
+msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:427
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr ""
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:474
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr ""
 
-#: ../wallace/module_resources.py:487
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:513
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr ""
 
-#: ../wallace/module_resources.py:538
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:548
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:551
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:555
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:566
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:578
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:601
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:663
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:682
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:715
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:737
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:743
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:770
+#: ../wallace/module_resources.py:754
 #, python-format
 msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:821
+#: ../wallace/module_resources.py:785
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:905
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:924
+#: ../wallace/module_resources.py:907
 #, python-format
 msgid "Delete resource calendar object from %r by UID %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:932
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:943
+#: ../wallace/module_resources.py:926
 #, python-format
 msgid "Failed to delete calendar object %r from folder %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:991 ../wallace/module_resources.py:1063
-#: ../wallace/module_resources.py:1097
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:993 ../wallace/module_resources.py:1065
-#: ../wallace/module_resources.py:1100
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:997 ../wallace/module_resources.py:1069
-#: ../wallace/module_resources.py:1104
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1015
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1023
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1031
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1036
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1056
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:1072 ../wallace/module_resources.py:1106
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:1091
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:1109
+#: ../wallace/module_resources.py:1092
 #, python-format
 msgid "The following resources are being referred to in the iTip: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1219
 #, python-format
 msgid "Check collections %r for kolabinvitationpolicy attributes"
 msgstr ""
 
-#: ../wallace/module_resources.py:1274
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -4331,7 +4312,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1293
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -4341,7 +4322,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1300
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -4350,16 +4331,16 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1335
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1353
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr ""
 
-#: ../wallace/module_resources.py:1373
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -4369,7 +4350,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1379
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -4380,12 +4361,12 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1410
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1429
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"

pykolab-0.8.23.tar.gz/po/pykolab.pot -> pykolab-0.8.4.tar.gz/po/pykolab.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:22+0100\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,151 +135,151 @@
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1083
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1092
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1109
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1116
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1129
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1134
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1143
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1158
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1186
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1209
+#: ../bin/kolab_smtp_access_policy.py:1207
 msgid ""
 "The 'uri' setting in the kolab_smtp_access_policy section is soon going to "
 "be deprecated in favor of 'cache_uri'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1225
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1278
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1355
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1360
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1365
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1370
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1498
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1544
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1551
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1561
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1565
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1594
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1601
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1607
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1613
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1619
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1633
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1642
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1674
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1678
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1680
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1682
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr ""
 
@@ -362,7 +362,7 @@
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2528
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
 #: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr ""
@@ -496,16 +496,16 @@
 msgid "Authentication cache failed: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1445
-#: ../pykolab/auth/ldap/__init__.py:1471 ../pykolab/auth/ldap/__init__.py:3070
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
 #, python-format
 msgid "LDAP server unavailable: %r"
 msgstr ""
 
 #: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
-#: ../pykolab/auth/ldap/__init__.py:1320 ../pykolab/auth/ldap/__init__.py:1446
-#: ../pykolab/auth/ldap/__init__.py:1472 ../pykolab/auth/ldap/__init__.py:1760
-#: ../pykolab/auth/ldap/__init__.py:3071 ../pykolab/auth/ldap/__init__.py:3081
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
 #, python-format
 msgid "%s"
 msgstr ""
@@ -582,319 +582,319 @@
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:525
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:527
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:530
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist= 'dn' + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:649 ../pykolab/auth/ldap/__init__.py:805
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:725
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:836
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:873
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
 msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:883
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:900
+#: ../pykolab/auth/ldap/__init__.py:896
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:911
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:913
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:915
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:918
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:920
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:938
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:977
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:988
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:998
+#: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
 msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1009 ../pykolab/auth/ldap/__init__.py:1098
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1064
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1075
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
 msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1086
+#: ../pykolab/auth/ldap/__init__.py:1082
 #, python-format
 msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1113
+#: ../pykolab/auth/ldap/__init__.py:1109
 #, python-format
 msgid ""
 "Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1124
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1135
+#: ../pykolab/auth/ldap/__init__.py:1131
 #, python-format
 msgid ""
 "Avoiding the duplication of the primary mail address %r in the list of "
 "secondary mail addresses"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1146
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1154
+#: ../pykolab/auth/ldap/__init__.py:1150
 #, python-format
 msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1171 ../pykolab/auth/ldap/__init__.py:1177
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1172 ../pykolab/auth/ldap/__init__.py:1178
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry%s: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1189
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1223
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1259
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1285
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1300
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1347
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, python-format
 msgid ""
 "About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
 "default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1406
 msgid "Attempting to bind without a DN but with a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1415
+#: ../pykolab/auth/ldap/__init__.py:1411
 msgid "Attempting to bind with a DN but without a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1433
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
 msgid "Binding with bind_dn: %s and password: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1451 ../pykolab/auth/ldap/__init__.py:1475
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
 msgid "Invalid DN, username and/or password."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1456
+#: ../pykolab/auth/ldap/__init__.py:1452
 msgid "bind() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1478
+#: ../pykolab/auth/ldap/__init__.py:1474
 msgid "bind_priv() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1690
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1698
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1759
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
 msgid "An error occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1997 ../pykolab/auth/ldap/__init__.py:2191
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2246
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2271
+#: ../pykolab/auth/ldap/__init__.py:2267
 #, python-format
 msgid "Naming contexts found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2278
+#: ../pykolab/auth/ldap/__init__.py:2274
 #, python-format
 msgid "Domains/Root DNs found: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2438
+#: ../pykolab/auth/ldap/__init__.py:2434
 #, python-format
 msgid "Searching root dn for domain %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2443
+#: ../pykolab/auth/ldap/__init__.py:2439
 #, python-format
 msgid "Returning from cache: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2448
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2478
+#: ../pykolab/auth/ldap/__init__.py:2474
 #, python-format
 msgid "Setting domain root dn from LDAP for domain %r: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2624 ../pykolab/auth/ldap/__init__.py:2672
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2750
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2766
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2771
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2779
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2834
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2844
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2947
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2999
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3018
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3072
+#: ../pykolab/auth/ldap/__init__.py:3068
 msgid "-- reconnecting in 10 seconds."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:3080
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 msgstr ""
@@ -1363,43 +1363,43 @@
 msgid "Display changes, do not apply them."
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:91
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:88
 #, python-format
 msgid "Domains in IMAP not in LDAP: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:108
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:156
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, python-format
 msgid ""
 "No recipients for '%s' (would have deleted the mailbox if not for --dry-run)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:113
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:161
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, python-format
 msgid "Deleting mailbox '%s' because it has no recipients"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:117
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:165
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, python-format
 msgid "An error occurred removing mailbox %r: %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:119
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:167
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, python-format
 msgid "Not automatically deleting shared folder '%s'"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:121
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:169
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:150
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
@@ -1806,7 +1806,7 @@
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:287
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
@@ -1847,22 +1847,22 @@
 msgstr ""
 
 #. Removed server reconnection for dovecot, we only have one server
-#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:313
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:317
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:322
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:324
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
@@ -1877,12 +1877,12 @@
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:453
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:513
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
@@ -1892,26 +1892,26 @@
 msgid "Would have transferred %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:526
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:222
+#: ../pykolab/imap/dovecot.py:220
 #, python-format
 msgid "Could not connect to Dovecot IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:294
+#: ../pykolab/imap/dovecot.py:292
 msgid "Detected METADATA support"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:297
+#: ../pykolab/imap/dovecot.py:295
 #, python-format
 msgid "This system does not support METADATA: '%s'"
 msgstr ""
 
-#: ../pykolab/imap/dovecot.py:524
+#: ../pykolab/imap/dovecot.py:522
 #, python-format
 msgid "Would have transfered %s from %s to %s"
 msgstr ""
@@ -1995,185 +1995,180 @@
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:429 ../pykolab/imap/__init__.py:465
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:494 ../pykolab/imap/__init__.py:786
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:498
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:511
-#, python-format
-msgid "Could not create the mailbox for user %s, aborting."
-msgstr ""
-
-#: ../pykolab/imap/__init__.py:525 ../pykolab/imap/__init__.py:654
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:600
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:628
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:643
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:659
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:699
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:713
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:715
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid " %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:718
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:730
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:734
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:760
+#: ../pykolab/imap/__init__.py:750
 #, python-format
 msgid "Could not set quota on %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:767
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:804
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:807 ../pykolab/imap/__init__.py:915
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:813 ../pykolab/imap/__init__.py:919
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, python-format
 msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:817
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:825
+#: ../pykolab/imap/__init__.py:815
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:839 ../pykolab/imap/__init__.py:882
-#: ../pykolab/imap/__init__.py:896
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
 msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:871
+#: ../pykolab/imap/__init__.py:861
 #, python-format
 msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:912
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:921
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:923
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
 msgstr ""
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:991
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1004
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1010
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1015
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1092
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1097
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1100
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1115
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1118
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr ""
@@ -2182,52 +2177,52 @@
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:47
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:53
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:66
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:74
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:99
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:144
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:310
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:326
+#: ../pykolab/itip/__init__.py:277
 #, python-format
 msgid "Failed to compose iTip reply message: %r: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:337 ../pykolab/itip/__init__.py:381
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
 #: ../wallace/module_invitationpolicy.py:1253
 #: ../wallace/module_invitationpolicy.py:1328
-#: ../wallace/module_resources.py:1364
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:369
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr ""
@@ -2801,19 +2796,11 @@
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:459
-msgid "Configuring and refreshing Anti-Virus..."
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:472
-msgid "Could not find a ClamAV update configuration file"
-msgstr ""
-
-#: ../pykolab/setup/setup_mta.py:515
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:533
+#: ../pykolab/setup/setup_mta.py:500
 msgid ""
 "Could not configure to start on boot, the postfix, clamav and amavisd "
 "services."
@@ -2968,13 +2955,13 @@
 msgid "Cannot find the configuration directory for roundcube."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:305
-#: ../pykolab/setup/setup_syncroton.py:104
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:314
-#: ../pykolab/setup/setup_syncroton.py:113
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
 msgid "Could not configure to start on boot, the webserver server service."
 msgstr ""
 
@@ -3277,7 +3264,7 @@
 msgid "Every %d seconds"
 msgstr ""
 
-#: ../pykolab/xml/todo.py:165
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
@@ -3419,7 +3406,7 @@
 msgstr ""
 
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
-#: ../wallace/module_resources.py:1268
+#: ../wallace/module_resources.py:1251
 #, python-format
 msgid "Reservation Request for %(summary)s was %(status)s"
 msgstr ""
@@ -3430,7 +3417,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
-#: ../wallace/module_resources.py:1352
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
@@ -3446,7 +3433,7 @@
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
-#: ../wallace/module_resources.py:1450
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
@@ -3484,7 +3471,7 @@
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/unit/test-011-itip.py:534
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3541,21 +3528,21 @@
 
 #: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
 #: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:129
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
 #: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
 #: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
 #: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
 #: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:138
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
@@ -3830,8 +3817,8 @@
 msgid "Searching folder %r for %s %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:852 ../wallace/module_resources.py:691
-#: ../wallace/module_resources.py:752
+#: ../wallace/module_invitationpolicy.py:852 ../wallace/module_resources.py:675
+#: ../wallace/module_resources.py:736
 #, python-format
 msgid "No UID found in IMAP response: %r"
 msgstr ""
@@ -3846,8 +3833,8 @@
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:919 ../wallace/module_resources.py:498
-#: ../wallace/module_resources.py:699 ../wallace/module_resources.py:779
+#: ../wallace/module_invitationpolicy.py:919 ../wallace/module_resources.py:482
+#: ../wallace/module_resources.py:683 ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
@@ -3857,7 +3844,7 @@
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:932 ../wallace/module_resources.py:542
+#: ../wallace/module_invitationpolicy.py:932 ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
@@ -4041,314 +4028,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:119
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:184
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:189
+#: ../wallace/module_resources.py:187
 msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:197
+#: ../wallace/module_resources.py:195
 #, python-format
 msgid ""
 "iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:228
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:239
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:248
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:258
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:272
+#: ../wallace/module_resources.py:270
 #, python-format
 msgid "iTip REPLY to %r, %r; matches %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:278
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
 #, python-format
 msgid "Could not find envelope sender attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:285
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:304
+#: ../wallace/module_resources.py:302
 #, python-format
 msgid "Invalid response (%r) received from resource owner for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:306
 #, python-format
 msgid "Event referenced by this REPLY (%r) not found in resource calendar"
 msgstr ""
 
-#: ../wallace/module_resources.py:311
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:320
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:322
+#: ../wallace/module_resources.py:320
 #, python-format
 msgid "Could not find envelope attendee: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:328
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:338
+#: ../wallace/module_resources.py:336
 #, python-format
 msgid "Cancellation for entire event %r: deleting"
 msgstr ""
 
-#: ../wallace/module_resources.py:342
+#: ../wallace/module_resources.py:340
 #, python-format
 msgid "Cancellation for a single occurrence %r of %r: updating..."
 msgstr ""
 
-#: ../wallace/module_resources.py:392
-#, python-format
-msgid "Delegate invitation for resource collection %r to %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:398 ../wallace/module_resources.py:802
-#, python-format
-msgid "Apply invitation policies %r"
-msgstr ""
-
-#: ../wallace/module_resources.py:407
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#. this is the receiving resource record
-#: ../wallace/module_resources.py:411
+#: ../wallace/module_resources.py:390
 #, python-format
-msgid "Decline invitation for individual resource %r / %r"
+msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:427
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr ""
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:474
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr ""
 
-#: ../wallace/module_resources.py:487
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:513
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr ""
 
-#: ../wallace/module_resources.py:538
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:548
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:551
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:555
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:566
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:578
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:601
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:663
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:682
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:715
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:737
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:743
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:770
+#: ../wallace/module_resources.py:754
 #, python-format
 msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:821
+#: ../wallace/module_resources.py:785
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:905
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:924
+#: ../wallace/module_resources.py:907
 #, python-format
 msgid "Delete resource calendar object from %r by UID %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:932
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:943
+#: ../wallace/module_resources.py:926
 #, python-format
 msgid "Failed to delete calendar object %r from folder %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:991 ../wallace/module_resources.py:1063
-#: ../wallace/module_resources.py:1097
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:993 ../wallace/module_resources.py:1065
-#: ../wallace/module_resources.py:1100
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:997 ../wallace/module_resources.py:1069
-#: ../wallace/module_resources.py:1104
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1015
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1023
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1031
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1036
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1056
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:1072 ../wallace/module_resources.py:1106
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:1091
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:1109
+#: ../wallace/module_resources.py:1092
 #, python-format
 msgid "The following resources are being referred to in the iTip: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1219
 #, python-format
 msgid "Check collections %r for kolabinvitationpolicy attributes"
 msgstr ""
 
-#: ../wallace/module_resources.py:1274
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -4359,7 +4340,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1293
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -4369,7 +4350,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1300
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -4378,16 +4359,16 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1335
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1353
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr ""
 
-#: ../wallace/module_resources.py:1373
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -4399,7 +4380,7 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1379
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -4413,12 +4394,12 @@
 " "
 msgstr ""
 
-#: ../wallace/module_resources.py:1410
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1429
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"

pykolab-0.8.23.tar.gz/pykolab/Makefile.am -> pykolab-0.8.4.tar.gz/pykolab/Makefile.am Changed

pykolab-0.8.23.tar.gz/pykolab/auth/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/auth/__init__.py Changed

@@ -21,17 +21,14 @@
 import time
 
 import pykolab
-from pykolab.base import Base
+import pykolab.base
 
 from pykolab.translate import _
 
-# pylint: disable=invalid-name
 log = pykolab.getLogger('pykolab.auth')
 conf = pykolab.getConf()
 
-
-# pylint: disable=too-many-public-methods
-class Auth(Base):
+class Auth(pykolab.base.Base):
     """
         This is the Authentication and Authorization module for PyKolab.
     """
@@ -40,7 +37,7 @@
         """
             Initialize the authentication class.
         """
-        Base.__init__(self, domain=domain)
+        pykolab.base.Base.__init__(self, domain=domain)
 
         self._auth = None
 
@@ -89,7 +86,7 @@
             back to the primary domain specified by the configuration.
         """
 
-        log.debug(_("Called for domain %r") % (domain), level=8)
+        log.debug(_("Called for domain %r") % (domain), level=9)
 
         if not self._auth == None:
             return
@@ -106,64 +103,59 @@
             section = domain
 
         log.debug(
-            _("Using section %s and domain %s") % (section, domain),
-            level=8
-        )
+                _("Using section %s and domain %s") % (section,domain),
+                level=9
+            )
 
-        if self.domains is not None and domain in self.domains:
+        if not self.domains == None and self.domains.has_key(domain):
             section = self.domainsdomain
             domain = self.domainsdomain
 
         log.debug(
-            _("Using section %s and domain %s") % (section, domain),
-            level=8
-        )
+                _("Using section %s and domain %s") % (section,domain),
+                level=9
+            )
 
         log.debug(
-            _("Connecting to Authentication backend for domain %s") % (
-                domain
-            ),
-            level=8
-        )
+                _("Connecting to Authentication backend for domain %s") % (
+                        domain
+                    ),
+                level=8
+            )
 
         if not conf.has_section(section):
             section = 'kolab'
 
         if not conf.has_option(section, 'auth_mechanism'):
             log.debug(
-                _("Section %s has no option 'auth_mechanism'") % (section),
-                level=8
-            )
+                    _("Section %s has no option 'auth_mechanism'") % (section),
+                    level=9
+                )
 
             section = 'kolab'
         else:
             log.debug(
-                _("Section %s has auth_mechanism: %r") % (
-                    section,
-                    conf.get(section, 'auth_mechanism')
-                ),
-                level=8
-            )
+                    _("Section %s has auth_mechanism: %r") % (
+                            section,
+                            conf.get(section,'auth_mechanism')
+                        ),
+                    level=9
+                )
 
         # Get the actual authentication and authorization backend.
         if conf.get(section, 'auth_mechanism') == 'ldap':
-            log.debug(_("Starting LDAP..."), level=8)
-            from pykolab.auth.ldap import LDAP
-            self._auth = LDAP(self.domain)
-
-        elif conf.get(section, 'auth_mechanism') == 'plesk':
-            log.debug(_("Starting Plesk..."), level=8)
-            from pykolab.auth import plesk
-            self._auth = plesk.Plesk(self.domain)
+            log.debug(_("Starting LDAP..."), level=9)
+            from pykolab.auth import ldap
+            self._auth = ldap.LDAP(self.domain)
 
-        # elif conf.get(section, 'auth_mechanism') == 'sql':
-        #     from .sql import SQL
-        #     self._auth = SQL(self.domain)
+        elif conf.get(section, 'auth_mechanism') == 'sql':
+            from pykolab.auth import sql
+            self._auth = sql.SQL(self.domain)
 
         else:
-            log.debug(_("Starting LDAP..."), level=8)
-            from pykolab.auth.ldap import LDAP
-            self._auth = LDAP(self.domain)
+            log.debug(_("Starting LDAP..."), level=9)
+            from pykolab.auth import ldap
+            self._auth = ldap.LDAP(self.domain)
 
         self._auth.connect()
 
@@ -173,10 +165,13 @@
             back to the primary domain specified by the configuration.
         """
 
-        if domain is None:
+        if domain == None:
+            section = 'kolab'
             domain = conf.get('kolab', 'primary_domain')
+        else:
+            section = domain
 
-        if not self._auth:
+        if not self._auth or self._auth == None:
             return
 
         self._auth._disconnect()
@@ -198,7 +193,7 @@
         else:
             return result
 
-    def find_recipient(self, address, domain=None, search_attrs=None):
+    def find_recipient(self, address, domain=None):
         """
             Find one or more entries corresponding to the recipient address.
         """
@@ -208,7 +203,7 @@
         if not self._auth or self._auth == None:
             self.connect(domain=domain)
 
-        result = self._auth.find_recipient(address, search_attrs=search_attrs)
+        result = self._auth.find_recipient(address)
 
         if isinstance(result, list) and len(result) == 1:
             return result0

pykolab-0.8.23.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/auth/ldap/__init__.py Changed

@@ -6,57 +6,103 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, 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
 # 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 this program. If not, see <http://www.gnu.org/licenses/>.
 #
-# pylint: disable=too-many-lines
-
-from __future__ import print_function
 
 import datetime
-# Catch python-ldap-2.4 changes
-from distutils import version
+import _ldap
+import ldap
+import ldap.async
+import ldap.controls
+import ldap.filter
 import logging
 import time
 import traceback
 
-import ldap
-import ldap.controls
+import pykolab
+import pykolab.base
+
+from pykolab import utils
+from pykolab.constants import *
+from pykolab.errors import *
+from pykolab.translate import _
+
+log = pykolab.getLogger('pykolab.auth')
+conf = pykolab.getConf()
+
+import auth_cache
+import cache
+
+# Catch python-ldap-2.4 changes
+from distutils import version
+
+if version.StrictVersion('2.4.0') <= version.StrictVersion(ldap.__version__):
+ LDAP_CONTROL_PAGED_RESULTS = ldap.CONTROL_PAGEDRESULTS
+else:
+ LDAP_CONTROL_PAGED_RESULTS = ldap.LDAP_CONTROL_PAGE_OID
+
 try:
 from ldap.controls import psearch
-except ImportError:
- pass
+except:
+ log.warning(_("Python LDAP library does not support persistent search"))
 
-from ldap.dn import explode_dn
+class SimplePagedResultsControl(ldap.controls.SimplePagedResultsControl):
+ """
 
-import ldap.filter
+ Python LDAP 2.4 and later breaks the API. This is an abstraction class
+ so that we can handle either.
+ """
 
-from six import string_types
-import _ldap
+ def __init__(self, page_size=0, cookie=''):
+ if version.StrictVersion(
+ '2.4.0'
+ ) <= version.StrictVersion(
+ ldap.__version__
+ ):
 
-import pykolab
+ ldap.controls.SimplePagedResultsControl.__init__(
+ self,
+ size=page_size,
+ cookie=cookie
+ )
+ else:
+ ldap.controls.SimplePagedResultsControl.__init__(
+ self,
+ LDAP_CONTROL_PAGED_RESULTS,
+ True,
+ (page_size, '')
+ )
 
-from pykolab import utils
-from pykolab.base import Base
-from pykolab.constants import SUPPORTED_LDAP_CONTROLS
-from pykolab.errors import *
-from pykolab.translate import _ as _l
+ def cookie(self):
+ if version.StrictVersion(
+ '2.4.0'
+ ) <= version.StrictVersion(
+ ldap.__version__
+ ):
 
-import auth_cache
-import cache
+ return self.cookie
+ else:
+ return self.controlValue1
 
-# pylint: disable=invalid-name
-log = pykolab.getLogger('pykolab.auth')
-conf = pykolab.getConf()
+ def size(self):
+ if version.StrictVersion(
+ '2.4.0'
+ ) <= version.StrictVersion(
+ ldap.__version__
+ ):
 
+ return self.size
+ else:
+ return self.controlValue0
 
-class LDAP(Base):
+class LDAP(pykolab.base.Base):
 """
 Abstraction layer for the LDAP authentication / authorization backend,
 for use with Kolab.
@@ -67,21 +113,17 @@
 Initialize the LDAP object for domain. If no domain is specified,
 domain name space configured as 'kolab'.'primary_domain' is used.
 """
- Base.__init__(self, domain=domain)
+ pykolab.base.Base.__init__(self, domain=domain)
 
 self.ldap = None
 self.ldap_priv = None
 self.bind = None
 
- if domain is None:
+ if domain == None:
 self.domain = conf.get('kolab', 'primary_domain')
 else:
 self.domain = domain
 
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-return-statements
- # pylint: disable=too-many-statements
 def authenticate(self, login, realm):
 """
 Find the entry corresponding to login, and attempt a bind.
@@ -102,14 +144,13 @@
 
 try:
 log.debug(
- _l("Attempting to authenticate user %s in realm %s") % (
- login0,
- realm
- ),
- level=8
- )
-
- except Exception:
+ _("Attempting to authenticate user %s in realm %s") % (
+ login0,
+ realm
+ ),
+ level=8
+ )
+ except:
 pass
 
 self.connect(immediate=True)
@@ -120,29 +161,31 @@
 
 try:
 base_dn = auth_cache.get_entry(self.domain)
- except Exception as errmsg:
- log.error(_l("Authentication cache failed: %r") % (errmsg))
+ except Exception, errmsg:
+ log.error(_("Authentication cache failed: %r") % (errmsg))
+ pass
 
- if base_dn is None:
+ if base_dn == None:
 config_base_dn = self.config_get('base_dn')
 ldap_base_dn = self._kolab_domain_root_dn(self.domain)
 
- if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ if not ldap_base_dn == None and not ldap_base_dn == config_base_dn:
 base_dn = ldap_base_dn
 else:
 base_dn = config_base_dn
 
 try:
 auth_cache.set_entry(self.domain, base_dn)
- except Exception as errmsg:
- log.error(_l("Authentication cache failed: %r") % (errmsg))
+ except Exception, errmsg:
+ log.error(_("Authentication cache failed: %r") % (errmsg))
+ pass
 
 try:
 user_filter = self.config_get_raw('user_filter') % (
- {'base_dn': base_dn}
- )
+ {'base_dn': base_dn}
+ )
 
- except TypeError:
+ except TypeError, errmsg:
 user_filter = self.config_get_raw('user_filter')
 
 _filter = '(&(|'
@@ -160,90 +203,61 @@
 # Attempt to obtain an entry_dn from cache.
 try:
 entry_dn = auth_cache.get_entry(_filter)
- except Exception as errmsg:
- log.error(_l("Authentication cache failed: %r") % (errmsg))
+ except Exception, errmsg:
+ log.error(_("Authentication cache failed: %r") % (errmsg))
+ pass
 
 retval = False
- timeout = float(self.config_get('ldap', 'timeout', default=10))
 
 if entry_dn is None:
 _search = self.ldap.search_ext(
- base_dn,
- ldap.SCOPE_SUBTREE,
- filterstr=_filter,
- attrlist='entrydn',
- attrsonly=True,
- timeout=timeout
- )
+ base_dn,
+ ldap.SCOPE_SUBTREE,
+ _filter,
+ 'entrydn'
+ )
 
 try:
 (
- _result_type,
- _result_data,
- _result_msgid,
- _result_controls
- ) = self.ldap.result3(_search)
-
- except ldap.INVALID_CREDENTIALS:
- log.error(
- _l("Invalid DN, username and/or password for '%s'.") % (
- _filter
- )
- )
-
- return False
-
- except ldap.NO_SUCH_OBJECT:
- log.error(
- _l("Invalid DN, username and/or password for '%s'.") % (
- _filter
- )
- )
-
- return False
-
- except ldap.SERVER_DOWN as errmsg:
- log.error(_l("LDAP server unavailable: %r") % (errmsg))
- log.error(traceback.format_exc())
- self._disconnect()
-
- return False
-
- except ldap.TIMEOUT:
- log.error(_l("LDAP timeout."))
+ _result_type,
+ _result_data,
+ _result_msgid,
+ _result_controls
+ ) = self.ldap.result3(_search)
+
+ except ldap.SERVER_DOWN, errmsg:
+ log.error(_("LDAP server unavailable: %r") % (errmsg))
+ log.error(_("%s") % (traceback.format_exc()))
 self._disconnect()
 
 return False
 
- except Exception as errmsg:
- log.error(_l("Exception occurred: %r") % (errmsg))
- log.error(traceback.format_exc())
+ except Exception, errmsg:
+ log.error(_("Exception occurred: %r") % (errmsg))
+ log.error(_("%s") % (traceback.format_exc()))
 self._disconnect()
 
 return False
 
 log.debug(
- _l("Length of entries found: %r") % (
- len(_result_data)
- ),
- level=8
- )
-
- # Remove referrals
- _result_data = _e for _e in _result_data if _e0 is not None
+ _("Length of entries found: %r") % (
+ len(_result_data)
+ ),
+ level=8
+ )
 
 if len(_result_data) == 1:
- (entry_dn, _) = _result_data0
+ (entry_dn, entry_attrs) = _result_data0
 
 elif len(_result_data) > 1:
 try:
 log.info(
- _l("Authentication for %r failed (multiple entries)") % (
- login0
+ _("Authentication for %r failed " +
+ "(multiple entries)") % (
+ login0
+ )
 )
- )
-
- except Exception:
+ except:
 pass
 
 self._disconnect()
@@ -252,12 +266,11 @@
 else:
 try:
 log.info(
- _l("Authentication for %r failed (no entry)") % (
- login0
+ _("Authentication for %r failed (no entry)") % (
+ login0
+ )
 )
- )
-
- except Exception:
+ except:
 pass
 
 self._disconnect()
@@ -266,12 +279,11 @@
 if entry_dn is None:
 try:
 log.info(
- _l("Authentication for %r failed (LDAP error?)") % (
- login0
+ _("Authentication for %r failed (LDAP error?)") % (
+ login0
+ )
 )
- )
-
- except Exception:
+ except:
 pass
 
 self._disconnect()
@@ -285,23 +297,22 @@
 if retval:
 try:
 log.info(
- _l("Authentication for %r succeeded") % (
- login0
+ _("Authentication for %r succeeded") % (
+ login0
+ )
 )
- )
 
- except Exception:
+ except:
 pass
 
 else:
 try:
 log.info(
- _l("Authentication for %r failed (error)") % (
- login0
+ _("Authentication for %r failed (error)") % (
+ login0
+ )
 )
- )
-
- except Exception:
+ except:
 pass
 
 self._disconnect()
@@ -309,25 +320,25 @@
 
 try:
 auth_cache.set_entry(_filter, entry_dn)
- except Exception as errmsg:
- log.error(_l("Authentication cache failed: %r") % (errmsg))
+ except Exception, errmsg:
+ log.error(_("Authentication cache failed: %r") % (errmsg))
+ pass
 
- except ldap.SERVER_DOWN:
- log.error(_l("Authentication failed, LDAP server unavailable"))
+ except ldap.SERVER_DOWN, errmsg:
+ log.error(_("Authentication failed, LDAP server unavailable"))
 self._disconnect()
 
 return False
 
- except Exception:
+ except Exception, errmsg:
 try:
 log.debug(
- _l("Failed to authenticate as user %r") % (
- login0
- ),
- level=8
- )
-
- except Exception:
+ _("Failed to authenticate as user %r") % (
+ login0
+ ),
+ level=8
+ )
+ except:
 pass
 
 self._disconnect()
@@ -340,47 +351,50 @@
 retval = self._bind(entry_dn, login1)
 
 if retval:
- log.info(_l("Authentication for %r succeeded") % (login0))
+ log.info(_("Authentication for %r succeeded") % (login0))
 else:
 log.info(
- _l("Authentication for %r failed (password)") % (
- login0
+ _("Authentication for %r failed (password)") % (
+ login0
+ )
 )
- )
 
 self._disconnect()
 return False
 
- except ldap.NO_SUCH_OBJECT as errmsg:
+ auth_cache.set_entry(_filter, entry_dn)
+
+ except ldap.NO_SUCH_OBJECT, errmsg:
 log.debug(
- _l("Error occured, there is no such object: %r") % (
- errmsg
- ),
- level=8
- )
+ _("Error occured, there is no such object: %r") % (
+ errmsg
+ ),
+ level=8
+ )
 
 self.bind = None
 
 try:
 auth_cache.del_entry(_filter)
 
- except Exception:
- log.error(_l("Authentication cache failed to clear entry"))
+ except:
+ log.error(_("Authentication cache failed to clear entry"))
+ pass
 
 retval = self.authenticate(login, realm)
 
- except Exception as errmsg:
- log.debug(_l("Exception occured: %r") % (errmsg))
+ except Exception, errmsg:
+ log.debug(_("Exception occured: %r") %(errmsg))
 
 try:
 log.debug(
- _l("Failed to authenticate as user %r") % (
- login0
- ),
- level=8
- )
+ _("Failed to authenticate as user %r") % (
+ login0
+ ),
+ level=8
+ )
 
- except Exception:
+ except:
 pass
 
 self._disconnect()
@@ -390,7 +404,7 @@
 
 return retval
 
- def connect(self, priv=None, immediate=False):
+ def connect(self, priv=None, immediate=True):
 """
 Connect to the LDAP server through the uri configured.
 """
@@ -402,11 +416,11 @@
 if priv is not None and self.ldap_priv is not None:
 return
 
- log.debug(_l("Connecting to LDAP..."), level=8)
+ log.debug(_("Connecting to LDAP..."), level=8)
 
 uri = self.config_get('ldap_uri')
 
- log.debug(_l("Attempting to use LDAP URI %s") % (uri), level=8)
+ log.debug(_("Attempting to use LDAP URI %s") % (uri), level=8)
 
 trace_level = 0
 
@@ -421,15 +435,13 @@
 retry_delay = 3.0
 
 conn = ldap.ldapobject.ReconnectLDAPObject(
- uri,
- trace_level=trace_level,
- trace_file=pykolab.logger.StderrToLogger(log),
- retry_max=retry_max,
- retry_delay=retry_delay
- )
+ uri,
+ trace_level=trace_level,
+ retry_max=retry_max,
+ retry_delay=retry_delay
+ )
 
- if immediate:
- conn.set_option(ldap.OPT_TIMEOUT, 10)
+ conn.set_option(ldap.OPT_TIMEOUT, 10)
 
 conn.protocol_version = 3
 conn.supported_controls = 
@@ -462,29 +474,27 @@
 config_base_dn = self.config_get('base_dn')
 ldap_base_dn = self._kolab_domain_root_dn(self.domain)
 
- if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ if not ldap_base_dn == None and not ldap_base_dn == config_base_dn:
 base_dn = ldap_base_dn
 else:
 base_dn = config_base_dn
 
- _filter = "(%s=%s)" % (unique_attribute, ldap.filter.escape_filter_chars(entry_id))
-
 _search = self.ldap.search_ext(
- base_dn,
- ldap.SCOPE_SUBTREE,
- _filter,
- 'entrydn'
- )
+ base_dn,
+ ldap.SCOPE_SUBTREE,
+ '(%s=%s)' % (unique_attribute, entry_id),
+ 'entrydn'
+ )
 
 (
- _result_type,
- _result_data,
- _result_msgid,
- _result_controls
- ) = self.ldap.result3(_search)
+ _result_type,
+ _result_data,
+ _result_msgid,
+ _result_controls
+ ) = self.ldap.result3(_search)
 
 if len(_result_data) >= 1:
- (entry_dn, _) = _result_data0
+ (entry_dn, entry_attrs) = _result_data0
 
 return entry_dn
 
@@ -497,13 +507,12 @@
 
 entry_attrs = self.get_entry_attributes(entry_id, attribute)
 
- if attribute in entry_attrs:
+ if entry_attrs.has_key(attribute):
 return entry_attrsattribute
-
- if attribute.lower() in entry_attrs:
+ elif entry_attrs.has_key(attribute.lower()):
 return entry_attrsattribute.lower()
-
- return None
+ else:
+ return None
 
 def get_entry_attributes(self, entry_id, attributes):
 """
@@ -512,32 +521,32 @@
 
 self._bind()
 
- log.debug(_l("Entry ID: %r") % (entry_id), level=8)
+ log.debug(_("Entry ID: %r") % (entry_id), level=9)
 entry_dn = self.entry_dn(entry_id)
- log.debug(_l("Entry DN: %r") % (entry_dn), level=8)
+ log.debug(_("Entry DN: %r") % (entry_dn), level=9)
 
 log.debug(
- _l("ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist= 'dn' + %r") % (
- entry_dn,
- ldap.SCOPE_BASE,
- attributes
- ),
- level=8
- )
+ _("ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist= 'dn' + %r") % (
+ entry_dn,
+ ldap.SCOPE_BASE,
+ attributes
+ ),
+ level=9
+ )
 
 _search = self.ldap.search_ext(
- entry_dn,
- ldap.SCOPE_BASE,
- filterstr='(objectclass=*)',
- attrlist='dn' + attributes
- )
+ entry_dn,
+ ldap.SCOPE_BASE,
+ filterstr='(objectclass=*)',
+ attrlist= 'dn' + attributes
+ )
 
 (
- _result_type,
- _result_data,
- _result_msgid,
- _result_controls
- ) = self.ldap.result3(_search)
+ _result_type,
+ _result_data,
+ _result_msgid,
+ _result_controls
+ ) = self.ldap.result3(_search)
 
 if len(_result_data) >= 1:
 (_entry_dn, _entry_attrs) = _result_data0
@@ -556,7 +565,6 @@
 
 return self.extract_recipient_addresses(entry) if entry is not None else 
 
- # pylint: disable=no-self-use
 def extract_recipient_addresses(self, entry):
 """
 Extact a list of all valid recipient addresses for the given LDAP entry.
@@ -566,10 +574,10 @@
 mail_attributes = conf.get_list('ldap', 'mail_attributes')
 
 for attr in mail_attributes:
- if attr in entry:
+ if entry.has_key(attr):
 if isinstance(entryattr, list):
 recipient_addresses.extend(entryattr)
- elif isinstance(entryattr, string_types):
+ elif isinstance(entryattr, basestring):
 recipient_addresses.append(entryattr)
 
 return recipient_addresses
@@ -581,18 +589,13 @@
 delegators = 
 
 mailbox_attribute = conf.get('cyrus-sasl', 'result_attribute')
- if mailbox_attribute is None:
+ if mailbox_attribute == None:
 mailbox_attribute = 'mail'
 
 for __delegator in self.search_entry_by_attribute('kolabDelegate', entry_id):
 (_dn, _delegator) = __delegator
- _delegator'dn' = _dn
-
- if mailbox_attribute in _delegator:
- _delegator'_mailbox_basename' = _delegatormailbox_attribute
- else:
- _delegator'_mailbox_basename' = None
-
+ _delegator'dn' = _dn;
+ _delegator'_mailbox_basename' = _delegatormailbox_attribute if _delegator.has_key(mailbox_attribute) else None
 if isinstance(_delegator'_mailbox_basename', list):
 _delegator'_mailbox_basename' = _delegator'_mailbox_basename'0
 delegators.append(_delegator)
@@ -609,18 +612,18 @@
 
 self._bind()
 
- if exclude_entry_id is not None:
+ if not exclude_entry_id == None:
 __filter_prefix = "(&"
 __filter_suffix = "(!(%s=%s)))" % (
- self.config_get('unique_attribute'),
- exclude_entry_id
- )
+ self.config_get('unique_attribute'),
+ exclude_entry_id
+ )
 else:
 __filter_prefix = ""
 __filter_suffix = ""
 
 resource_filter = self.config_get('resource_filter')
- if resource_filter is not None:
+ if not resource_filter == None:
 __filter_prefix = "(&%s" % resource_filter
 __filter_suffix = ")"
 
@@ -632,7 +635,7 @@
 
 _filter = "(|"
 
- if isinstance(folder, string_types):
+ if isinstance(folder, basestring):
 _filter += "(kolabTargetFolder=%s)" % (folder)
 else:
 for _folder in folder:
@@ -640,22 +643,28 @@
 
 _filter += ")"
 
- _filter = "%s%s%s" % (__filter_prefix, _filter, __filter_suffix)
+ _filter = "%s%s%s" % (__filter_prefix,_filter,__filter_suffix)
 
- log.debug(_l("Finding resource with filter %r") % (_filter), level=8)
+ log.debug(_("Finding resource with filter %r") % (_filter), level=8)
 
 if len(_filter) <= 6:
 return None
 
- resource_base_dn = self._object_base_dn('resource')
+ config_base_dn = self.config_get('resource_base_dn')
+ ldap_base_dn = self._kolab_domain_root_dn(self.domain)
+
+ if not ldap_base_dn == None and not ldap_base_dn == config_base_dn:
+ resource_base_dn = ldap_base_dn
+ else:
+ resource_base_dn = config_base_dn
 
 _results = self.ldap.search_s(
- resource_base_dn,
- scope=ldap.SCOPE_SUBTREE,
- filterstr=_filter,
- attrlist=result_attributes,
- attrsonly=True
- )
+ resource_base_dn,
+ scope=ldap.SCOPE_SUBTREE,
+ filterstr=_filter,
+ attrlist=result_attributes,
+ attrsonly=True
+ )
 
 _entry_dns = 
 
@@ -665,7 +674,7 @@
 
 return _entry_dns
 
- def find_recipient(self, address="*", exclude_entry_id=None, search_attrs=None):
+ def find_recipient(self, address="*", exclude_entry_id=None):
 """
 Given an address string or list of addresses, find one or more valid
 recipients.
@@ -675,36 +684,35 @@
 
 Specify an additional entry_id to exclude to exclude matches against
 the current entry.
-
- In search_attrs you can specify list of search attributes. By default
- mail_attributes are used.
 """
 
 self._bind()
 
- if exclude_entry_id is not None:
+ if not exclude_entry_id == None:
 __filter_prefix = "(&"
 __filter_suffix = "(!(%s=%s)))" % (
- self.config_get('unique_attribute'),
- ldap.filter.escape_filter_chars(exclude_entry_id)
- )
+ self.config_get('unique_attribute'),
+ exclude_entry_id
+ )
 
 else:
 __filter_prefix = ""
 __filter_suffix = ""
 
- if search_attrs is not None:
- recipient_address_attrs = search_attrs
- else:
- recipient_address_attrs = self.config_get_list("mail_attributes")
+ kolab_filter = self._kolab_filter()
+ recipient_address_attrs = self.config_get_list("mail_attributes")
+
+ result_attributes = 
+
+ for recipient_address_attr in recipient_address_attrs:
+ result_attributes.append(recipient_address_attr)
 
- result_attributes = recipient_address_attrs
 result_attributes.append(self.config_get('unique_attribute'))
 
 _filter = "(|"
 
 for recipient_address_attr in recipient_address_attrs:
- if isinstance(address, string_types):
+ if isinstance(address, basestring):
 _filter += "(%s=%s)" % (recipient_address_attr, address)
 else:
 for _address in address:
@@ -712,9 +720,9 @@
 
 _filter += ")"
 
- _filter = "%s%s%s" % (__filter_prefix, _filter, __filter_suffix)
+ _filter = "%s%s%s" % (__filter_prefix,_filter,__filter_suffix)
 
- log.debug(_l("Finding recipient with filter %r") % (_filter), level=8)
+ log.debug(_("Finding recipient with filter %r") % (_filter), level=8)
 
 if len(_filter) <= 6:
 return None
@@ -722,18 +730,18 @@
 config_base_dn = self.config_get('base_dn')
 ldap_base_dn = self._kolab_domain_root_dn(self.domain)
 
- if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ if not ldap_base_dn == None and not ldap_base_dn == config_base_dn:
 base_dn = ldap_base_dn
 else:
 base_dn = config_base_dn
 
 _results = self.ldap.search_s(
- base_dn,
- scope=ldap.SCOPE_SUBTREE,
- filterstr=_filter,
- attrlist=result_attributes,
- attrsonly=True
- )
+ base_dn,
+ scope=ldap.SCOPE_SUBTREE,
+ filterstr=_filter,
+ attrlist=result_attributes,
+ attrsonly=True
+ )
 
 _entry_dns = 
 
@@ -741,7 +749,7 @@
 (_entry_id, _entry_attrs) = _result
 
 # Prevent Active Directory referrals
- if _entry_id is not None:
+ if not _entry_id == None:
 _entry_dns.append(_entry_id)
 
 return _entry_dns
@@ -756,19 +764,19 @@
 
 self._bind()
 
- if exclude_entry_id is not None:
+ if not exclude_entry_id == None:
 __filter_prefix = "(&"
 __filter_suffix = "(!(%s=%s)))" % (
- self.config_get('unique_attribute'),
- ldap.filter.escape_filter_chars(exclude_entry_id)
- )
+ self.config_get('unique_attribute'),
+ exclude_entry_id
+ )
 
 else:
 __filter_prefix = ""
 __filter_suffix = ""
 
 resource_filter = self.config_get('resource_filter')
- if resource_filter is not None:
+ if not resource_filter == None:
 __filter_prefix = "(&%s" % resource_filter
 __filter_suffix = ")"
 
@@ -780,7 +788,7 @@
 _filter = "(|"
 
 for recipient_address_attr in recipient_address_attrs:
- if isinstance(address, string_types):
+ if isinstance(address, basestring):
 _filter += "(%s=%s)" % (recipient_address_attr, address)
 else:
 for _address in address:
@@ -788,41 +796,50 @@
 
 _filter += ")"
 
- _filter = "%s%s%s" % (__filter_prefix, _filter, __filter_suffix)
+ _filter = "%s%s%s" % (__filter_prefix,_filter,__filter_suffix)
 
- log.debug(_l("Finding resource with filter %r") % (_filter), level=8)
+ log.debug(_("Finding resource with filter %r") % (_filter), level=8)
 
 if len(_filter) <= 6:
 return None
 
- resource_base_dn = self._object_base_dn('resource')
+ config_base_dn = self.config_get('resource_base_dn')
+ ldap_base_dn = self._kolab_domain_root_dn(self.domain)
+
+ if not ldap_base_dn == None and not ldap_base_dn == config_base_dn:
+ resource_base_dn = ldap_base_dn
+ else:
+ resource_base_dn = config_base_dn
 
 _results = self.ldap.search_s(
- resource_base_dn,
- scope=ldap.SCOPE_SUBTREE,
- filterstr=_filter,
- attrlist=result_attributes,
- attrsonly=True
- )
+ resource_base_dn,
+ scope=ldap.SCOPE_SUBTREE,
+ filterstr=_filter,
+ attrlist=result_attributes,
+ attrsonly=True
+ )
 
- # Remove referrals
- _entry_dns = _e0 for _e in _results if _e0 is not None
+ _entry_dns = 
+
+ for _result in _results:
+ (_entry_id, _entry_attrs) = _result
+ _entry_dns.append(_entry_id)
 
 return _entry_dns
 
 def get_latest_sync_timestamp(self):
 timestamp = cache.last_modify_timestamp(self.domain)
- log.debug(_l("Using timestamp %r") % (timestamp), level=8)
+ log.debug(_("Using timestamp %r") % (timestamp), level=9)
 return timestamp
 
 def list_secondary_domains(self):
 """
 List alias domain name spaces for the current domain name space.
 """
- if self.domains is not None:
- return s for s in self.domains if s not in self.domains.values()
-
- return 
+ if not self.domains == None:
+ return s for s in self.domains.keys() if not s in self.domains.values()
+ else:
+ return 
 
 def recipient_policy(self, entry):
 """
@@ -846,19 +863,20 @@
 secondary_mail_attribute = mail_attributes1
 
 daemon_rcpt_policy = self.config_get('daemon_rcpt_policy')
- if not utils.true_or_false(daemon_rcpt_policy) and daemon_rcpt_policy is not None:
+ if not utils.true_or_false(daemon_rcpt_policy) and not daemon_rcpt_policy == None:
 log.debug(
- _l("Not applying recipient policy for %s (disabled through configuration)") % (
- entry_dn
- ),
- level=1
- )
+ _(
+ "Not applying recipient policy for %s " + \
+ "(disabled through configuration)"
+ ) % (entry_dn),
+ level=1
+ )
 
 return entry_modifications
 
 want_attrs = 
 
- log.debug(_l("Applying recipient policy to %r") % (entry_dn), level=8)
+ log.debug(_("Applying recipient policy to %r") % (entry_dn), level=8)
 
 # See which mail attributes we would want to control.
 #
@@ -866,81 +884,79 @@
 # 'alias' and 'mailalternateaddress' are considered for secondary mail.
 #
 primary_mail = self.config_get_raw('%s_primary_mail' % (entry_type))
- if primary_mail is None and entry_type == 'user':
+ if primary_mail == None and entry_type == 'user':
 primary_mail = self.config_get_raw('primary_mail')
 
- if secondary_mail_attribute is not None:
+ if not secondary_mail_attribute == None:
 secondary_mail = self.config_get_raw('%s_secondary_mail' % (entry_type))
- if secondary_mail is None and entry_type == 'user':
+ if secondary_mail == None and entry_type == 'user':
 secondary_mail = self.config_get_raw('secondary_mail')
 
 log.debug(
- _l("Using mail attributes: %r, with primary %r and secondary %r") % (
- mail_attributes,
- primary_mail_attribute,
- secondary_mail_attribute
- ),
- level=8
- )
+ _("Using mail attributes: %r, with primary %r and " + \
+ "secondary %r") % (
+ mail_attributes,
+ primary_mail_attribute,
+ secondary_mail_attribute
+ ),
+ level=8
+ )
 
 for _mail_attr in mail_attributes:
- if _mail_attr not in entry:
- log.debug(_l("key %r not in entry") % (_mail_attr), level=8)
+ if not entry.has_key(_mail_attr):
+ log.debug(_("key %r not in entry") % (_mail_attr), level=8)
 if _mail_attr == primary_mail_attribute:
- log.debug(_l("key %r is the prim. mail attr.") % (_mail_attr), level=8)
- if primary_mail is not None:
- log.debug(_l("prim. mail pol. is not empty"), level=8)
+ log.debug(_("key %r is the prim. mail attr.") % (_mail_attr), level=8)
+ if not primary_mail == None:
+ log.debug(_("prim. mail pol. is not empty"), level=8)
 want_attrs.append(_mail_attr)
 elif _mail_attr == secondary_mail_attribute:
- log.debug(_l("key %r is the sec. mail attr.") % (_mail_attr), level=8)
- if secondary_mail is not None:
- log.debug(_l("sec. mail pol. is not empty"), level=8)
+ log.debug(_("key %r is the sec. mail attr.") % (_mail_attr), level=8)
+ if not secondary_mail == None:
+ log.debug(_("sec. mail pol. is not empty"), level=8)
 want_attrs.append(_mail_attr)
 
- if want_attrs:
- log.debug(
- _l("Attributes %r are not yet available for entry %r") % (
- want_attrs,
- entry_dn
- ),
- level=8
- )
+ if len(want_attrs) > 0:
+ log.debug(_("Attributes %r are not yet available for entry %r") % (
+ want_attrs,
+ entry_dn
+ ),
+ level=8
+ )
 
 # Also append the preferredlanguage or 'native tongue' configured
 # for the entry.
- if 'preferredlanguage' not in entry:
+ if not entry.has_key('preferredlanguage'):
 want_attrs.append('preferredlanguage')
 
 # If we wanted anything, now is the time to get it.
- if want_attrs:
- log.debug(
- _l("Attributes %r are not yet available for entry %r") % (
- want_attrs,
- entry_dn
- ),
- level=8
- )
-
+ if len(want_attrs) > 0:
+ log.debug(_("Attributes %r are not yet available for entry %r") % (
+ want_attrs,
+ entry_dn
+ ),
+ level=8
+ )
 attributes = self.get_entry_attributes(entry_dn, want_attrs)
 
- for attribute in attributes:
+ for attribute in attributes.keys():
 entryattribute = attributesattribute
 
- if 'preferredlanguage' not in entry:
+ if not entry.has_key('preferredlanguage'):
 entry'preferredlanguage' = conf.get('kolab', 'default_locale')
 
 # Primary mail address
- if primary_mail is not None:
+ if not primary_mail == None:
 primary_mail_address = conf.plugins.exec_hook(
- "set_primary_mail",
- kw={
- 'primary_mail': primary_mail,
- 'entry': entry,
- 'primary_domain': self.domain
- }
- )
+ "set_primary_mail",
+ kw={
+ 'primary_mail': primary_mail,
+ 'entry': entry,
+ 'primary_domain': self.domain
+ }
+ )
 
- if primary_mail_address is None:
+ if primary_mail_address == None:
 return entry_modifications
 
 i = 1
@@ -952,43 +968,41 @@
 
 # Length of results should be 0 (no entry found)
 # or 1 (which should be the entry we're looking at here)
- if not results:
+ if len(results) == 0:
 log.debug(
- _l("No results for mail address %s found") % (
- _primary_mail
- ),
- level=8
- )
+ _("No results for mail address %s found") % (
+ _primary_mail
+ ),
+ level=8
+ )
 
 done = True
 continue
 
 if len(results) == 1:
 log.debug(
- _l("1 result for address %s found, verifying") % (
- _primary_mail
- ),
- level=8
- )
+ _("1 result for address %s found, verifying") % (
+ _primary_mail
+ ),
+ level=8
+ )
 
 almost_done = True
 for result in results:
 if not result == entry_dn:
 log.debug(
- _l(
- "Too bad, primary email address %s "
- + "already in use for %s (we are %s)"
- ) % (
- _primary_mail,
- result,
- entry_dn
- ),
- level=8
- )
+ _("Too bad, primary email address %s " + \
+ "already in use for %s (we are %s)") % (
+ _primary_mail,
+ result,
+ entry_dn
+ ),
+ level=8
+ )
 
 almost_done = False
 else:
- log.debug(_l("Address assigned to us"), level=8)
+ log.debug(_("Address assigned to us"), level=8)
 
 if almost_done:
 done = True
@@ -996,43 +1010,38 @@
 
 i += 1
 _primary_mail = "%s%d@%s" % (
- primary_mail_address.split('@')0,
- i,
- primary_mail_address.split('@')1
- )
+ primary_mail_address.split('@')0,
+ i,
+ primary_mail_address.split('@')1
+ )
 
 primary_mail_address = _primary_mail
 
 ###
- # FIXME
+ ### FIXME
 ###
- if primary_mail_address is not None:
- if primary_mail_attribute not in entry:
+ if not primary_mail_address == None:
+ if not entry.has_key(primary_mail_attribute):
 self.set_entry_attribute(entry, primary_mail_attribute, primary_mail_address)
 entry_modificationsprimary_mail_attribute = primary_mail_address
 else:
 if not primary_mail_address == entryprimary_mail_attribute:
- self.set_entry_attribute(
- entry,
- primary_mail_attribute,
- primary_mail_address
- )
+ self.set_entry_attribute(entry, primary_mail_attribute, primary_mail_address)
 
 entry_modificationsprimary_mail_attribute = primary_mail_address
 
- # pylint: disable=too-many-nested-blocks
- if secondary_mail is not None:
+ if not secondary_mail == None:
 # Execute the plugin hook
 suggested_secondary_mail = conf.plugins.exec_hook(
- "set_secondary_mail",
- kw={
- 'secondary_mail': secondary_mail,
- 'entry': entry,
- 'domain': self.domain,
- 'primary_domain': self.domain,
- 'secondary_domains': self.list_secondary_domains()
- }
- ) # end of conf.plugins.exec_hook() call
+ "set_secondary_mail",
+ kw={
+ 'secondary_mail': secondary_mail,
+ 'entry': entry,
+ 'domain': self.domain,
+ 'primary_domain': self.domain,
+ 'secondary_domains': self.list_secondary_domains()
+ }
+ ) # end of conf.plugins.exec_hook() call
 
 secondary_mail_addresses = 
 
@@ -1046,44 +1055,43 @@
 
 # Length of results should be 0 (no entry found)
 # or 1 (which should be the entry we're looking at here)
- if not results:
+ if len(results) == 0:
 log.debug(
- _l("No results for address %s found") % (
- __secondary_mail
- ),
- level=8
- )
+ _("No results for address %s found") % (
+ __secondary_mail
+ ),
+ level=8
+ )
 
 done = True
 continue
 
 if len(results) == 1:
 log.debug(
- _l("1 result for address %s found, verifying...") % (
- __secondary_mail
- ),
- level=8
- )
+ _("1 result for address %s found, " + \
+ "verifying...") % (
+ __secondary_mail
+ ),
+ level=8
+ )
 
 almost_done = True
 for result in results:
 if not result == entry_dn:
 log.debug(
- _l(
- "Too bad, secondary email "
- + "address %s already in use for "
- + "%s (we are %s)"
- ) % (
- __secondary_mail,
- result,
- entry_dn
- ),
- level=8
- )
+ _("Too bad, secondary email " + \
+ "address %s already in use for " + \
+ "%s (we are %s)") % (
+ __secondary_mail,
+ result,
+ entry_dn
+ ),
+ level=8
+ )
 
 almost_done = False
 else:
- log.debug(_l("Address assigned to us"), level=8)
+ log.debug(_("Address assigned to us"), level=8)
 
 if almost_done:
 done = True
@@ -1091,120 +1099,90 @@
 
 i += 1
 __secondary_mail = "%s%d@%s" % (
- _secondary_mail.split('@')0,
- i,
- _secondary_mail.split('@')1
- )
+ _secondary_mail.split('@')0,
+ i,
+ _secondary_mail.split('@')1
+ )
 
 secondary_mail_addresses.append(__secondary_mail)
 
- log.debug(
- _l(
- "Recipient policy composed the following set of secondary email addresses: %r"
- ) % (
- secondary_mail_addresses
- ),
- level=8
- )
+ log.debug(_("Recipient policy composed the following set of secondary " + \
+ "email addresses: %r") % (secondary_mail_addresses), level=8)
 
- if secondary_mail_attribute in entry:
+ if entry.has_key(secondary_mail_attribute):
 if isinstance(entrysecondary_mail_attribute, list):
 secondary_mail_addresses.extend(entrysecondary_mail_attribute)
 else:
 secondary_mail_addresses.append(entrysecondary_mail_attribute)
 
- if secondary_mail_addresses is not None:
+ if not secondary_mail_addresses == None:
 log.debug(
- _l("Secondary mail addresses that we want is not None: %r") % (
- secondary_mail_addresses
- ),
- level=8
- )
+ _("Secondary mail addresses that we want is not None: %r") % (
+ secondary_mail_addresses
+ ),
+ level=9
+ )
 
 secondary_mail_addresses = list(set(secondary_mail_addresses))
 
 # Avoid duplicates
 while primary_mail_address in secondary_mail_addresses:
 log.debug(
- _l(
- "Avoiding the duplication of the primary mail "
- + "address %r in the list of secondary mail "
- + "addresses"
- ) % (primary_mail_address),
- level=8
- )
+ _("Avoiding the duplication of the primary mail " + \
+ "address %r in the list of secondary mail " + \
+ "addresses") % (primary_mail_address),
+ level=9
+ )
 
 secondary_mail_addresses.pop(
- secondary_mail_addresses.index(primary_mail_address)
- )
+ secondary_mail_addresses.index(primary_mail_address)
+ )
 
 log.debug(
- _l("Entry is getting secondary mail addresses: %r") % (
- secondary_mail_addresses
- ),
- level=8
- )
+ _("Entry is getting secondary mail addresses: %r") % (
+ secondary_mail_addresses
+ ),
+ level=9
+ )
 
- if secondary_mail_attribute not in entry:
+ if not entry.has_key(secondary_mail_attribute):
 log.debug(
- _l("Entry did not have any secondary mail addresses in %r") % (
- secondary_mail_attribute
- ),
- level=8
- )
+ _("Entry did not have any secondary mail " + \
+ "addresses in %r") % (secondary_mail_attribute),
+ level=9
+ )
 
- if secondary_mail_addresses:
+ if not len(secondary_mail_addresses) == 0:
 self.set_entry_attribute(
- entry,
- secondary_mail_attribute,
- secondary_mail_addresses
- )
+ entry,
+ secondary_mail_attribute,
+ secondary_mail_addresses
+ )
 
 entry_modificationssecondary_mail_attribute = secondary_mail_addresses
 else:
- if isinstance(entrysecondary_mail_attribute, string_types):
+ if isinstance(entrysecondary_mail_attribute, basestring):
 entrysecondary_mail_attribute = entrysecondary_mail_attribute
 
- log.debug(
- _l("secondary_mail_addresses: %r") % (secondary_mail_addresses),
- level=8
- )
-
- log.debug(
- _l("entry%s: %r") % (
- secondary_mail_attribute,
- entrysecondary_mail_attribute
- ),
- level=8
- )
+ log.debug(_("secondary_mail_addresses: %r") % (secondary_mail_addresses), level=8)
+ log.debug(_("entry%s: %r") % (secondary_mail_attribute,entrysecondary_mail_attribute), level=8)
 
 secondary_mail_addresses.sort()
 entrysecondary_mail_attribute.sort()
 
- log.debug(
- _l("secondary_mail_addresses: %r") % (secondary_mail_addresses),
- level=8
- )
-
- log.debug(
- _l("entry%s: %r") % (
- secondary_mail_attribute,
- entrysecondary_mail_attribute
- ),
- level=8
- )
+ log.debug(_("secondary_mail_addresses: %r") % (secondary_mail_addresses), level=8)
+ log.debug(_("entry%s: %r") % (secondary_mail_attribute,entrysecondary_mail_attribute), level=8)
 
- smas = list(set(secondary_mail_addresses))
- if smas != list(set(entrysecondary_mail_attribute)):
+ if not list(set(secondary_mail_addresses)) == list(set(entrysecondary_mail_attribute)):
 self.set_entry_attribute(
- entry,
- secondary_mail_attribute,
- smas
- )
+ entry,
+ secondary_mail_attribute,
+ list(set(secondary_mail_addresses))
+ )
 
- entry_modificationssecondary_mail_attribute = smas
+ entry_modificationssecondary_mail_attribute = list(set(secondary_mail_addresses))
 
- log.debug(_l("Entry modifications list: %r") % (entry_modifications), level=8)
+ log.debug(_("Entry modifications list: %r") % (entry_modifications), level=8)
 
 return entry_modifications
 
@@ -1223,32 +1201,23 @@
 config_base_dn = self.config_get('base_dn')
 ldap_base_dn = self._kolab_domain_root_dn(self.domain)
 
- if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ if not ldap_base_dn == None and not ldap_base_dn == config_base_dn:
 base_dn = ldap_base_dn
 else:
 base_dn = config_base_dn
 
- _results = self._search(
- base_dn,
- filterstr=_filter,
- attrlist=
- '*',
- ,
- override_search='_regular_search'
- )
-
- # Remove referrals
- _entry_dns = _e for _e in _results if _e0 is not None
-
- return _entry_dns
+ return self._search(
+ base_dn,
+ filterstr=_filter,
+ attrlist=
+ '*',
+ ,
+ override_search='_regular_search'
+ )
 
 def set_entry_attribute(self, entry_id, attribute, value):
- log.debug(
- _l("Setting entry attribute %r to %r for %r") % (attribute, value, entry_id),
- level=8
- )
-
- self.set_entry_attributes(entry_id, {attribute: value})
+ log.debug(_("Setting entry attribute %r to %r for %r") % (attribute, value, entry_id), level=9)
+ self.set_entry_attributes(entry_id, { attribute: value })
 
 def set_entry_attributes(self, entry_id, attributes):
 self._bind()
@@ -1259,38 +1228,31 @@
 
 attrs = {}
 
- for attribute in attributes:
+ for attribute in attributes.keys():
 attrsattribute.lower() = attributesattribute
 
 modlist = 
 
- for attribute, value in attrs.items():
- if attribute not in entry:
+ for attribute in attrs.keys():
+ if not entry.has_key(attribute):
 entryattribute = self.get_entry_attribute(entry_id, attribute)
 
- if attribute in entry and entryattribute is None:
- modlist.append((ldap.MOD_ADD, attribute, value))
- elif attribute in entry and entryattribute is not None:
- if value is None:
+ for attribute in attrs.keys():
+ if entry.has_key(attribute) and entryattribute == None:
+ modlist.append((ldap.MOD_ADD, attribute, attrsattribute))
+ elif entry.has_key(attribute) and not entryattribute == None:
+ if attrsattribute == None:
 modlist.append((ldap.MOD_DELETE, attribute, entryattribute))
 else:
- modlist.append((ldap.MOD_REPLACE, attribute, value))
+ modlist.append((ldap.MOD_REPLACE, attribute, attrsattribute))
 
 dn = entry_dn
 
- if modlist and self._bind_priv() is True:
+ if len(modlist) > 0 and self._bind_priv() is True:
 try:
 self.ldap_priv.modify_s(dn, modlist)
- except Exception as errmsg:
- log.error(
- _l("Could not update dn:\nDN: %r\nModlist: %r\nError Message: %r") % (
- dn,
- modlist,
- errmsg
- )
- )
-
- log.error(traceback.format_exc())
+ except:
+ log.error(_("Could not update dn %r:\n%r") % (dn, modlist))
 
 def synchronize(self, mode=0, callback=None):
 """
@@ -1306,24 +1268,19 @@
 if not conf.resync:
 modified_after = self.get_latest_sync_timestamp()
 else:
- modifytimestamp_format = conf.get_raw(
- 'ldap',
- 'modifytimestamp_format',
- default="%Y%m%d%H%M%SZ"
- ).replace('%%', '%')
-
- modified_after = datetime.datetime(1900, 1, 1, 00, 00, 00).strftime(
- modifytimestamp_format
- )
+ modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
+ if modifytimestamp_format == None:
+ modifytimestamp_format = "%Y%m%d%H%M%SZ"
 
+ modified_after = datetime.datetime(1900, 01, 01, 00, 00, 00).strftime(modifytimestamp_format)
 else:
 modified_after = self.get_latest_sync_timestamp()
 
- _filter = "(&%s(modifytimestamp>=%s))" % (_filter, modified_after)
+ _filter = "(&%s(modifytimestamp>=%s))" % (_filter,modified_after)
 
- log.debug(_l("Synchronization is using filter %r") % (_filter), level=8)
+ log.debug(_("Using filter %r") % (_filter), level=8)
 
- if mode != 0:
+ if not mode == 0:
 override_search = mode
 else:
 override_search = False
@@ -1331,42 +1288,42 @@
 config_base_dn = self.config_get('base_dn')
 ldap_base_dn = self._kolab_domain_root_dn(self.domain)
 
- if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ if not ldap_base_dn == None and not ldap_base_dn == config_base_dn:
 base_dn = ldap_base_dn
 else:
 base_dn = config_base_dn
 
- log.debug(_l("Synchronization is searching against base DN: %s") % (base_dn), level=8)
+ log.debug(_("Synchronization is searching against base DN: %s") % (base_dn), level=8)
 
- if callback is None:
+ if callback == None:
 callback = self._synchronize_callback
 
 try:
 self._search(
- base_dn,
- filterstr=_filter,
- attrlist=
- '*',
- self.config_get('unique_attribute'),
- conf.get('cyrus-sasl', 'result_attribute'),
- 'modifytimestamp'
- ,
- override_search=override_search,
- callback=callback,
- )
- except Exception as errmsg:
+ base_dn,
+ filterstr=_filter,
+ attrlist=
+ '*',
+ self.config_get('unique_attribute'),
+ conf.get('cyrus-sasl', 'result_attribute'),
+ 'modifytimestamp'
+ ,
+ override_search=override_search,
+ callback=callback,
+ )
+ except Exception, errmsg:
 log.error("An error occurred: %r" % (errmsg))
- log.error(_l("%s") % (traceback.format_exc()))
+ log.error(_("%s") % (traceback.format_exc()))
 
 def user_quota(self, entry_id, folder):
 default_quota = self.config_get('default_quota')
 quota_attribute = self.config_get('quota_attribute')
 
- if quota_attribute is None:
+ if quota_attribute == None:
 return
 
 # The default quota may be None, but LDAP quota could still be set
- if default_quota is None:
+ if default_quota == None:
 default_quota = 0
 
 self._bind()
@@ -1376,70 +1333,66 @@
 current_ldap_quota = self.get_entry_attribute(entry_dn, quota_attribute)
 _imap_quota = self.imap.get_quota(folder)
 
- if _imap_quota is None:
+ if _imap_quota == None:
 used = None
 current_imap_quota = None
 else:
 (used, current_imap_quota) = _imap_quota
 
 log.debug(
- _l(
- "About to consider the user quota for %r (used: %r, "
- + "imap: %r, ldap: %r, default: %r)"
- ) % (
- entry_dn,
- used,
- current_imap_quota,
- current_ldap_quota,
- default_quota
- ),
- level=8
- )
+ _("About to consider the user quota for %r (used: %r, " + \
+ "imap: %r, ldap: %r, default: %r") % (
+ entry_dn,
+ used,
+ current_imap_quota,
+ current_ldap_quota,
+ default_quota
+ ),
+ level=9
+ )
 
- new_quota = conf.plugins.exec_hook(
- "set_user_folder_quota",
- kw={
- 'used': used,
- 'imap_quota': current_imap_quota,
- 'ldap_quota': current_ldap_quota,
- 'default_quota': default_quota
- }
- )
+ new_quota = conf.plugins.exec_hook("set_user_folder_quota", kw={
+ 'used': used,
+ 'imap_quota': current_imap_quota,
+ 'ldap_quota': current_ldap_quota,
+ 'default_quota': default_quota
+ }
+ )
 
 try:
 current_ldap_quota = (int)(current_ldap_quota)
- except Exception:
+ except:
 current_ldap_quota = None
 
 # If the new quota is zero, get out
 if new_quota == 0:
 return
 
- if current_ldap_quota is not None:
+ if not current_ldap_quota == None:
 if not new_quota == (int)(current_ldap_quota):
 self.set_entry_attribute(
- entry_dn,
- quota_attribute,
- "%s" % (new_quota)
- )
+ entry_dn,
+ quota_attribute,
+ "%s" % (new_quota)
+ )
 else:
- if new_quota is not None:
+ if not new_quota == None:
 self.set_entry_attribute(
- entry_dn,
- quota_attribute,
- "%s" % (new_quota)
- )
+ entry_dn,
+ quota_attribute,
+ "%s" % (new_quota)
+ )
 
- if current_imap_quota is not None:
+ if not current_imap_quota == None:
 if not new_quota == current_imap_quota:
 self.imap.set_quota(folder, new_quota)
 
 else:
- if new_quota is not None:
+ if not new_quota == None:
 self.imap.set_quota(folder, new_quota)
 
 ###
- # API depth level increasing!
+ ### API depth level increasing!
 ###
 
 def _bind(self, bind_dn=None, bind_pw=None):
@@ -1450,12 +1403,12 @@
 
 # If the bind_dn is None and the bind_pw is not... fail
 if bind_dn is None and bind_pw is not None:
- log.error(_l("Attempting to bind without a DN but with a password"))
+ log.error(_("Attempting to bind without a DN but with a password"))
 return False
 
 # and the same vice-versa
- if bind_dn is None and bind_pw is not None:
- log.error(_l("Attempting to bind with a DN but without a password"))
+ if bind_dn is not None and bind_pw is None:
+ log.error(_("Attempting to bind with a DN but without a password"))
 return False
 
 # If we are to bind as foo, we have no state.
@@ -1473,13 +1426,8 @@
 bind_pw = self.config_get('service_bind_pw')
 
 if bind_dn is not None:
- log.debug(
- _l("Binding with bind_dn: %s and password: %s") % (
- bind_dn,
- '*' * len(bind_pw)
- ),
- level=8
- )
+ log.debug(_("Binding with bind_dn: %s and password: %s")
+ % (bind_dn, '*' * len(bind_pw)))
 
 # TODO: Binding errors control
 try:
@@ -1489,32 +1437,19 @@
 
 return True
 
- except ldap.SERVER_DOWN as errmsg:
- log.error(_l("LDAP server unavailable: %r") % (errmsg))
- log.error(_l("%s") % (traceback.format_exc()))
-
- return False
-
- except ldap.NO_SUCH_OBJECT:
- log.error(
- _l("Invalid DN, username and/or password for '%s'.") % (
- bind_dn
- )
- )
+ except ldap.SERVER_DOWN, errmsg:
+ log.error(_("LDAP server unavailable: %r") % (errmsg))
+ log.error(_("%s") % (traceback.format_exc()))
 
 return False
 
 except ldap.INVALID_CREDENTIALS:
- log.error(
- _l("Invalid DN, username and/or password for '%s'.") % (
- bind_dn
- )
- )
+ log.error(_("Invalid DN, username and/or password."))
 
 return False
 
 else:
- log.debug(_l("bind() called but already bound"), level=8)
+ log.debug(_("bind() called but already bound"), level=8)
 
 return True
 
@@ -1528,20 +1463,15 @@
 try:
 self.ldap_priv.simple_bind_s(bind_dn, bind_pw)
 return True
- except ldap.SERVER_DOWN as errmsg:
- log.error(_l("LDAP server unavailable: %r") % (errmsg))
- log.error(_l("%s") % (traceback.format_exc()))
+ except ldap.SERVER_DOWN, errmsg:
+ log.error(_("LDAP server unavailable: %r") % (errmsg))
+ log.error(_("%s") % (traceback.format_exc()))
 return False
 except ldap.INVALID_CREDENTIALS:
- log.error(
- _l("Invalid DN, username and/or password for '%s'.") % (
- bind_dn
- )
- )
-
+ log.error(_("Invalid DN, username and/or password."))
 return False
 else:
- log.debug(_l("bind_priv() called but already bound"), level=8)
+ log.debug(_("bind_priv() called but already bound"), level=8)
 return True
 
 def _change_add_group(self, entry, change):
@@ -1587,48 +1517,50 @@
 
 # Get some configuration values
 mailserver_attribute = self.config_get('mailserver_attribute')
- if mailserver_attribute in entry:
+ if entry.has_key(mailserver_attribute):
 server = entrymailserver_attribute
 
 foldertype_attribute = self.config_get('sharedfolder_type_attribute')
- if foldertype_attribute is not None:
- if foldertype_attribute not in entry:
+ if not foldertype_attribute == None:
+ if not entry.has_key(foldertype_attribute):
 entryfoldertype_attribute = self.get_entry_attribute(
- entry'id',
- foldertype_attribute
- )
+ entry'id',
+ foldertype_attribute
+ )
 
- if entryfoldertype_attribute is not None:
+ if not entryfoldertype_attribute == None:
 entry'kolabfoldertype' = entryfoldertype_attribute
 
- if 'kolabfoldertype' not in entry:
+ if not entry.has_key('kolabfoldertype'):
 entry'kolabfoldertype' = self.get_entry_attribute(
- entry'id',
- 'kolabfoldertype'
- )
+ entry'id',
+ 'kolabfoldertype'
+ )
 
 # A delivery address is postuser+targetfolder
 delivery_address_attribute = self.config_get('sharedfolder_delivery_address_attribute')
- if delivery_address_attribute is None:
+ if delivery_address_attribute == None:
 delivery_address_attribute = 'mail'
 
- if delivery_address_attribute not in entry:
+ if not entry.has_key(delivery_address_attribute):
 entrydelivery_address_attribute = self.get_entry_attribute(
- entry'id',
- delivery_address_attribute
- )
+ entry'id',
+ delivery_address_attribute
+ )
 
- if entrydelivery_address_attribute is not None:
+ if not entrydelivery_address_attribute == None:
 if len(entrydelivery_address_attribute.split('+')) > 1:
 entry'kolabtargetfolder' = entrydelivery_address_attribute.split('+')1
 
- if 'kolabtargetfolder' not in entry:
+ if not entry.has_key('kolabtargetfolder'):
 entry'kolabtargetfolder' = self.get_entry_attribute(
- entry'id',
- 'kolabtargetfolder'
- )
+ entry'id',
+ 'kolabtargetfolder'
+ )
+
+ if entry.has_key('kolabtargetfolder') and \
+ not entry'kolabtargetfolder' == None:
 
- if 'kolabtargetfolder' in entry and entry'kolabtargetfolder' is not None:
 folder_path = entry'kolabtargetfolder'
 else:
 # TODO: What is *the* way to see if we need to create an @domain
@@ -1646,95 +1578,90 @@
 folder_path = "shared/%s" % folder_path
 
 folderacl_entry_attribute = self.config_get('sharedfolder_acl_entry_attribute')
- if folderacl_entry_attribute is None:
+ if folderacl_entry_attribute == None:
 folderacl_entry_attribute = 'acl'
 
- if folderacl_entry_attribute not in entry:
+ if not entry.has_key(folderacl_entry_attribute):
 entryfolderacl_entry_attribute = self.get_entry_attribute(
- entry'id',
- folderacl_entry_attribute
- )
+ entry'id',
+ folderacl_entry_attribute
+ )
 
 if not self.imap.shared_folder_exists(folder_path):
 self.imap.shared_folder_create(folder_path, server)
 
- if 'kolabfoldertype' in entry and entry'kolabfoldertype' is not None:
+ if entry.has_key('kolabfoldertype') and \
+ not entry'kolabfoldertype' == None:
 
- self.imap.shared_folder_set_type(folder_path, entry'kolabfoldertype')
+ self.imap.shared_folder_set_type(
+ folder_path,
+ entry'kolabfoldertype'
+ )
 
 entry'kolabfolderaclentry' = self._parse_acl(entryfolderacl_entry_attribute)
 
- # pylint: disable=protected-access
- self.imap._set_kolab_mailfolder_acls(entry'kolabfolderaclentry', folder_path)
+ self.imap._set_kolab_mailfolder_acls(
+ entry'kolabfolderaclentry', folder_path
+ )
 
- if delivery_address_attribute in entry:
- if entrydelivery_address_attribute is not None:
- self.imap.set_acl(folder_path, 'anyone', '+p')
+ if entry.has_key(delivery_address_attribute) and \
+ not entrydelivery_address_attribute == None:
+ self.imap.set_acl(folder_path, 'anyone', '+p')
 
- # if server is None:
- # self.entry_set_attribute(mailserver_attribute, server)
+ #if server == None:
+ #self.entry_set_attribute(mailserver_attribute, server)
 
 def _change_add_unknown(self, entry, change):
 """
 An entry has been add, and we do not know of what object type
 the entry was - user, group, role or sharedfolder.
 """
- success = None
-
 result_attribute = conf.get('cyrus-sasl', 'result_attribute')
 
- if result_attribute not in entry:
+ if not entry.has_key(result_attribute):
 return None
 
- if entryresult_attribute is None:
+ if entryresult_attribute == None:
 return None
 
- for _type in 'user', 'group', 'role', 'sharedfolder':
+ for _type in 'user','group','role','sharedfolder':
 try:
- func = getattr(self, '_change_add_%s' % (_type))
- func(entry, change)
+ eval("self._change_add_%s(entry, change)" % (_type))
 success = True
- except Exception:
+ except:
 success = False
 
 if success:
 break
 
- return success
-
 def _change_add_user(self, entry, change):
 """
 An entry of type user was added.
 """
 mailserver_attribute = self.config_get('mailserver_attribute')
- if mailserver_attribute is None:
+ if mailserver_attribute == None:
 mailserver_attribute = 'mailhost'
 
 mailserver_attribute = mailserver_attribute.lower()
 
 result_attribute = conf.get('cyrus-sasl', 'result_attribute')
- if result_attribute is None:
+ if result_attribute == None:
 result_attribute = 'mail'
 
 result_attribute = result_attribute.lower()
 
- if mailserver_attribute not in entry:
+ if not entry.has_key(mailserver_attribute):
 entrymailserver_attribute = \
 self.get_entry_attribute(entry, mailserver_attribute)
 
 rcpt_addrs = self.recipient_policy(entry)
-
 for key in rcpt_addrs:
 entrykey = rcpt_addrskey
 
- if result_attribute not in entry:
- entryresult_attribute = self.get_entry_attribute(entry, result_attribute)
+ if not entry.has_key(result_attribute):
 return
 
- if result_attribute not in entry:
- return
-
- if not entryresult_attribute:
+ if entryresult_attribute == None:
 return
 
 if entryresult_attribute == '':
@@ -1746,30 +1673,30 @@
 
 if not self.imap.user_mailbox_exists(entryresult_attribute.lower()):
 folder = self.imap.user_mailbox_create(
- entryresult_attribute,
- entrymailserver_attribute
- )
+ entryresult_attribute,
+ entrymailserver_attribute
+ )
 
 else:
- folder = "user%s%s" % (self.imap.get_separator(), entryresult_attribute.lower())
+ folder = "user%s%s" % (self.imap.get_separator(),entryresult_attribute.lower())
 
 server = self.imap.user_mailbox_server(folder)
 
 log.debug(
- _l("Entry %s attribute value: %r") % (
- mailserver_attribute,
- entrymailserver_attribute
- ),
- level=8
- )
+ _("Entry %s attribute value: %r") % (
+ mailserver_attribute,
+ entrymailserver_attribute
+ ),
+ level=8
+ )
 
 log.debug(
- _l("imap.user_mailbox_server(%r) result: %r") % (
- folder,
- server
- ),
- level=8
- )
+ _("imap.user_mailbox_server(%r) result: %r") % (
+ folder,
+ server
+ ),
+ level=8
+ )
 
 if not entrymailserver_attribute == server:
 self.set_entry_attribute(entry, mailserver_attribute, server)
@@ -1783,13 +1710,14 @@
 
 result_attribute = conf.get('cyrus-sasl', 'result_attribute')
 
- if result_attribute not in entry:
+ if not entry.has_key(result_attribute):
 return None
 
- if entryresult_attribute is None:
+ if entryresult_attribute == None:
 return None
 
- return self.imap.cleanup_acls(entryresult_attribute)
+ self.imap.cleanup_acls(entryresult_attribute)
+
 
 def _change_delete_None(self, entry, change):
 """
@@ -1813,38 +1741,35 @@
 """
 result_attribute = conf.get('cyrus-sasl', 'result_attribute')
 
- if result_attribute not in entry:
+ if not entry.has_key(result_attribute):
 return None
 
- if entryresult_attribute is None:
+ if entryresult_attribute == None:
 return None
 
 success = True
- for _type in 'user', 'group', 'resource', 'role', 'sharedfolder':
+ for _type in 'user','group','resource','role','sharedfolder':
 try:
- func = getattr(self, '_change_delete_%s' % (_type))
- success = func(entry, change)
- except Exception as errmsg:
- log.error(_l("An error occured: %r") % (errmsg))
- log.error(_l("%s") % (traceback.format_exc()))
+ success = eval("self._change_delete_%s(entry, change)" % (_type))
+ except Exception, errmsg:
+ log.error(_("An error occured: %r") % (errmsg))
+ log.error(_("%s") % (traceback.format_exc()))
 
 success = False
 
 if success:
 break
 
- return success
-
 def _change_delete_user(self, entry, change):
 """
 An entry of type user was deleted.
 """
 result_attribute = conf.get('cyrus-sasl', 'result_attribute')
 
- if result_attribute not in entry:
+ if not entry.has_key(result_attribute):
 return None
 
- if entryresult_attribute is None:
+ if entryresult_attribute == None:
 return None
 
 cache.delete_entry(self.domain, entry)
@@ -1855,14 +1780,12 @@
 # let plugins act upon this deletion
 conf.plugins.exec_hook(
 'user_delete',
- kw={
+ kw = {
 'user': entry,
 'domain': self.domain
 }
 )
 
- return True
-
 def _change_moddn_group(self, entry, change):
 # TODO: If the rdn attribute is the same as the result attribute...
 pass
@@ -1874,15 +1797,16 @@
 old_dn = change'previous_dn'
 new_dn = change'dn'
 
- old_rdn = explode_dn(old_dn)0.split('=')0
- new_rdn = explode_dn(new_dn)0.split('=')0
+ import ldap.dn
+ old_rdn = ldap.dn.explode_dn(old_dn)0.split('=')0
+ new_rdn = ldap.dn.explode_dn(new_dn)0.split('=')0
 
 result_attribute = conf.get('cyrus-sasl', 'result_attribute')
 
 old_canon_attr = None
 
 cache_entry = cache.get_entry(self.domain, entry)
- if cache_entry is not None:
+ if not cache_entry == None:
 old_canon_attr = cache_entry.result_attribute
 
 # See if we have to trigger the recipient policy. Only really applies to
@@ -1905,13 +1829,13 @@
 if trigger_recipient_policy:
 entry_changes = self.recipient_policy(entry)
 
- for key, value in entry_changes.items():
- entrykey = value
+ for key in entry_changes.keys():
+ entrykey = entry_changeskey
 
- if result_attribute not in entry:
+ if not entry.has_key(result_attribute):
 return
 
- if entryresult_attribute is None:
+ if entryresult_attribute == None:
 return
 
 if entryresult_attribute == '':
@@ -1919,49 +1843,22 @@
 
 # Now look at entry_changes and old_canon_attr, and see if they're
 # the same value.
- if result_attribute in entry_changes:
- if old_canon_attr is not None:
- self.imap.user_mailbox_create(entry_changesresult_attribute)
+ if entry_changes.has_key(result_attribute):
+ if not old_canon_attr == None:
+ self.imap.user_mailbox_create(
+ entry_changesresult_attribute
+ )
 
 elif not entry_changesresult_attribute == old_canon_attr:
- self.imap.user_mailbox_rename(old_canon_attr, entry_changesresult_attribute)
+ self.imap.user_mailbox_rename(
+ old_canon_attr,
+ entry_changesresult_attribute
+ )
 
 cache.get_entry(self.domain, entry)
 
 def _change_moddn_sharedfolder(self, entry, change):
- result_attribute = 'cn'
-
- old_cn = explode_dn(change'previous_dn', True)0
-
- if 'kolabtargetfolder' in entry and entry'kolabtargetfolder' is not None:
- new_folder_path = entry'kolabtargetfolder'
- old_folder_path = old_cn
-
- if '@' in entry'kolabtargetfolder':
- old_folder_path = "%s@%s" % (
- old_folder_path,
- entry'kolabtargetfolder'.split('@')1
- )
-
- else:
- result_attribute = conf.get('cyrus-sasl', 'result_attribute')
- if result_attribute in 'mail':
- new_folder_path = "%s@%s" % (entry'cn', self.domain)
- old_folder_path = "%s@%s" % (old_cn, self.domain)
- else:
- new_folder_path = "%s" % (entry'cn')
- old_folder_path = old_cn
-
- if not new_folder_path.startswith('shared/'):
- new_folder_path = "shared/%s" % (new_folder_path)
-
- if not old_folder_path.startswith('shared/'):
- old_folder_path = "shared/%s" % (old_folder_path)
-
- log.debug("old folder path: %r" % (old_folder_path))
- log.debug("new folder path: %r" % (new_folder_path))
-
- self.imap.shared_folder_rename(old_folder_path, new_folder_path)
+ pass
 
 def _change_modify_None(self, entry, change):
 pass
@@ -1982,46 +1879,48 @@
 
 # Get some configuration values
 mailserver_attribute = self.config_get('mailserver_attribute')
- if mailserver_attribute in entry:
+ if entry.has_key(mailserver_attribute):
 server = entrymailserver_attribute
 
 foldertype_attribute = self.config_get('sharedfolder_type_attribute')
- if foldertype_attribute is not None:
- if foldertype_attribute not in entry:
+ if not foldertype_attribute == None:
+ if not entry.has_key(foldertype_attribute):
 entryfoldertype_attribute = self.get_entry_attribute(
- entry'id',
- foldertype_attribute
- )
+ entry'id',
+ foldertype_attribute
+ )
 
- if entryfoldertype_attribute is not None:
+ if not entryfoldertype_attribute == None:
 entry'kolabfoldertype' = entryfoldertype_attribute
 
- if 'kolabfoldertype' not in entry:
+ if not entry.has_key('kolabfoldertype'):
 entry'kolabfoldertype' = self.get_entry_attribute(
- entry'id',
- 'kolabfoldertype'
- )
+ entry'id',
+ 'kolabfoldertype'
+ )
 
 # A delivery address is postuser+targetfolder
 delivery_address_attribute = self.config_get('sharedfolder_delivery_address_attribute')
- if delivery_address_attribute is not None:
- if delivery_address_attribute not in entry:
+ if not delivery_address_attribute == None:
+ if not entry.has_key(delivery_address_attribute):
 entrydelivery_address_attribute = self.get_entry_attribute(
- entry'id',
- delivery_address_attribute
- )
+ entry'id',
+ delivery_address_attribute
+ )
 
- if entrydelivery_address_attribute is not None:
+ if not entrydelivery_address_attribute == None:
 if len(entrydelivery_address_attribute.split('+')) > 1:
 entry'kolabtargetfolder' = entrydelivery_address_attribute.split('+')1
 
- if 'kolabtargetfolder' not in entry:
+ if not entry.has_key('kolabtargetfolder'):
 entry'kolabtargetfolder' = self.get_entry_attribute(
- entry'id',
- 'kolabtargetfolder'
- )
+ entry'id',
+ 'kolabtargetfolder'
+ )
+
+ if entry.has_key('kolabtargetfolder') and \
+ not entry'kolabtargetfolder' == None:
 
- if 'kolabtargetfolder' in entry and entry'kolabtargetfolder' is not None:
 folder_path = entry'kolabtargetfolder'
 else:
 # TODO: What is *the* way to see if we need to create an @domain
@@ -2039,30 +1938,34 @@
 folder_path = "shared/%s" % folder_path
 
 folderacl_entry_attribute = self.config_get('sharedfolder_acl_entry_attribute')
- if folderacl_entry_attribute is None:
+ if folderacl_entry_attribute == None:
 folderacl_entry_attribute = 'acl'
 
- if folderacl_entry_attribute not in entry:
+ if not entry.has_key(folderacl_entry_attribute):
 entryfolderacl_entry_attribute = self.get_entry_attribute(
- entry'id',
- folderacl_entry_attribute
- )
+ entry'id',
+ folderacl_entry_attribute
+ )
 
 if not self.imap.shared_folder_exists(folder_path):
 self.imap.shared_folder_create(folder_path, server)
 
- if 'kolabfoldertype' in entry and entry'kolabfoldertype' is not None:
+ if entry.has_key('kolabfoldertype') and \
+ not entry'kolabfoldertype' == None:
+
 self.imap.shared_folder_set_type(
- folder_path,
- entry'kolabfoldertype'
- )
+ folder_path,
+ entry'kolabfoldertype'
+ )
 
 entry'kolabfolderaclentry' = self._parse_acl(entryfolderacl_entry_attribute)
 
- # pylint: disable=protected-access
- self.imap._set_kolab_mailfolder_acls(entry'kolabfolderaclentry', folder_path, True)
+ self.imap._set_kolab_mailfolder_acls(
+ entry'kolabfolderaclentry', folder_path, True
+ )
 
- if delivery_address_attribute in entry and entrydelivery_address_attribute is not None:
+ if entry.has_key(delivery_address_attribute) and \
+ not entrydelivery_address_attribute == None:
 self.imap.set_acl(folder_path, 'anyone', '+p')
 
 def _change_modify_user(self, entry, change):
@@ -2075,74 +1978,79 @@
 # Initialize old_canon_attr (#1701)
 old_canon_attr = None
 
- result_attribute = conf.get('cyrus-sasl', 'result_attribute')
+ result_attribute = conf.get('cyrus-sasl','result_attribute')
 
 _entry = cache.get_entry(self.domain, entry, update=False)
 
 # We do not necessarily have a synchronisation cache entry (#1701)
- if _entry is not None:
- if 'result_attribute' in _entry.__dict__ and not _entry.result_attribute == '':
+ if not _entry == None:
+ if _entry.__dict__.has_key('result_attribute') and not _entry.result_attribute == '':
 old_canon_attr = _entry.result_attribute
 
 entry_changes = self.recipient_policy(entry)
 
 log.debug(
- _l("Result from recipient policy: %r") % (entry_changes),
- level=8
- )
+ _("Result from recipient policy: %r") % (entry_changes),
+ level=8
+ )
 
- if result_attribute in entry_changes:
+ if entry_changes.has_key(result_attribute):
 if not entry_changesresult_attribute == old_canon_attr:
- if old_canon_attr is None:
+ if old_canon_attr == None:
 self.imap.user_mailbox_create(
- entry_changesresult_attribute
- )
+ entry_changesresult_attribute
+ )
 
 else:
 self.imap.user_mailbox_rename(
- old_canon_attr,
- entry_changesresult_attribute
- )
+ old_canon_attr,
+ entry_changesresult_attribute
+ )
 
 entryresult_attribute = entry_changesresult_attribute
 cache.get_entry(self.domain, entry)
- elif result_attribute in entry:
+ elif entry.has_key(result_attribute):
 if not entryresult_attribute == old_canon_attr:
- if old_canon_attr is None:
+ if old_canon_attr == None:
 self.imap.user_mailbox_create(
- entryresult_attribute
- )
+ entryresult_attribute
+ )
 
 else:
 self.imap.user_mailbox_rename(
- old_canon_attr,
- entryresult_attribute
- )
+ old_canon_attr,
+ entryresult_attribute
+ )
 
 cache.get_entry(self.domain, entry)
 else:
- if not self.imap.user_mailbox_exists(entryresult_attribute):
- self.imap.user_mailbox_create(
+ imap_mailbox = "user%s%s" % (
+ self.imap.get_separator(),
 entryresult_attribute
 )
 
+ if not self.imap.has_folder(imap_mailbox):
+ self.imap_user_mailbox_create(
+ entryresult_attribute
+ )
+
 self.user_quota(
- entry,
- "user%s%s" % (
- self.imap.get_separator(),
- entryresult_attribute
+ entry,
+ "user%s%s" % (
+ self.imap.get_separator(),
+ entryresult_attribute
+ )
 )
- )
 
 if conf.has_option(self.domain, 'sieve_mgmt'):
 sieve_mgmt_enabled = conf.get(self.domain, 'sieve_mgmt')
 if utils.true_or_false(sieve_mgmt_enabled):
 conf.plugins.exec_hook(
- 'sieve_mgmt_refresh',
- kw={
- 'user': entryresult_attribute
- }
- )
+ 'sieve_mgmt_refresh',
+ kw={
+ 'user': entryresult_attribute
+ }
+ )
 
 def _change_none_group(self, entry, change):
 """
@@ -2174,35 +2082,36 @@
 server = None
 mailserver_attribute = self.config_get('mailserver_attribute')
 
- if mailserver_attribute in entry:
+ if entry.has_key(mailserver_attribute):
 server = entrymailserver_attribute
 
- if 'kolabtargetfolder' not in entry:
+ if not entry.has_key('kolabtargetfolder'):
 entry'kolabtargetfolder' = self.get_entry_attribute(
- entry'id',
- 'kolabtargetfolder'
- )
+ entry'id',
+ 'kolabtargetfolder'
+ )
 
- if 'kolabfoldertype' not in entry:
+ if not entry.has_key('kolabfoldertype'):
 entry'kolabfoldertype' = self.get_entry_attribute(
- entry'id',
- 'kolabfoldertype'
- )
+ entry'id',
+ 'kolabfoldertype'
+ )
 
 folderacl_entry_attribute = conf.get('ldap', 'sharedfolder_acl_entry_attribute')
- if folderacl_entry_attribute is None:
+ if folderacl_entry_attribute == None:
 folderacl_entry_attribute = 'acl'
 
- if folderacl_entry_attribute not in entry:
+ if not entry.has_key(folderacl_entry_attribute):
 entry'kolabfolderaclentry' = self.get_entry_attribute(
- entry'id',
- folderacl_entry_attribute
- )
+ entry'id',
+ folderacl_entry_attribute
+ )
 else:
 entry'kolabfolderaclentry' = entryfolderacl_entry_attribute
 del entryfolderacl_entry_attribute
 
- if 'kolabtargetfolder' in entry and entry'kolabtargetfolder' is not None:
+ if entry.has_key('kolabtargetfolder') and \
+ not entry'kolabtargetfolder' == None:
 
 folder_path = entry'kolabtargetfolder'
 else:
@@ -2223,39 +2132,40 @@
 if not self.imap.shared_folder_exists(folder_path):
 self.imap.shared_folder_create(folder_path, server)
 
- if 'kolabfoldertype' in entry and entry'kolabfoldertype' is not None:
+ if entry.has_key('kolabfoldertype') and \
+ not entry'kolabfoldertype' == None:
 
 self.imap.shared_folder_set_type(
- folder_path,
- entry'kolabfoldertype'
- )
+ folder_path,
+ entry'kolabfoldertype'
+ )
 
 entry'kolabfolderaclentry' = self._parse_acl(entry'kolabfolderaclentry')
 
 self.imap._set_kolab_mailfolder_acls(
- entry'kolabfolderaclentry', folder_path, True
- )
+ entry'kolabfolderaclentry', folder_path, True
+ )
 
 delivery_address_attribute = self.config_get('sharedfolder_delivery_address_attribute')
- if delivery_address_attribute in entry and \
- entrydelivery_address_attribute is not None:
+ if entry.has_key(delivery_address_attribute) and \
+ not entrydelivery_address_attribute == None:
 self.imap.set_acl(folder_path, 'anyone', '+p')
 
- # if server is None:
- # self.entry_set_attribute(mailserver_attribute, server)
+ #if server == None:
+ #self.entry_set_attribute(mailserver_attribute, server)
 
 def _change_none_user(self, entry, change):
 """
 A user entry as part of the initial search result set.
 """
 mailserver_attribute = self.config_get('mailserver_attribute')
- if mailserver_attribute is None:
+ if mailserver_attribute == None:
 mailserver_attribute = 'mailhost'
 
 mailserver_attribute = mailserver_attribute.lower()
 
 result_attribute = conf.get('cyrus-sasl', 'result_attribute')
- if result_attribute is None:
+ if result_attribute == None:
 result_attribute = 'mail'
 
 result_attribute = result_attribute.lower()
@@ -2264,31 +2174,28 @@
 
 _entry = cache.get_entry(self.domain, entry, update=False)
 
- if _entry is not None and \
- 'result_attribute' in _entry.__dict__ and \
- not _entry.result_attribute == '':
-
+ if not _entry == None and _entry.__dict__.has_key('result_attribute') and not _entry.result_attribute == '':
 old_canon_attr = _entry.result_attribute
 
 entry_changes = self.recipient_policy(entry)
 
- if result_attribute in entry and result_attribute in entry_changes:
+ if entry.has_key(result_attribute) and entry_changes.has_key(result_attribute):
 if not entryresult_attribute == entry_changesresult_attribute:
 old_canon_attr = entryresult_attribute
 
 log.debug(
- _l("Result from recipient policy: %r") % (entry_changes),
- level=8
- )
+ _("Result from recipient policy: %r") % (entry_changes),
+ level=8
+ )
 
- if result_attribute in entry_changes and old_canon_attr is not None:
+ if entry_changes.has_key(result_attribute) and not old_canon_attr == None:
 if not entry_changesresult_attribute == old_canon_attr:
 self.imap.user_mailbox_rename(
- old_canon_attr,
- entry_changesresult_attribute
- )
+ old_canon_attr,
+ entry_changesresult_attribute
+ )
 
- for key in entry_changes:
+ for key in entry_changes.keys():
 entrykey = entry_changeskey
 self.set_entry_attribute(entry, key, entrykey)
 
@@ -2298,30 +2205,32 @@
 
 server = None
 
- if mailserver_attribute not in entry:
+ if not entry.has_key(mailserver_attribute):
 entrymailserver_attribute = self.get_entry_attribute(entry, mailserver_attribute)
 
- if entrymailserver_attribute == "" or entrymailserver_attribute is None:
+ if entrymailserver_attribute == "" or entrymailserver_attribute == None:
 server = None
 else:
 server = entrymailserver_attribute.lower()
 
- if result_attribute in entry and entryresult_attribute is not None:
+ if entry.has_key(result_attribute) and \
+ not entry.has_key(result_attribute) == None:
+
 if not self.imap.user_mailbox_exists(entryresult_attribute):
 folder = self.imap.user_mailbox_create(entryresult_attribute, server=server)
 server = self.imap.user_mailbox_server(folder)
 else:
 folder = "user%s%s" % (
- self.imap.get_separator(),
- entryresult_attribute
- )
+ self.imap.get_separator(),
+ entryresult_attribute
+ )
 
 server = self.imap.user_mailbox_server(folder)
 
 self.user_quota(entry, folder)
 
 mailserver_attr = self.config_get('mailserver_attribute')
- if mailserver_attr not in entry:
+ if not entry.has_key(mailserver_attr):
 self.set_entry_attribute(entry, mailserver_attr, server)
 else:
 if not entrymailserver_attr == server:
@@ -2330,11 +2239,11 @@
 
 else:
 log.warning(
- _l("Kolab user %s does not have a result attribute %r") % (
- entry'id',
- result_attribute
+ _("Kolab user %s does not have a result attribute %r") % (
+ entry'id',
+ result_attribute
+ )
 )
- )
 
 def _disconnect(self):
 del self.ldap
@@ -2349,29 +2258,28 @@
 # The list of naming contexts in the LDAP server
 attrs = self.get_entry_attributes("", 'namingContexts')
 
- # Lower case of naming contexts - primarily for AD
- naming_contexts = utils.normalize(attrs'namingcontexts')
+ naming_contexts = attrs'namingcontexts'
 
- if isinstance(naming_contexts, string_types):
- naming_contexts = naming_contexts
+ if isinstance(naming_contexts, basestring):
+ naming_contexts = naming_contexts 
 
 log.debug(
- _l("Naming contexts found: %r") % (naming_contexts),
- level=8
- )
+ _("Naming contexts found: %r") % (naming_contexts),
+ level=8
+ )
 
 self._kolab_domain_root_dn(domain)
 
 log.debug(
- _l("Domains/Root DNs found: %r") % (
- self.domain_rootdns
- ),
- level=8
- )
+ _("Domains/Root DNs found: %r") % (
+ self.domain_rootdns
+ ),
+ level=8
+ )
 
 # If we have a 1:1 match, continue as planned
 for naming_context in naming_contexts:
- if self.domain_rootdnsdomain.lower().endswith(naming_context):
+ if self.domain_rootdnsdomain.endswith(naming_context):
 return naming_context
 
 def _primary_domain_for_naming_context(self, naming_context):
@@ -2392,7 +2300,7 @@
 Returns True or False
 """
 if isinstance(value, dict):
- if 'dn' in value:
+ if value.has_key('dn'):
 return True
 
 return False
@@ -2405,11 +2313,12 @@
 """
 
 # Only basestrings can be DNs
- if not isinstance(value, string_types):
+ if not isinstance(value, basestring):
 return False
 
 try:
- explode_dn(value)
+ import ldap.dn
+ ldap_dn = ldap.dn.explode_dn(value)
 except ldap.DECODING_ERROR:
 # This is not a DN.
 return False
@@ -2427,58 +2336,58 @@
 config_base_dn = self.config_get('base_dn')
 ldap_base_dn = self._kolab_domain_root_dn(self.domain)
 
- if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ if not ldap_base_dn == None and not ldap_base_dn == config_base_dn:
 base_dn = ldap_base_dn
 else:
 base_dn = config_base_dn
 
 for _type in 'user', 'group', 'sharedfolder':
 __filter = self.config_get('kolab_%s_filter' % (_type))
- if __filter is None:
+ if __filter == None:
 __filter = self.config_get('%s_filter' % (_type))
 
- if __filter is not None:
+ if not __filter == None:
 try:
 result = self._regular_search(entry_dn, filterstr=__filter)
- except Exception:
+ except:
 result = self._regular_search(
- base_dn,
- filterstr="(%s=%s)" % (
- self.config_get('unique_attribute'),
- entry_id'id'
- )
- )
+ base_dn,
+ filterstr="(%s=%s)" %(
+ self.config_get('unique_attribute'),
+ entry_id'id')
+ )
 
 if not result:
 continue
 else:
 return _type
 
- return None
-
 def _find_user_dn(self, login, kolabuser=False):
 """
 Find the distinguished name (DN) for a (Kolab) user entry in LDAP.
 """
 
 conf_prefix = 'kolab_' if kolabuser else ''
+ domain_root_dn = self._kolab_domain_root_dn(self.domain)
 
- user_base_dn = self._object_base_dn('user', conf_prefix)
+ user_base_dn = self.config_get(conf_prefix + 'user_base_dn')
+ if user_base_dn == None:
+ user_base_dn = self.config_get('base_dn')
 
 auth_attrs = self.config_get_list('auth_attributes')
 
- auth_search_filter = '(|'
+ auth_search_filter = '(|' 
 
 for auth_attr in auth_attrs:
- auth_search_filter.append('(%s=%s)' % (auth_attr, login))
- if '@' not in login:
+ auth_search_filter.append('(%s=%s)' % (auth_attr,login))
+ if not '@' in login:
 auth_search_filter.append(
- '(%s=%s@%s)' % (
- auth_attr,
- login,
- self.domain
+ '(%s=%s@%s)' % (
+ auth_attr,
+ login,
+ self.domain
+ )
 )
- )
 
 auth_search_filter.append(')')
 
@@ -2487,16 +2396,16 @@
 user_filter = self.config_get(conf_prefix + 'user_filter')
 
 search_filter = "(&%s%s)" % (
- auth_search_filter,
- user_filter
- )
+ auth_search_filter,
+ user_filter
+ )
 
 _results = self._search(
- user_base_dn,
- filterstr=search_filter,
- attrlist='dn',
- override_search='_regular_search'
- )
+ user_base_dn,
+ filterstr=search_filter,
+ attrlist= 'dn' ,
+ override_search='_regular_search'
+ )
 
 if len(_results) == 1:
 (_user_dn, _user_attrs) = _results0
@@ -2506,10 +2415,10 @@
 if len(login.split('@')) < 2:
 search_filter = "(uid=%s)" % (login)
 _results = self._search(
- domain,
- filterstr=search_filter,
- attrlist='dn'
- )
+ domain,
+ filterstr=search_filter,
+ attrlist= 'dn' 
+ )
 
 if len(_results) == 1:
 (_user_dn, _user_attrs) = _results0
@@ -2522,58 +2431,53 @@
 return _user_dn
 
 def _kolab_domain_root_dn(self, domain):
- log.debug(_l("Searching root dn for domain %r") % (domain), level=8)
+ log.debug(_("Searching root dn for domain %r") % (domain), level=8)
 if not hasattr(self, 'domain_rootdns'):
 self.domain_rootdns = {}
 
- if domain in self.domain_rootdns:
- log.debug(_l("Returning from cache: %r") % (self.domain_rootdnsdomain), level=8)
+ if self.domain_rootdns.has_key(domain):
+ log.debug(_("Returning from cache: %r") % (self.domain_rootdnsdomain), level=8)
 return self.domain_rootdnsdomain
 
 self._bind()
 
- log.debug(_l("Finding domain root dn for domain %s") % (domain), level=8)
+ log.debug(_("Finding domain root dn for domain %s") % (domain), level=8)
 
 domain_base_dn = conf.get('ldap', 'domain_base_dn', quiet=True)
 domain_filter = conf.get('ldap', 'domain_filter')
 
- if domain_filter is not None:
- if domain is not None:
+ if not domain_filter == None:
+ if not domain == None:
 domain_filter = domain_filter.replace('*', domain)
 
 if not domain_base_dn == "":
 
 _results = self._search(
- domain_base_dn,
- ldap.SCOPE_SUBTREE,
- domain_filter,
- override_search='_regular_search'
- )
+ domain_base_dn,
+ ldap.SCOPE_SUBTREE,
+ domain_filter,
+ override_search='_regular_search'
+ )
+
+ domains = 
 
 for _domain in _results:
 (domain_dn, _domain_attrs) = _domain
 domain_rootdn_attribute = conf.get(
- 'ldap',
- 'domain_rootdn_attribute'
- )
+ 'ldap',
+ 'domain_rootdn_attribute'
+ )
 
 _domain_attrs = utils.normalize(_domain_attrs)
 
- if domain_rootdn_attribute in _domain_attrs:
- log.debug(
- _l("Setting domain root dn from LDAP for domain %r: %r") % (
- domain,
- _domain_attrsdomain_rootdn_attribute
- ),
- level=8
- )
-
+ if _domain_attrs.has_key(domain_rootdn_attribute):
+ log.debug(_("Setting domain root dn from LDAP for domain %r: %r") % (domain, _domain_attrsdomain_rootdn_attribute), level=8)
 self.domain_rootdnsdomain = _domain_attrsdomain_rootdn_attribute
 return _domain_attrsdomain_rootdn_attribute
 
 else:
 domain_name_attribute = self.config_get('domain_name_attribute')
- if domain_name_attribute is None:
+ if domain_name_attribute == None:
 domain_name_attribute = 'associateddomain'
 
 if isinstance(_domain_attrsdomain_name_attribute, list):
@@ -2596,11 +2500,11 @@
 _filter = "(|"
 for _type in 'user', 'group', 'resource', 'sharedfolder':
 __filter = self.config_get('kolab_%s_filter' % (_type))
- if __filter is None:
+ if __filter == None:
 __filter = self.config_get('%s_filter' % (_type))
 
- if __filter is not None:
- _filter = "%s%s" % (_filter, __filter)
+ if not __filter == None:
+ _filter = "%s%s" % (_filter,__filter)
 
 _filter = "%s)" % (_filter)
 
@@ -2617,7 +2521,7 @@
 This function should only be called by the primary instance of Auth.
 """
 
- log.debug(_l("Listing domains..."), level=8)
+ log.debug(_("Listing domains..."), level=8)
 
 self.connect()
 self._bind()
@@ -2632,28 +2536,27 @@
 # If we haven't returned already, let's continue searching
 domain_filter = conf.get('ldap', 'domain_filter')
 
- if domain is not None:
+ if not domain == None:
 domain_filter = domain_filter.replace('*', domain)
 
- if domain_base_dn is None or domain_filter is None:
+ if domain_base_dn == None or domain_filter == None:
 return 
 
 dna = self.config_get('domain_name_attribute')
- if dna is None:
+ if dna == None:
 dna = 'associateddomain'
 
 try:
 _search = self._search(
- domain_base_dn,
- ldap.SCOPE_SUBTREE,
- domain_filter,
- # TODO: Where we use associateddomain is actually
- # configurable
- dna,
- override_search='_regular_search'
- )
-
- except Exception:
+ domain_base_dn,
+ ldap.SCOPE_SUBTREE,
+ domain_filter,
+ # TODO: Where we use associateddomain is actually
+ # configurable
+ dna ,
+ override_search='_regular_search'
+ )
+ except:
 return 
 
 domains = 
@@ -2671,30 +2574,10 @@
 else:
 primary_domain = domain_attrsdna.lower()
 
- domains.append((primary_domain, secondary_domains))
+ domains.append((primary_domain,secondary_domains))
 
 return domains
 
- def _object_base_dn(self, objectType, prefix=''):
- """
- Get configured base DN for specified Kolab object type
- """
- object_base_dn = self.config_get(prefix + objectType + '_base_dn')
- config_base_dn = self.config_get('base_dn')
- ldap_base_dn = self._kolab_domain_root_dn(self.domain)
-
- if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
- base_dn = ldap_base_dn
- else:
- base_dn = config_base_dn
-
- if object_base_dn is None:
- object_base_dn = base_dn
- else:
- object_base_dn = object_base_dn % ({'base_dn': base_dn})
-
- return object_base_dn
-
 def _synchronize_callback(self, *args, **kw):
 """
 Determine the characteristics of the callback being placed, and
@@ -2705,37 +2588,25 @@
 """
 
 log.debug(
- "auth.ldap.LDAP._synchronize_callback(args %r, kw %r)" % (
- args,
- kw
- ),
- level=8
- )
+ "auth.ldap.LDAP._synchronize_callback(args %r, kw %r)" % (
+ args,
+ kw
+ ),
+ level=9
+ )
 
 # Typical for Persistent Change Control EntryChangeNotification
- if 'change_type' in kw:
- log.debug(
- _l(
- "change_type defined, typical for Persistent Change "
- + "Control EntryChangeNotification"
- ),
- level=5
- )
+ if kw.has_key('change_type'):
+ change_type = None
 
 change_dict = {
- 'change_type': kw'change_type',
- 'previous_dn': kw'previous_dn',
- 'change_number': kw'change_number',
- 'dn': kw'dn'
- }
+ 'change_type': kw'change_type',
+ 'previous_dn': kw'previous_dn',
+ 'change_number': kw'change_number',
+ 'dn': kw'dn'
+ }
 
 entry = utils.normalize(kw'entry')
-
- # Ignore nstombstone objects
- if 'objectclass' in entry:
- if 'nstombstone' in entry'objectclass':
- return None
-
 entry'dn' = kw'dn'
 
 unique_attr = self.config_get('unique_attribute')
@@ -2743,12 +2614,12 @@
 
 try:
 entry'type' = self._entry_type(entry)
- except Exception:
+ except:
 entry'type' = None
 
- log.debug(_l("Entry type: %s") % (entry'type'), level=8)
+ log.debug(_("Entry type: %s") % (entry'type'), level=8)
 
- if change_dict'change_type' is None:
+ if change_dict'change_type' == None:
 # This entry was in the start result set
 eval("self._change_none_%s(entry, change_dict)" % (entry'type'))
 else:
@@ -2761,47 +2632,40 @@
 # See if we can find the cache entry - this way we can get to
 # the value of a (former, on a deleted entry) result_attribute
 result_attribute = conf.get('cyrus-sasl', 'result_attribute')
- if result_attribute not in entry:
+ if not entry.has_key(result_attribute):
 cache_entry = cache.get_entry(self.domain, entry, update=False)
 
 if hasattr(cache_entry, 'result_attribute') and change == 'delete':
 entryresult_attribute = cache_entry.result_attribute
 
 eval(
- "self._change_%s_%s(entry, change_dict)" % (
- change,
- entry'type'
+ "self._change_%s_%s(entry, change_dict)" % (
+ change,
+ entry'type'
+ )
 )
- )
 
 # Typical for Paged Results Control
- elif 'entry' in kw and isinstance(kw'entry', list):
- log.debug(_l("No change_type, typical for Paged Results Control"), level=5)
-
- for entry_dn, entry_attrs in kw'entry':
+ elif kw.has_key('entry') and isinstance(kw'entry', list):
+ for entry_dn,entry_attrs in kw'entry':
 # This is a referral
- if entry_dn is None:
+ if entry_dn == None:
 continue
 
- entry = {'dn': entry_dn}
+ entry = { 'dn': entry_dn }
 entry_attrs = utils.normalize(entry_attrs)
- for attr in entry_attrs:
+ for attr in entry_attrs.keys():
 entryattr.lower() = entry_attrsattr
 
- # Ignore nstombstone objects
- if 'objectclass' in entry:
- if 'nstombstone' in entry'objectclass':
- return None
-
- unique_attr = self.config_get('unique_attribute').lower()
+ unique_attr = self.config_get('unique_attribute')
 entry'id' = entryunique_attr
 
 try:
 entry'type' = self._entry_type(entry)
- except Exception:
+ except:
 entry'type' = "unknown"
 
- log.debug(_l("Entry type for dn: %s is: %s") % (entry'dn', entry'type'), level=8)
+ log.debug(_("Entry type: %s") % (entry'type'), level=8)
 
 eval("self._change_none_%s(entry, None)" % (entry'type'))
 
@@ -2809,9 +2673,9 @@
 #
 # rcpt_addrs = self.recipient_policy(entry)
 #
-# log.debug(_l("Recipient Addresses: %r") % (rcpt_addrs), level=8)
+# log.debug(_("Recipient Addresses: %r") % (rcpt_addrs), level=9)
 #
-# for key in rcpt_addrs:
+# for key in rcpt_addrs.keys():
 # entrykey = rcpt_addrskey
 #
 # cache.get_entry(self.domain, entry)
@@ -2826,67 +2690,67 @@
 # server = self.imap.user_mailbox_server(folder)
 
 ###
- # Backend search functions
+ ### Backend search functions
 ###
 
- def _persistent_search(
- self,
- base_dn,
- scope=ldap.SCOPE_SUBTREE,
- filterstr="(objectClass=*)",
- attrlist=None,
- attrsonly=0,
- timeout=-1,
- callback=False,
- primary_domain=None,
- secondary_domains=
- ):
+ def _persistent_search(self,
+ base_dn,
+ scope=ldap.SCOPE_SUBTREE,
+ filterstr="(objectClass=*)",
+ attrlist=None,
+ attrsonly=0,
+ timeout=-1,
+ callback=False,
+ primary_domain=None,
+ secondary_domains=
+ ):
+
+ _results = 
 
 psearch_server_controls = 
 
- psearch_server_controls.append(
- ldap.controls.psearch.PersistentSearchControl(
- criticality=True,
- changeTypes='add', 'delete', 'modify', 'modDN',
- changesOnly=False,
- returnECs=True
+ psearch_server_controls.append(psearch.PersistentSearchControl(
+ criticality=True,
+ changeTypes= 'add', 'delete', 'modify', 'modDN' ,
+ changesOnly=False,
+ returnECs=True
+ )
 )
- )
 
 _search = self.ldap.search_ext(
- base_dn,
- scope=scope,
- filterstr=filterstr,
- attrlist=attrlist,
- attrsonly=attrsonly,
- timeout=timeout,
- serverctrls=psearch_server_controls
- )
+ base_dn,
+ scope=scope,
+ filterstr=filterstr,
+ attrlist=attrlist,
+ attrsonly=attrsonly,
+ timeout=timeout,
+ serverctrls=psearch_server_controls
+ )
 
 ecnc = psearch.EntryChangeNotificationControl
 
 while True:
- res_type, res_data, res_msgid, _None, _None, _None = self.ldap.result4(
- _search,
- all=0,
- add_ctrls=1,
- add_intermediates=1,
- resp_ctrl_classes={ecnc.controlType: ecnc}
- )
+ res_type,res_data,res_msgid,_None,_None,_None = self.ldap.result4(
+ _search,
+ all=0,
+ add_ctrls=1,
+ add_intermediates=1,
+ resp_ctrl_classes={ecnc.controlType:ecnc}
+ )
 
 change_type = None
 previous_dn = None
 change_number = None
 
- for dn, entry, srv_ctrls in res_data:
- log.debug(_l("LDAP Search Result Data Entry:"), level=8)
+ for dn,entry,srv_ctrls in res_data:
+ log.debug(_("LDAP Search Result Data Entry:"), level=8)
 log.debug(" DN: %r" % (dn), level=8)
 log.debug(" Entry: %r" % (entry), level=8)
 
 ecn_ctrls = 
- c for c in srv_ctrls
- if c.controlType == ecnc.controlType
- 
+ c for c in srv_ctrls
+ if c.controlType == ecnc.controlType
+ 
 
 if ecn_ctrls:
 change_type = ecn_ctrls0.changeType
@@ -2895,93 +2759,90 @@
 change_type_desc = psearch.CHANGE_TYPES_STRchange_type
 
 log.debug(
- _l("Entry Change Notification attributes:"),
- level=8
- )
+ _("Entry Change Notification attributes:"),
+ level=8
+ )
 
 log.debug(
- " " + _l("Change Type: %r (%r)") % (
- change_type,
- change_type_desc
- ),
- level=8
- )
+ " " + _("Change Type: %r (%r)") % (
+ change_type,
+ change_type_desc
+ ),
+ level=8
+ )
 
 log.debug(
- " " + _l("Previous DN: %r") % (previous_dn),
- level=8
- )
+ " " + _("Previous DN: %r") % (previous_dn),
+ level=8
+ )
 
 if callback:
 callback(
- dn=dn,
- entry=entry,
- previous_dn=previous_dn,
- change_type=change_type,
- change_number=change_number,
- primary_domain=primary_domain,
- secondary_domains=secondary_domains
- )
-
- def _paged_search(
- self,
- base_dn,
- scope=ldap.SCOPE_SUBTREE,
- filterstr="(objectClass=*)",
- attrlist=None,
- attrsonly=0,
- timeout=-1,
- callback=False,
- primary_domain=None,
- secondary_domains=
- ):
+ dn=dn,
+ entry=entry,
+ previous_dn=previous_dn,
+ change_type=change_type,
+ change_number=change_number,
+ primary_domain=primary_domain,
+ secondary_domains=secondary_domains
+ )
+
+ def _paged_search(self,
+ base_dn,
+ scope=ldap.SCOPE_SUBTREE,
+ filterstr="(objectClass=*)",
+ attrlist=None,
+ attrsonly=0,
+ timeout=-1,
+ callback=False,
+ primary_domain=None,
+ secondary_domains=
+ ):
 
 page_size = 500
+ critical = True
 _results = 
 
- server_page_control = ldap.controls.libldap.SimplePagedResultsControl(size=page_size,cookie='')
+ server_page_control = SimplePagedResultsControl(page_size=page_size)
 
 _search = self.ldap.search_ext(
- base_dn,
- scope=scope,
- filterstr=filterstr,
- attrlist=attrlist,
- attrsonly=attrsonly,
- serverctrls=server_page_control
- )
+ base_dn,
+ scope=scope,
+ filterstr=filterstr,
+ attrlist=attrlist,
+ attrsonly=attrsonly,
+ serverctrls=server_page_control
+ )
 
 pages = 0
 while True:
 pages += 1
 try:
 (
- _result_type,
- _result_data,
- _result_msgid,
- _result_controls
- ) = self.ldap.result3(_search)
+ _result_type,
+ _result_data,
+ _result_msgid,
+ _result_controls
+ ) = self.ldap.result3(_search)
 
- except ldap.NO_SUCH_OBJECT:
+ except ldap.NO_SUCH_OBJECT, e:
 log.warning(
- _l("Object %s searched no longer exists") % (base_dn)
- )
+ _("Object %s searched no longer exists") % (base_dn)
+ )
 
 break
 
- # Remove referrals
- _result_data = _e for _e in _result_data if _e0 is not None
-
 if callback:
 callback(entry=_result_data)
 
 _results.extend(_result_data)
 if (pages % 2) == 0:
- log.debug(_l("%d results...") % (len(_results)))
+ log.debug(_("%d results...") % (len(_results)))
 
 pctrls = 
- c for c in _result_controls
- if c.controlType == ldap.controls.libldap.SimplePagedResultsControl.controlType
- 
+ c for c in _result_controls
+ if c.controlType == LDAP_CONTROL_PAGED_RESULTS
+ 
 
 if pctrls:
 if hasattr(pctrls0, 'size'):
@@ -2993,49 +2854,47 @@
 if cookie:
 server_page_control.cookie = cookie
 _search = self.ldap.search_ext(
- base_dn,
- scope=scope,
- filterstr=filterstr,
- attrlist=attrlist,
- attrsonly=attrsonly,
- serverctrls=server_page_control
- )
+ base_dn,
+ scope=scope,
+ filterstr=filterstr,
+ attrlist=attrlist,
+ attrsonly=attrsonly,
+ serverctrls=server_page_control
+ )
 else:
 # TODO: Error out more verbose
 break
 else:
 # TODO: Error out more verbose
- print("Warning: Server ignores RFC 2696 control.")
+ print "Warning: Server ignores RFC 2696 control."
 break
 
 return _results
 
- def _vlv_search(
- self,
- base_dn,
- scope=ldap.SCOPE_SUBTREE,
- filterstr="(objectClass=*)",
- attrlist=None,
- attrsonly=0,
- timeout=-1,
- callback=False,
- primary_domain=None,
- secondary_domains=
- ):
+ def _vlv_search(self,
+ base_dn,
+ scope=ldap.SCOPE_SUBTREE,
+ filterstr="(objectClass=*)",
+ attrlist=None,
+ attrsonly=0,
+ timeout=-1,
+ callback=False,
+ primary_domain=None,
+ secondary_domains=
+ ):
 pass
 
- def _sync_repl(
- self,
- base_dn,
- scope=ldap.SCOPE_SUBTREE,
- filterstr="(objectClass=*)",
- attrlist=None,
- attrsonly=0,
- timeout=-1,
- callback=False,
- primary_domain=None,
- secondary_domains=
- ):
+ def _sync_repl(self,
+ base_dn,
+ scope=ldap.SCOPE_SUBTREE,
+ filterstr="(objectClass=*)",
+ attrlist=None,
+ attrsonly=0,
+ timeout=-1,
+ callback=False,
+ primary_domain=None,
+ secondary_domains=
+ ):
 
 import ldapurl
 import syncrepl
@@ -3043,12 +2902,11 @@
 ldap_url = ldapurl.LDAPUrl(self.config_get('ldap_uri'))
 
 ldap_sync_conn = syncrepl.DNSync(
- '/var/lib/kolab/syncrepl_%s.db' % (self.domain),
- ldap_url.initializeUrl(),
- trace_level=2,
- trace_file=pykolab.logger.StderrToLogger(log),
- callback=self._synchronize_callback
- )
+ '/var/lib/kolab/syncrepl_%s.db' % (self.domain),
+ ldap_url.initializeUrl(),
+ trace_level=2,
+ callback=self._synchronize_callback
+ )
 
 bind_dn = self.config_get('bind_dn')
 bind_pw = self.config_get('bind_pw')
@@ -3056,12 +2914,12 @@
 ldap_sync_conn.simple_bind_s(bind_dn, bind_pw)
 
 msgid = ldap_sync_conn.syncrepl_search(
- base_dn,
- scope,
- mode='refreshAndPersist',
- filterstr=filterstr,
- attrlist=attrlist,
- )
+ base_dn,
+ scope,
+ mode='refreshAndPersist',
+ filterstr=filterstr,
+ attrlist=attrlist,
+ )
 
 try:
 # Here's where returns need to be taken into account...
@@ -3070,31 +2928,27 @@
 except KeyboardInterrupt:
 pass
 
- def _regular_search(
- self,
- base_dn,
- scope=ldap.SCOPE_SUBTREE,
- filterstr="(objectClass=*)",
- attrlist=None,
- attrsonly=0,
- timeout=None,
- callback=False,
- primary_domain=None,
- secondary_domains=
- ):
-
- if timeout is None:
- timeout = float(self.config_get('ldap', 'timeout', default=10))
+ def _regular_search(self,
+ base_dn,
+ scope=ldap.SCOPE_SUBTREE,
+ filterstr="(objectClass=*)",
+ attrlist=None,
+ attrsonly=0,
+ timeout=-1,
+ callback=False,
+ primary_domain=None,
+ secondary_domains=
+ ):
 
- log.debug(_l("Searching with filter %r") % (filterstr), level=8)
+ log.debug(_("Searching with filter %r") % (filterstr), level=8)
 
 _search = self.ldap.search(
- base_dn,
- scope=scope,
- filterstr=filterstr,
- attrlist=attrlist,
- attrsonly=attrsonly
- )
+ base_dn,
+ scope=scope,
+ filterstr=filterstr,
+ attrlist=attrlist,
+ attrsonly=attrsonly
+ )
 
 _results = 
 _result_type = None
@@ -3102,25 +2956,24 @@
 while not _result_type == ldap.RES_SEARCH_RESULT:
 (_result_type, _result) = self.ldap.result(_search, False, 0)
 
- if _result is not None:
+ if not _result == None:
 for result in _result:
 _results.append(result)
 
 return _results
 
- def _search(
- self,
- base_dn,
- scope=ldap.SCOPE_SUBTREE,
- filterstr="(objectClass=*)",
- attrlist=None,
- attrsonly=0,
- timeout=None,
- override_search=False,
- callback=False,
- primary_domain=None,
- secondary_domains=
- ):
+ def _search(self,
+ base_dn,
+ scope=ldap.SCOPE_SUBTREE,
+ filterstr="(objectClass=*)",
+ attrlist=None,
+ attrsonly=0,
+ timeout=-1,
+ override_search=False,
+ callback=False,
+ primary_domain=None,
+ secondary_domains=
+ ):
 """
 Search LDAP.
 
@@ -3128,54 +2981,50 @@
 the first one supported.
 """
 
- if timeout is None:
- timeout = float(self.config_get('ldap', 'timeout', default=10))
-
 supported_controls = conf.get_list('ldap', 'supported_controls')
 
- if supported_controls is not None and not len(supported_controls) < 1:
+ if not supported_controls == None and not len(supported_controls) < 1:
 for control_num in (int)(x) for x in supported_controls:
 self.ldap.supported_controls.append(
- SUPPORTED_LDAP_CONTROLScontrol_num'func'
- )
+ SUPPORTED_LDAP_CONTROLScontrol_num'func'
+ )
 
 if len(self.ldap.supported_controls) < 1:
- for control_num in SUPPORTED_LDAP_CONTROLS:
+ for control_num in SUPPORTED_LDAP_CONTROLS.keys():
 log.debug(
- _l("Checking for support for %s on %s") % (
- SUPPORTED_LDAP_CONTROLScontrol_num'desc',
- self.domain
- ),
- level=8
- )
+ _("Checking for support for %s on %s") % (
+ SUPPORTED_LDAP_CONTROLScontrol_num'desc',
+ self.domain
+ ),
+ level=8
+ )
 
 _search = self.ldap.search_s(
- '',
- scope=ldap.SCOPE_BASE,
- attrlist='supportedControl'
- )
+ '',
+ scope=ldap.SCOPE_BASE,
+ attrlist='supportedControl'
+ )
 
- for (_result, _supported_controls) in _search:
+ for (_result,_supported_controls) in _search:
 supported_controls = _supported_controls.values()0
- for control_num in SUPPORTED_LDAP_CONTROLS:
+ for control_num in SUPPORTED_LDAP_CONTROLS.keys():
 if SUPPORTED_LDAP_CONTROLScontrol_num'oid' in \
 supported_controls:
 
- log.debug(
- _l("Found support for %s") % (
- SUPPORTED_LDAP_CONTROLScontrol_num'desc',
- ),
- level=8
- )
+ log.debug(_("Found support for %s") % (
+ SUPPORTED_LDAP_CONTROLScontrol_num'desc',
+ ),
+ level=8
+ )
 
 self.ldap.supported_controls.append(
- SUPPORTED_LDAP_CONTROLScontrol_num'func'
- )
+ SUPPORTED_LDAP_CONTROLScontrol_num'func'
+ )
 
 _results = 
 
- if override_search is not False:
- _use_ldap_controls = override_search
+ if not override_search == False:
+ _use_ldap_controls = override_search 
 else:
 _use_ldap_controls = self.ldap.supported_controls
 
@@ -3188,8 +3037,7 @@
 
 while not failed_ok:
 try:
- exec(
- """_results = self.%s(
+ exec("""_results = self.%s(
 %r,
 scope=%r,
 filterstr=%r,
@@ -3200,43 +3048,33 @@
 primary_domain=%r,
 secondary_domains=%r
 )""" % (
- supported_control,
- base_dn,
- scope,
- filterstr,
- attrlist,
- attrsonly,
- timeout,
- primary_domain,
- secondary_domains
+ supported_control,
+ base_dn,
+ scope,
+ filterstr,
+ attrlist,
+ attrsonly,
+ timeout,
+ primary_domain,
+ secondary_domains
+ )
 )
- )
 
 break
 
- except ldap.SERVER_DOWN as errmsg:
- log.error(_l("LDAP server unavailable: %r") % (errmsg))
- log.error(_l("%s") % (traceback.format_exc()))
- log.error(_l("-- reconnecting in 10 seconds."))
-
- self._disconnect()
-
- time.sleep(10)
- self.reconnect()
-
- except ldap.TIMEOUT:
- log.error(_l("LDAP timeout in searching for '%s'") % (filterstr))
-
- self._disconnect()
+ except ldap.SERVER_DOWN, errmsg:
+ log.error(_("LDAP server unavailable: %r") % (errmsg))
+ log.error(_("%s") % (traceback.format_exc()))
+ log.error(_("-- reconnecting in 10 seconds."))
 
 time.sleep(10)
 self.reconnect()
 
- except Exception as errmsg:
+ except Exception, errmsg:
 failed_ok = True
 
- log.error(_l("An error occured using %s: %r") % (supported_control, errmsg))
- log.error(_l("%s") % (traceback.format_exc()))
+ log.error(_("An error occured using %s: %r") % (supported_control, errmsg))
+ log.error(_("%s") % (traceback.format_exc()))
 
 continue
 
@@ -3251,7 +3089,7 @@
 
 if acl is not None:
 if not isinstance(acl, list):
- acl = acl
+ acl = acl 
 
 for acl_entry in acl:
 # entry already converted to IMAP format?

pykolab-0.8.23.tar.gz/pykolab/auth/ldap/auth_cache.py -> pykolab-0.8.4.tar.gz/pykolab/auth/ldap/auth_cache.py Changed

@@ -17,7 +17,6 @@
 #
 
 import datetime
-import os
 
 import sqlalchemy
 
@@ -26,18 +25,30 @@
 from sqlalchemy import Integer
 from sqlalchemy import MetaData
 from sqlalchemy import String
+from sqlalchemy import Table
 from sqlalchemy import Text
 
+from sqlalchemy import desc
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import mapper
 
-from sqlalchemy.orm import sessionmaker
+try:
+ from sqlalchemy.orm import relationship
+except:
+ from sqlalchemy.orm import relation as relationship
+
+try:
+ from sqlalchemy.orm import sessionmaker
+except:
+ from sqlalchemy.orm import create_session
 
 import pykolab
 
+from pykolab import utils
 from pykolab.constants import KOLAB_LIB_PATH
+from pykolab.translate import _
 
-# pylint: disable=invalid-name
 conf = pykolab.getConf()
 log = pykolab.getLogger('pykolab.auth_cache')
 
@@ -45,19 +56,12 @@
 
 db = None
 
-try:
- unicode('')
-except NameError:
- unicode = str
-
-#
-# Classes
-#
+##
+## Classes
+##
 
 DeclarativeBase = declarative_base()
 
-
-# pylint: disable=too-few-public-methods
 class Entry(DeclarativeBase):
 __tablename__ = 'entries'
 
@@ -74,91 +78,66 @@
 else:
 self.value = value
 
-#
-# Functions
-#
-
+##
+## Functions
+##
 
 def del_entry(key):
- # pylint: disable=global-statement
- global db
-
 db = init_db()
 
- if db is None:
- return
-
- purge_entries()
-
 try:
- db.query(Entry).filter_by(key=key).delete()
- except sqlalchemy.exc.OperationalError:
+ _entries = db.query(Entry).filter_by(key=key).delete()
+ except sqlalchemy.exc.OperationalError, errmsg:
 db = init_db(reinit=True)
- except sqlalchemy.exc.InvalidRequest:
+ except sqlalchemy.exc.InvalidRequest, errmsg:
 db = init_db(reinit=True)
 finally:
- db.query(Entry).filter_by(key=key).delete()
+ _entries = db.query(Entry).filter_by(key=key).delete()
 
 db.commit()
 
-
 def get_entry(key):
- # pylint: disable=global-statement
- global db
-
 db = init_db()
 
- if db is None:
- return None
-
 try:
 _entries = db.query(Entry).filter_by(key=key).all()
- except sqlalchemy.exc.OperationalError:
+ except sqlalchemy.exc.OperationalError, errmsg:
 db = init_db(reinit=True)
- except sqlalchemy.exc.InvalidRequest:
+ except sqlalchemy.exc.InvalidRequest, errmsg:
 db = init_db(reinit=True)
 finally:
 _entries = db.query(Entry).filter_by(key=key).all()
 
- __entries = 
-
- for __entry in _entries:
- if __entry.last_change <= datetime.datetime.now() - datetime.timedelta(0, 7200):
- continue
-
- __entries.append(__entry)
-
- if len(__entries) != 1:
+ if len(_entries) == 0:
+ return None
+ if len(_entries) > 1:
 return None
 
- log.debug("Entry found: %r" % (__entries0.__dict__))
- log.debug("Returning: %r" % (__entries0.value))
-
- return __entries0.value.encode('utf-8', 'latin1')
+ log.debug("Entry found: %r" % (_entries0.__dict__))
+ log.debug("Returning: %r" % (_entries0.value))
 
+ return _entries0.value.encode('utf-8', 'latin1')
 
 def set_entry(key, value):
- # pylint: disable=global-statement
- global db
-
 db = init_db()
-
- if db is None:
- return
-
 try:
 _entries = db.query(Entry).filter_by(key=key).all()
- except sqlalchemy.exc.OperationalError:
+ except sqlalchemy.exc.OperationalError, errmsg:
 db = init_db(reinit=True)
- except sqlalchemy.exc.InvalidRequest:
+ except sqlalchemy.exc.InvalidRequest, errmsg:
 db = init_db(reinit=True)
 finally:
 _entries = db.query(Entry).filter_by(key=key).all()
 
- if not _entries:
- db.add(Entry(key, value))
- db.commit()
+ if len(_entries) == 0:
+ db.add(
+ Entry(
+ key,
+ value
+ )
+ )
 
+ db.commit()
 elif len(_entries) == 1:
 if not isinstance(value, unicode):
 value = unicode(value, 'utf-8')
@@ -169,40 +148,25 @@
 _entries0.last_change = datetime.datetime.now()
 db.commit()
 
-
-def purge_entries():
- # pylint: disable=global-statement
- global db
-
- try:
- db.query(Entry).filter(
- Entry.last_change <= (datetime.datetime.now() - datetime.timedelta(0, 7200))
- ).delete()
-
- db.commit()
- except Exception:
- return
-
+def purge_entries(db):
+ db.query(Entry).filter(Entry.last_change <= (datetime.datetime.now() - datetime.timedelta(1))).delete()
+ db.commit()
 
 def init_db(reinit=False):
 """
 Returns a SQLAlchemy Session() instance.
 """
- # pylint: disable=global-statement
 global db
 
- if db is not None and not reinit:
+ if not db == None and not reinit:
 return db
 
 db_uri = conf.get('ldap', 'auth_cache_uri')
-
- if db_uri == "null":
- return None
-
- if db_uri is None:
+ if db_uri == None:
 db_uri = 'sqlite:///%s/auth_cache.db' % (KOLAB_LIB_PATH)
 
 if reinit:
+ import os
 if os.path.isfile('%s/auth_cache.db' % (KOLAB_LIB_PATH)):
 os.unlink('%s/auth_cache.db' % (KOLAB_LIB_PATH))
 
@@ -212,5 +176,6 @@
 
 Session = sessionmaker(bind=engine)
 db = Session()
+ purge_entries(db)
 
 return db

pykolab-0.8.23.tar.gz/pykolab/auth/ldap/cache.py -> pykolab-0.8.4.tar.gz/pykolab/auth/ldap/cache.py Changed

@@ -18,8 +18,6 @@
 
 import datetime
 
-from uuid import UUID
-
 import sqlalchemy
 
 from sqlalchemy import Column
@@ -27,146 +25,144 @@
 from sqlalchemy import Integer
 from sqlalchemy import MetaData
 from sqlalchemy import String
+from sqlalchemy import Table
 
 from sqlalchemy import desc
 from sqlalchemy import create_engine
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import mapper
+
+try:
+ from sqlalchemy.orm import relationship
+except:
+ from sqlalchemy.orm import relation as relationship
 
-from sqlalchemy.orm import sessionmaker
+try:
+ from sqlalchemy.orm import sessionmaker
+except:
+ from sqlalchemy.orm import create_session
 
 import pykolab
 
+from pykolab import utils
 from pykolab.constants import KOLAB_LIB_PATH
 from pykolab.translate import _
 
-# pylint: disable=invalid-name
 conf = pykolab.getConf()
-log = pykolab.getLogger('pykolab.cache')
+log = pykolab.getLogger('pykolab.auth_cache')
 
 metadata = MetaData()
 
 db = {}
 
-#
-# Classes
-#
-
-DeclarativeBase = declarative_base()
-
-
-# pylint: disable=too-few-public-methods
-class Entry(DeclarativeBase):
- __tablename__ = 'entries'
-
- last_change = None
-
- id = Column(Integer, primary_key=True)
- uniqueid = Column(String(128), nullable=False)
- result_attribute = Column(String(128), nullable=False)
- last_change = Column(DateTime, nullable=False, default=datetime.datetime.now())
+##
+## Classes
+##
 
+class Entry(object):
 def __init__(self, uniqueid, result_attr, last_change):
 self.uniqueid = uniqueid
 self.result_attribute = result_attr
 
- modifytimestamp_format = conf.get_raw(
- 'ldap',
- 'modifytimestamp_format',
- default="%Y%m%d%H%M%SZ"
- ).replace('%%', '%')
+ modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
+ if modifytimestamp_format == None:
+ modifytimestamp_format = "%Y%m%d%H%M%SZ"
 
 self.last_change = datetime.datetime.strptime(
- last_change,
- modifytimestamp_format
- )
+ last_change,
+ modifytimestamp_format
+ )
 
+##
+## Tables
+##
 
-#
-# Functions
-#
+entry_table = Table(
+ 'entry', metadata,
+ Column('id', Integer, primary_key=True),
+ Column('uniqueid', String(128), nullable=False),
+ Column('result_attribute', String(128), nullable=False),
+ Column('last_change', DateTime),
+ )
+
+##
+## Table <-> Class Mappers
+##
+
+mapper(Entry, entry_table)
 
+##
+## Functions
+##
 
 def delete_entry(domain, entry):
- _db = init_db(domain)
- _entry = _db.query(Entry).filter_by(uniqueid=entry'id').first()
+ result_attribute = conf.get_raw('cyrus-sasl', 'result_attribute')
 
- if _entry is not None:
- _db.delete(_entry)
- _db.commit()
+ db = init_db(domain)
+ _entry = db.query(Entry).filter_by(uniqueid=entry'id').first()
 
+ if not _entry == None:
+ db.delete(_entry)
+ db.commit()
 
 def get_entry(domain, entry, update=True):
 result_attribute = conf.get_raw('cyrus-sasl', 'result_attribute')
 
 _entry = None
 
- _db = init_db(domain)
-
+ db = init_db(domain)
 try:
- _uniqueid = str(UUID(bytes_le=entry'id'))
- log.debug(
- _("Entry uniqueid was converted from binary form to string: %s") % _uniqueid,
- level=8
- )
-
- except ValueError:
- _uniqueid = entry'id'
-
- try:
- _entry = _db.query(Entry).filter_by(uniqueid=_uniqueid).first()
- except sqlalchemy.exc.OperationalError:
- _db = init_db(domain, reinit=True)
- except sqlalchemy.exc.InvalidRequestError:
- _db = init_db(domain, reinit=True)
+ _entry = db.query(Entry).filter_by(uniqueid=entry'id').first()
+ except sqlalchemy.exc.OperationalError, errmsg:
+ db = init_db(domain,reinit=True)
+ except sqlalchemy.exc.InvalidRequestError, errmsg:
+ db = init_db(domain,reinit=True)
 finally:
- _entry = _db.query(Entry).filter_by(uniqueid=_uniqueid).first()
+ _entry = db.query(Entry).filter_by(uniqueid=entry'id').first()
 
 if not update:
 return _entry
 
- if _entry is None:
- log.debug(_("Inserting cache entry %r") % (_uniqueid), level=8)
+ if _entry == None:
+ log.debug(_("Inserting cache entry %r") % (entry'id'), level=8)
 
- if result_attribute not in entry:
+ if not entry.has_key(result_attribute):
 entryresult_attribute = ''
 
- _db.add(Entry(_uniqueid, entryresult_attribute, entry'modifytimestamp'))
+ db.add(
+ Entry(
+ entry'id',
+ entryresult_attribute,
+ entry'modifytimestamp'
+ )
+ )
 
- _db.commit()
- _entry = _db.query(Entry).filter_by(uniqueid=_uniqueid).first()
+ db.commit()
+ _entry = db.query(Entry).filter_by(uniqueid=entry'id').first()
 else:
- modifytimestamp_format = conf.get_raw(
- 'ldap',
- 'modifytimestamp_format',
- default="%Y%m%d%H%M%SZ"
- ).replace('%%', '%')
+ modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
+ if modifytimestamp_format == None:
+ modifytimestamp_format = "%Y%m%d%H%M%SZ"
 
 if not _entry.last_change.strftime(modifytimestamp_format) == entry'modifytimestamp':
- log.debug(_("Updating timestamp for cache entry %r") % (_uniqueid), level=8)
- last_change = datetime.datetime.strptime(
- entry'modifytimestamp',
- modifytimestamp_format
- )
-
+ log.debug(_("Updating timestamp for cache entry %r") % (entry'id'), level=8)
+ last_change = datetime.datetime.strptime(entry'modifytimestamp', modifytimestamp_format)
 _entry.last_change = last_change
- _db.commit()
- _entry = _db.query(Entry).filter_by(uniqueid=_uniqueid).first()
+ db.commit()
+ _entry = db.query(Entry).filter_by(uniqueid=entry'id').first()
 
- if result_attribute in entry:
+ if entry.has_key(result_attribute):
 if not _entry.result_attribute == entryresult_attribute:
- log.debug(_("Updating result_attribute for cache entry %r") % (_uniqueid), level=8)
+ log.debug(_("Updating result_attribute for cache entry %r") % (entry'id'), level=8)
 _entry.result_attribute = entryresult_attribute
- _db.commit()
- _entry = _db.query(Entry).filter_by(uniqueid=_uniqueid).first()
+ db.commit()
+ _entry = db.query(Entry).filter_by(uniqueid=entry'id').first()
 
 return _entry
 
-
-def init_db(domain, reinit=False):
+def init_db(domain,reinit=False):
 """
 Returns a SQLAlchemy Session() instance.
 """
- # pylint: disable=global-statement
 global db
 
 if domain in db and not reinit:
@@ -182,10 +178,9 @@
 
 try:
 engine = create_engine(db_uri, echo=echo)
- DeclarativeBase.metadata.create_all(engine)
- except Exception:
+ metadata.create_all(engine)
+ except:
 engine = create_engine('sqlite://')
- DeclarativeBase.metadata.create_all(engine)
 metadata.create_all(engine)
 
 Session = sessionmaker(bind=engine)
@@ -193,22 +188,18 @@
 
 return dbdomain
 
-
 def last_modify_timestamp(domain):
- modifytimestamp_format = conf.get_raw(
- 'ldap',
- 'modifytimestamp_format',
- "%Y%m%d%H%M%SZ"
- ).replace('%%', '%')
+ modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
+ if modifytimestamp_format == None:
+ modifytimestamp_format = "%Y%m%d%H%M%SZ"
 
 try:
- _db = init_db(domain)
- last_change = _db.query(Entry).order_by(desc(Entry.last_change)).first()
+ db = init_db(domain)
+ last_change = db.query(Entry).order_by(desc(Entry.last_change)).first()
 
- if last_change is not None:
+ if not last_change == None:
 return last_change.last_change.strftime(modifytimestamp_format)
-
- return datetime.datetime(1900, 1, 1, 00, 00, 00).strftime(modifytimestamp_format)
-
- except Exception:
- return datetime.datetime(1900, 1, 1, 00, 00, 00).strftime(modifytimestamp_format)
+ else:
+ return datetime.datetime(1900, 01, 01, 00, 00, 00).strftime(modifytimestamp_format)
+ except:
+ return datetime.datetime(1900, 01, 01, 00, 00, 00).strftime(modifytimestamp_format)

pykolab-0.8.23.tar.gz/pykolab/auth/ldap/syncrepl.py -> pykolab-0.8.4.tar.gz/pykolab/auth/ldap/syncrepl.py Changed

pykolab-0.8.23.tar.gz/pykolab/base.py -> pykolab-0.8.4.tar.gz/pykolab/base.py Changed

@@ -19,16 +19,14 @@
 import pykolab
 from pykolab.imap import IMAP
 
-# pylint: disable=invalid-name
 conf = pykolab.getConf()
 
-
-class Base:
+class Base(object):
     """
         Abstraction class for functions commonly shared between auth, imap, etc.
     """
     def __init__(self, *args, **kw):
-        if 'domain' in kw and kw'domain' is not None:
+        if kw.has_key('domain') and not kw'domain' == None:
             self.domain = kw'domain'
         else:
             self.domain = conf.get('kolab', 'primary_domain')
@@ -40,9 +38,9 @@
         self.imap = IMAP()
         self.domain_rootdns = {}
 
-    def config_get(self, key1, key2=None, default=None):
-        if key2 is not None:
-            return conf.get(key1, key2, default=default)
+    def config_get(self, key1, key2=None):
+        if not key2 == None:
+            return conf.get(key1, key2)
 
         if conf.has_option(self.domain, key1):
             return conf.get(self.domain, key1)
@@ -57,11 +55,11 @@
         if conf.has_option('kolab', key1):
             return conf.get('kolab', key1)
 
-        return default
+        return None
 
-    def config_get_list(self, key1, key2=None, default=None):
-        if key2 is not None:
-            return conf.get_list(key1, key2, default=default)
+    def config_get_list(self, key1, key2=None):
+        if not key2 == None:
+            return conf.get_list(key1, key2)
 
         if conf.has_option(self.domain, key1):
             return conf.get_list(self.domain, key1)
@@ -76,11 +74,11 @@
         if conf.has_option('kolab', key1):
             return conf.get_list('kolab', key1)
 
-        return default
+        return None
 
-    def config_get_raw(self, key1, key2=None, default=None):
-        if key2 is not None:
-            return conf.get_raw(key1, key2, default=default)
+    def config_get_raw(self, key1, key2=None):
+        if not key2 == None:
+            return conf.get_raw(key1, key2)
 
         if conf.has_option(self.domain, key1):
             return conf.get_raw(self.domain, key1)
@@ -95,4 +93,5 @@
         if conf.has_option('kolab', key1):
             return conf.get_raw('kolab', key1)
 
-        return default
+        return None
+

pykolab-0.8.23.tar.gz/pykolab/cli/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/cli/__init__.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_acl_cleanup.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_acl_cleanup.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_add_alias.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_add_alias.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -41,10 +39,10 @@
 try:
 secondary_rcpt_address = conf.cli_args.pop(0)
 except:
- print(_("Specify the (new) alias address"), file=sys.stderr)
+ print >> sys.stderr, _("Specify the (new) alias address")
 sys.exit(1)
 except:
- print(_("Specify the existing recipient address"), file=sys.stderr)
+ print >> sys.stderr, _("Specify the existing recipient address")
 sys.exit(1)
 
 if len(primary_rcpt_address.split('@')) > 1:
@@ -64,29 +62,29 @@
 secondary_rcpt_domain = conf.get('kolab', 'primary_domain')
 
 # Check if either is in fact a domain
- if not primary_rcpt_domain.lower() in domains:
- print(_("Domain %r is not a local domain") % (primary_rcpt_domain), file=sys.stderr)
+ if not primary_rcpt_domain.lower() in domains.keys():
+ print >> sys.stderr, _("Domain %r is not a local domain") % (primary_rcpt_domain)
 sys.exit(1)
 
- if not secondary_rcpt_domain.lower() in domains:
- print(_("Domain %r is not a local domain") % (secondary_rcpt_domain), file=sys.stderr)
+ if not secondary_rcpt_domain.lower() in domains.keys():
+ print >> sys.stderr, _("Domain %r is not a local domain") % (secondary_rcpt_domain)
 sys.exit(1)
 
 if not primary_rcpt_domain == secondary_rcpt_domain:
 if not domainsprimary_rcpt_domain == domainssecondary_rcpt_domain:
- print(_("Primary and secondary domain do not have the same parent domain"), file=sys.stderr)
+ print >> sys.stderr, _("Primary and secondary domain do not have the same parent domain")
 sys.exit(1)
 
 primary_recipient_dn = auth.find_recipient(primary_rcpt_address)
 
 if primary_recipient_dn == or len(primary_recipient_dn) == 0:
- print(_("No such recipient %r") % (primary_rcpt_address), file=sys.stderr)
+ print >> sys.stderr, _("No such recipient %r") % (primary_rcpt_address)
 sys.exit(1)
 
 secondary_recipient_dn = auth.find_recipient(secondary_rcpt_address)
 
 if not secondary_recipient_dn == and not len(secondary_recipient_dn) == 0:
- print(_("Recipient for alias %r already exists") % (secondary_rcpt_address), file=sys.stderr)
+ print >> sys.stderr, _("Recipient for alias %r already exists") % (secondary_rcpt_address)
 sys.exit(1)
 
 rcpt_attrs = conf.get_list('ldap', 'mail_attributes')
@@ -96,18 +94,18 @@
 if len(rcpt_attrs) >= 2:
 secondary_rcpt_attr = rcpt_attrs1
 else:
- print(_("Environment is not configured for " + \
- "users to hold secondary mail attributes"), file=sys.stderr)
+ print >> sys.stderr, _("Environment is not configured for " + \
+ "users to hold secondary mail attributes")
 
 sys.exit(1)
 
 primary_recipient = auth.get_entry_attributes(primary_rcpt_domain, primary_recipient_dn, rcpt_attrs)
 
- if primary_rcpt_attr not in primary_recipient:
- print(_("Recipient %r is not the primary recipient for address %r") % (primary_recipient, primary_rcpt_address), file=sys.stderr)
+ if not primary_recipient.has_key(primary_rcpt_attr):
+ print >> sys.stderr, _("Recipient %r is not the primary recipient for address %r") % (primary_recipient, primary_rcpt_address)
 sys.exit(1)
 
- if secondary_rcpt_attr not in primary_recipient:
+ if not primary_recipient.has_key(secondary_rcpt_attr):
 auth.set_entry_attributes(primary_rcpt_domain, primary_recipient_dn, {secondary_rcpt_attr: secondary_rcpt_address })
 else:
 if isinstance(primary_recipientsecondary_rcpt_attr, basestring):

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_add_domain.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_add_domain.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_add_user_subscription.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_add_user_subscription.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_check_quota.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_check_quota.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -72,7 +70,7 @@
 domains = auth.list_domains()
 
 folders = 
- for domain in domains:
+ for domain in domains.keys():
 folders = imap.lm("user/%%@%s" % (domain))
 
 domain_auth = Auth(domain=domain)
@@ -83,7 +81,7 @@
 user_dn = domain_auth.find_recipient(login)
 
 if user_dn == None:
- print(_("No such user %s") % (login), file=sys.stderr)
+ print >> sys.stderr, _("No such user %s") % (login)
 continue
 
 if len(login.split('@')) > 1:
@@ -97,14 +95,14 @@
 user_quota = None
 
 if user_quota == None:
- print(_("No quota for user %s") % (login), file=sys.stderr)
+ print >> sys.stderr, _("No quota for user %s") % (login)
 continue
 
 try:
 (used, quota) = imap.get_quota(folder)
 
 if not (int)(quota) == (int)(user_quota):
- print(_("user quota does not match for %s (IMAP: %d, LDAP: %d)") % (login, (int)(quota), (int)(user_quota)), file=sys.stderr)
+ print >> sys.stderr, _("user quota does not match for %s (IMAP: %d, LDAP: %d)") % (login, (int)(quota), (int)(user_quota))
 
 except:
 pass

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_count_domain_mailboxes.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_count_domain_mailboxes.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_create_mailbox.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_create_mailbox.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_delete_domain.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_delete_domain.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_delete_mailbox.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_delete_mailbox.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -43,7 +41,7 @@
 """
 
 if len(conf.cli_args) < 1:
- print(_("No mailbox specified"), file=sys.stderr)
+ print >> sys.stderr, _("No mailbox specified")
 sys.exit(1)
 
 imap = IMAP()
@@ -56,17 +54,17 @@
 folders = imap.list_folders(folder)
 
 if len(folders) < 1:
- print(_("No such folder(s): %s") % (folder), file=sys.stderr)
+ print >> sys.stderr, _("No such folder(s): %s") % (folder)
 
 delete_folders.extend(folders)
 
 if len(delete_folders) == 0:
- print(_("No folders to delete."), file=sys.stderr)
+ print >> sys.stderr, _("No folders to delete.")
 sys.exit(1)
 
 for delete_folder in delete_folders:
 try:
 imap.delete_mailfolder(delete_folder)
- except Exception:
+ except Exception, errmsg:
 log.error(_("Could not delete mailbox '%s'") % (delete_folder))

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_delete_mailbox_acl.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_delete_mailbox_acl.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -43,10 +41,10 @@
 folder = conf.cli_args.pop(0)
 try:
 identifier = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, errmsg:
 identifier = utils.ask_question(_("ACI Subject"))
 
- except IndexError:
+ except IndexError, errmsg:
 folder = utils.ask_question(_("Folder name"))
 quota = utils.ask_question(_("ACI Subject"))
 
@@ -59,13 +57,13 @@
 imap.connect(domain=domain)
 
 if not imap.has_folder(folder):
- print(_("No such folder %r") % (folder), file=sys.stderr)
+ print >> sys.stderr, _("No such folder %r") % (folder)
 
 else:
- folders = imap.list_folders(folder)
+ folders = imap.lm(folder)
 for folder in folders:
 try:
 imap.set_acl(folder, identifier, '')
 except:
 # Mailbox no longer exists?
- pass
+ pass
\ No newline at end of file

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_export_mailbox.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_export_mailbox.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_find_domain.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_find_domain.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_deleted_mailboxes.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_deleted_mailboxes.py Changed

@@ -31,77 +31,43 @@
 log = pykolab.getLogger('pykolab.cli')
 conf = pykolab.getConf()
 
-
 def __init__():
     commands.register('list_deleted_mailboxes', execute)
 
-
 def cli_options():
     my_option_group = conf.add_cli_parser_option_group(_("CLI Options"))
-
-    my_option_group.add_option(
-        '--raw',
-        dest="raw",
-        action="store_true",
-        default=False,
-        help=_("Display raw IMAP UTF-7 folder names")
-    )
-
-    my_option_group.add_option(
-        '--server',
-        dest="connect_server",
-        action="store",
-        default=None,
-        metavar="SERVER",
-        help=_("List mailboxes on server SERVER only.")
-    )
-
+    my_option_group.add_option( '--raw',
+                                dest    = "raw",
+                                action  = "store_true",
+                                default = False,
+                                help    = _("Display raw IMAP UTF-7 folder names"))
+
+    my_option_group.add_option( '--server',
+                                dest    = "connect_server",
+                                action  = "store",
+                                default = None,
+                                metavar = "SERVER",
+                                help    = _("List mailboxes on server SERVER only."))
 
 def execute(*args, **kw):
     """
         List deleted mailboxes
     """
+    imap = IMAP()
+    imap.connect()
+
+    auth = Auth()
+    auth.connect()
+
+    domains = auth.list_domains()
 
     folders = 
-    searches = 
+    for domain in list(set(domains.keys())):
+        folders.extend(imap.lm("DELETED/*@%s" % (domain)))
 
-    imap = IMAP()
+    folders.extend(imap.lm("DELETED/*"))
 
-    if conf.connect_server is not None:
-        imap.connect(server=conf.connect_server)
-    else:
-        imap.connect()
-
-    # See if conf.cli_args components make sense.
-    for arg in conf.cli_args:
-        if arg == '*':
-            searches.append(arg)
-        if arg.startswith('user'):
-            searches.append(arg)
-        if arg.startswith('shared'):
-            searches.append(arg)
-        if arg.startswith('DELETED'):
-            searches.append(arg)
-        if arg.startswith('news'):
-            searches.append(arg)
-
-    if len(searches) == 0:
-        auth = Auth()
-        auth.connect()
-
-        domains = auth.list_domains()
-
-        folders = 
-        for domain in list(set(domains.keys())):
-            folders.extend(imap.lm("DELETED/*@%s" % (domain)))
-
-        folders.extend(imap.lm("DELETED/*"))
-    else:
-        for search in searches:
-            log.debug(_("Appending folder search for %r") % (search), level=8)
-            folders.extend(imap.lm(imap_utf7.encode(search)))
-
-    print("Deleted folders:")
+    print "Deleted folders:"
 
     for folder in folders:
         utf8_folder = imap_utf7.decode(folder).encode('utf-8')
@@ -109,6 +75,6 @@
         ts = datetime.datetime.fromtimestamp(int(mbox_parts'hex_timestamp', 16))
 
         if not conf.raw:
-            print("%s (Deleted at %s)" % (utf8_folder, ts))
+            print "%s (Deleted at %s)" % (utf8_folder, ts)
         else:
-            print("%s (Deleted at %s)" % (folder, ts))
+            print "%s (Deleted at %s)" % (folder, ts)

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_domain_mailboxes.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_domain_mailboxes.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_domains.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_domains.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_mailbox_acls.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_mailbox_acls.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -41,7 +39,7 @@
 def execute(*args, **kw):
 try:
 folder = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, errmsg:
 folder = utils.ask_question(_("Folder name"))
 
 if len(folder.split('@')) > 1:
@@ -53,15 +51,15 @@
 imap.connect(domain=domain)
 
 if not imap.has_folder(folder):
- print(_("No such folder %r") % (folder), file=sys.stderr)
+ print >> sys.stderr, _("No such folder %r") % (folder)
 
 else:
 acls = 
 folders = imap.list_folders(folder)
 for folder in folders:
- print("Folder", folder)
+ print "Folder", folder
 acls = imap.list_acls(folder)
 
- for acl in acls:
- print(" %-13s %s" %(aclsacl, acl))
+ for acl in acls.keys():
+ print " %-13s %s" %(aclsacl, acl)

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_mailbox_metadata.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_mailbox_metadata.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -33,7 +31,7 @@
 conf = pykolab.getConf()
 
 def __init__():
- commands.register('list_mailbox_metadata', execute, aliases='lmm', description=description())
+ commands.register('list_mailbox_metadata', execute, description=description())
 
 def cli_options():
 my_option_group = conf.add_cli_parser_option_group(_("CLI Options"))
@@ -52,7 +50,7 @@
 def execute(*args, **kw):
 try:
 folder = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, errmsg:
 folder = utils.ask_question(_("Folder name"))
 
 if len(folder.split('@')) > 1:
@@ -79,19 +77,19 @@
 imap.connect(domain=domain)
 
 if not imap.has_folder(folder):
- print(_("No such folder %r") % (folder), file=sys.stderr)
+ print >> sys.stderr, _("No such folder %r") % (folder)
 
 else:
 metadata = 
 folders = imap.list_folders(folder)
 for folder in folders:
- print("Folder", folder)
+ print "Folder", folder
 
 metadata = imap.get_metadata(folder)
 
- if folder in metadata:
- for annotation in metadatafolder:
- print(" %-49s %s" % (
+ if metadata.has_key(folder):
+ for annotation in metadatafolder.keys():
+ print " %-49s %s" % (
 annotation,
 metadatafolderannotation
- ))
+ )

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_mailboxes.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_mailboxes.py Changed

@@ -28,37 +28,28 @@
 log = pykolab.getLogger('pykolab.cli')
 conf = pykolab.getConf()
 
-
 def __init__():
     commands.register('list_mailboxes', execute, description=description(), aliases='lm')
 
-
 def description():
     return "List mailboxes.\n" + \
         "%-28s" % ('') + \
         "Use wildcards '*' and '%' for more control.\n"
 
-
 def cli_options():
     my_option_group = conf.add_cli_parser_option_group(_("CLI Options"))
-
-    my_option_group.add_option(
-        '--raw',
-        dest="raw",
-        action="store_true",
-        default=False,
-        help=_("Display raw IMAP UTF-7 folder names")
-    )
-
-    my_option_group.add_option(
-        '--server',
-        dest="connect_server",
-        action="store",
-        default=None,
-        metavar="SERVER",
-        help=_("List mailboxes on server SERVER only.")
-    )
-
+    my_option_group.add_option( '--raw',
+                                dest    = "raw",
+                                action  = "store_true",
+                                default = False,
+                                help    = _("Display raw IMAP UTF-7 folder names"))
+
+    my_option_group.add_option( '--server',
+                                dest    = "connect_server",
+                                action  = "store",
+                                default = None,
+                                metavar = "SERVER",
+                                help    = _("List mailboxes on server SERVER only."))
 
 def execute(*args, **kw):
     """
@@ -81,7 +72,7 @@
             searches.append(arg)
 
     if len(searches) == 0:
-        searches = ''
+        searches =  '' 
 
     imap = IMAP()
 
@@ -98,6 +89,6 @@
 
     for folder in folders:
         if not conf.raw:
-            print(imap_utf7.decode(folder))
+            print imap_utf7.decode(folder)
         else:
-            print(folder)
+            print folder

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_messages.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_messages.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_ous.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_ous.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_quota.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_quota.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -53,7 +51,7 @@
 
 try:
 quota_folder = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, e:
 quota_folder = '*'
 
 imap = IMAP()
@@ -69,36 +67,36 @@
 for quota_folder in quota_folders:
 try:
 (used, quota) = imap.get_quota(quota_folder)
- print("Folder: %s" % (quota_folder))
+ print "Folder: %s" % (quota_folder)
 if not used == None and not quota == None:
 if quota == 0:
- print(_("The quota for folder %s is set to literally allow 0KB of storage.") % (quota_folder), file=sys.stderr)
- print("%d (Used: %d, Percentage: %s)" % (quota, used, u'\u221E'))
+ print >> sys.stderr, _("The quota for folder %s is set to literally allow 0KB of storage.") % (quota_folder)
+ print "%d (Used: %d, Percentage: %s)" % (quota, used, u'\u221E')
 else:
 percentage = round(((float)(used)/(float)(quota)) * 100.0, 1)
- print("%d (Used: %d, Percentage: %d)" % (quota, used, percentage))
+ print "%d (Used: %d, Percentage: %d)" % (quota, used, percentage)
 else:
 if used == None:
- print("%d (Used: %d, Percentage: %d)" % (quota, 0, 0))
+ print "%d (Used: %d, Percentage: %d)" % (quota, 0, 0)
 else:
- print("No quota")
+ print "No quota"
 except:
 try:
 (quota_root, used, quota) = imap.get_quota_root(quota_folder)
- print("Folder: %s" % (quota_folder))
+ print "Folder: %s" % (quota_folder)
 if not quota_root == None and not used == None and not quota == None:
 if quota == 0:
- print(_("The quota for folder %s is set to literally allow 0KB of storage.") % (quota_folder), file=sys.stderr)
- print("%d (Used: %d, Percentage: %d)" % (quota, used, u'\u221E'))
+ print >> sys.stderr, _("The quota for folder %s is set to literally allow 0KB of storage.") % (quota_folder)
+ print "%d (Used: %d, Percentage: %d)" % (quota, used, u'\u221E')
 else:
 percentage = round(((float)(used)/(float)(quota)) * 100.0, 1)
- print("%d (Root: %s, Used: %d, Percentage: %d)" % (quota, quota_root, used, percentage))
+ print "%d (Root: %s, Used: %d, Percentage: %d)" % (quota, quota_root, used, percentage)
 else:
 if used == None and not quota_root == None:
- print("%d (Root: %s, Used: %d, Percentage: %d)" % (quota, quota_root, 0, 0))
+ print "%d (Root: %s, Used: %d, Percentage: %d)" % (quota, quota_root, 0, 0)
 else:
- print("No quota")
+ print "No quota"
 except:
- print("Folder: %s" % (quota_folder))
- print("No quota root")
+ print "Folder: %s" % (quota_folder)
+ print "No quota root"

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_user_subscriptions.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_user_subscriptions.py Changed

@@ -30,7 +30,7 @@
 conf = pykolab.getConf()
 
 def __init__():
-    commands.register('list_user_subscriptions', execute, aliases='lus', description=description())
+    commands.register('list_user_subscriptions', execute, description=description())
 
 def cli_options(*args, **kw):
     my_option_group = conf.add_cli_parser_option_group(_("CLI Options"))
@@ -56,10 +56,10 @@
         user = conf.cli_args.pop(0)
         try:
             folder_pattern = conf.cli_args.pop(0)
-        except IndexError:
+        except IndexError, errmsg:
             pass
 
-    except IndexError:
+    except IndexError, errmsg:
         user = utils.ask_question(_("User ID"))
 
     if len(user.split('@')) > 1:
@@ -91,14 +91,14 @@
 
         if len(unsubscribed_folders) > 0:
             if not conf.raw:
-                print("\n".join(imap_utf7.decode(x) for x in unsubscribed_folders))
+                print "\n".join(imap_utf7.decode(x) for x in unsubscribed_folders)
             else:
-                print("\n".join(unsubscribed_folders))
+                print "\n".join(unsubscribed_folders)
         else:
-            print(_("No unsubscribed folders for user %s") % (user))
+            print _("No unsubscribed folders for user %s") % (user)
 
     else:
         if not conf.raw:
-            print("\n".join(imap_utf7.decode(x) for x in subscribed_folders))
+            print "\n".join(imap_utf7.decode(x) for x in subscribed_folders)
         else:
-            print("\n".join(subscribed_folders))
+            print "\n".join(subscribed_folders)

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_list_users.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_list_users.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_mailbox_cleanup.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_mailbox_cleanup.py Changed

@@ -17,6 +17,9 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
+import ldap
+import sys
+
 import commands
 
 import pykolab
@@ -29,46 +32,22 @@
 log = pykolab.getLogger('pykolab.cli')
 conf = pykolab.getConf()
 
-
 def __init__():
 commands.register('mailbox_cleanup', execute, description=description())
 
-
 def cli_options():
 my_option_group = conf.add_cli_parser_option_group(_("CLI Options"))
 my_option_group.add_option(
- '--dry-run',
- dest="dryrun",
- action="store_true",
- default=False,
- help=_(
- "Do not actually delete mailboxes, but report what mailboxes would have been deleted."
+ '--dry-run',
+ dest = "dryrun",
+ action = "store_true",
+ default = False,
+ help = _("Do not actually delete mailboxes, but report what mailboxes would have been deleted.")
 )
- )
-
- my_option_group.add_option(
- '--server',
- dest="connect_server",
- action="store",
- default=None,
- metavar="SERVER",
- help=_("Evaluate mailboxes on server SERVER only.")
- )
-
- my_option_group.add_option(
- '--with-acls',
- dest="with_acls",
- action="store",
- default=False,
- help=_("Evaluate ACLs on mailboxes as well.")
- )
-
 
 def description():
 return _("Clean up mailboxes that do no longer have an owner.")
 
-
-# pylint: disable=too-many-branches,too-many-locals,too-many-statements
 def execute(*args, **kw):
 """
 List mailboxes
@@ -78,11 +57,7 @@
 domains = auth.list_domains()
 
 imap = IMAP()
-
- if conf.connect_server is not None:
- imap.connect(server=conf.connect_server)
- else:
- imap.connect()
+ imap.connect()
 
 domain_folders = {}
 
@@ -90,21 +65,20 @@
 # Placeholder for subjects that would have already been deleted
 subjects_deleted = 
 
- for domain in domains:
+ for domain in domains.keys():
 domain_foldersdomain = imap.lm("user/%%@%s" % (domain))
 
- for domain in domain_folders:
+ for domain in domain_folders.keys():
 auth = Auth(domain=domain)
 auth.connect(domain)
 
 for folder in domain_foldersdomain:
- user = folder.replace('user/', '')
+ user = folder.replace('user/','')
 
 try:
 recipient = auth.find_recipient(user)
- # pylint: disable=bare-except
- except:
- if user not in subjects_deleted and conf.dryrun:
+ except ldap.NO_SUCH_OBJECT, errmsg:
+ if not user in subjects_deleted and conf.dryrun:
 subjects_deleted.append(user)
 
 if conf.dryrun:
@@ -114,7 +88,7 @@
 continue
 
 if len(recipient) == 0 or recipient == :
- if user not in subjects_deleted and conf.dryrun:
+ if not user in subjects_deleted and conf.dryrun:
 subjects_deleted.append(user)
 
 if conf.dryrun:
@@ -123,30 +97,23 @@
 log.info(_("Deleting folder 'user/%s'") % (user))
 try:
 imap.dm(folder)
- # pylint: disable=bare-except
 except:
 log.error(_("Error deleting folder 'user/%s'") % (user))
 else:
 log.debug(_("Valid recipient found for 'user/%s'") % (user), level=6)
 
- if user not in subjects:
+ if not user in subjects:
 subjects.append(user)
 
 imap_domains = 
 folders = imap.lm()
-
 for folder in folders:
- components = folder.split('/')
-
- if len(components) < 2:
- log.error("Not enough components for folder %s" % (folder))
- continue
-
+ namespace = folder.split('/')0
 mailbox = folder.split('/')1
 
 if len(mailbox.split('@')) > 1:
 domain = mailbox.split('@')1
- if domain not in domains and domain not in imap_domains:
+ if not domain in domains.keys() and not domain in imap_domains:
 imap_domains.append(domain)
 
 for domain in imap_domains:
@@ -154,7 +121,7 @@
 
 user = folder.replace('user/', '')
 
- if user not in subjects_deleted and conf.dryrun:
+ if not user in subjects_deleted and conf.dryrun:
 subjects_deleted.append(user)
 
 if conf.dryrun:
@@ -163,7 +130,6 @@
 log.info(_("Deleting folder '%s'") % (folder))
 try:
 imap.dm(folder)
- # pylint: disable=bare-except
 except:
 log.error(_("Error deleting folder '%s'") % (folder))
 
@@ -174,55 +140,51 @@
 log.info(_("Deleting folder '%s'") % (folder))
 try:
 imap.dm(folder)
- # pylint: disable=bare-except
 except:
 log.error(_("Error deleting folder '%s'") % (folder))
 
- if not conf.with_acls:
- return
-
 for folder in x for x in imap.lm() if not x.startswith('DELETED/'):
 folder = imap_utf7.decode(folder)
 acls = imap.list_acls(folder)
 
- for subject in acls:
+ for subject in acls.keys():
 if subject == 'anyone':
 log.info(
- _("Skipping removal of ACL %s for subject %s on folder %s") % (
- aclssubject,
- subject,
- folder
+ _("Skipping removal of ACL %s for subject %s on folder %s") % (
+ aclssubject,
+ subject,
+ folder
+ )
 )
- )
 
 continue
 
- if subject not in subjects and subject not in subjects_deleted:
+ if not subject in subjects and not subject in subjects_deleted:
 if conf.dryrun:
 log.info(
- _("Would have deleted ACL %s for subject %s on folder %s") % (
- aclssubject,
- subject,
- folder
+ _("Would have deleted ACL %s for subject %s on folder %s") % (
+ aclssubject,
+ subject,
+ folder
+ )
 )
- )
 else:
 log.info(
- _("Deleting ACL %s for subject %s on folder %s") % (
- aclssubject,
- subject,
- folder
+ _("Deleting ACL %s for subject %s on folder %s") % (
+ aclssubject,
+ subject,
+ folder
+ )
 )
- )
 
 try:
- imap.set_acl(folder, subject, '')
- # pylint: disable=bare-except
+ imap.set_acl(folder, aci_subject, '')
 except:
 log.error(
- _("Error removing ACL %s for subject %s from folder %s") % (
- aclssubject,
- subject,
- folder
+ _("Error removing ACL %s for subject %s from folder %s") % (
+ aclssubject,
+ subject,
+ folder
+ )
 )
- )
+

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_remove_mailaddress.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_remove_mailaddress.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -41,7 +39,7 @@
 def execute(*args, **kw):
 try:
 email_address = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, errmsg:
 email_address = utils.ask_question("Email address to remove")
 
 # Get the domain from the email address
@@ -74,7 +72,7 @@
 attributes = auth.get_entry_attributes(domain, recipient, mail_attributes)
 
 # See which attribute holds the value we're trying to remove
- for attribute in attributes:
+ for attribute in attributes.keys():
 if isinstance(attributesattribute, list):
 if email_address in attributesattribute:
 attributesattribute.pop(attributesattribute.index(email_address))
@@ -89,7 +87,7 @@
 pass
 
 else:
- print(_("Found the following recipients:"), file=sys.stderr)
+ print >> sys.stderr, _("Found the following recipients:")
 
 for recipient in recipients:
- print(recipient)
+ print recipient

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_remove_user_subscription.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_remove_user_subscription.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -33,12 +31,7 @@
 conf = pykolab.getConf()
 
 def __init__():
- commands.register(
- 'remove_user_subscription',
- execute,
- aliases='rus', 'unsubscribe',
- description=description()
- )
+ commands.register('remove_user_subscription', execute, description=description())
 
 def description():
 return _("Unsubscribe a user from a folder.")
@@ -50,10 +43,10 @@
 user = conf.cli_args.pop(0)
 try:
 folder_pattern = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, errmsg:
 folder_pattern = utils.ask_question(_("Folder pattern"))
 
- except IndexError:
+ except IndexError, errmsg:
 user = utils.ask_question(_("User ID"))
 folder_pattern = utils.ask_question(_("Folder pattern"))
 
@@ -75,9 +68,9 @@
 imap.login_plain(admin_login, admin_password, user)
 
 if not imap.has_folder(folder_pattern):
- print(_("Cannot subscribe user to folder %r:") % (folder_pattern), \
- _("No such folder"), \
- file=sys.stderr)
+ print >> sys.stderr, \
+ _("Cannot subscribe user to folder %r:") % (folder_pattern), \
+ _("No such folder")
 sys.exit(1)
 
 _folders = imap.lm(folder_pattern)
@@ -90,14 +83,14 @@
 unsubscribed_folders.append(_folder)
 
 if len(unsubscribed_folders) > 0:
- print(_("Successfully unsubscribed user %s from the following folders:") % (
+ print _("Successfully unsubscribed user %s from the following folders:") % (
 user
- ))
+ )
 
- print("\n".join(unsubscribed_folders))
+ print "\n".join(unsubscribed_folders)
 else:
- print(_("User %s was not unsubscribed from any folders.") % (
+ print >> sys.stderr, _("User %s was not unsubscribed from any folders.") % (
 user
- ), file=sys.stderr)
+ )
 
 sys.exit(1)

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_rename_mailbox.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_rename_mailbox.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -48,12 +46,12 @@
 target_folder = conf.cli_args.pop(0)
 try:
 partition = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, errmsg:
 partition = None
- except IndexError:
- print(_("No target mailbox name specified"), file=sys.stderr)
- except IndexError:
- print(_("No source mailbox name specified"), file=sys.stderr)
+ except IndexError, errmsg:
+ print >> sys.stderr, _("No target mailbox name specified")
+ except IndexError, errmsg:
+ print >> sys.stderr, _("No source mailbox name specified")
 sys.exit(1)
 
 if len(source_folder.split('@')) > 1:
@@ -65,11 +63,11 @@
 imap.connect(domain=domain)
 
 if not imap.has_folder(source_folder):
- print(_("Source folder %r does not exist") % (source_folder), file=sys.stderr)
+ print >> sys.stderr, _("Source folder %r does not exist") % (source_folder)
 sys.exit(1)
 
 if imap.has_folder(target_folder) and partition == None:
- print(_("Target folder %r already exists") % (target_folder), file=sys.stderr)
+ print >> sys.stderr, _("Target folder %r already exists") % (target_folder)
 sys.exit(1)
 
 imap.imap.rename(imap.folder_utf7(source_folder), imap.folder_utf7(target_folder), partition)

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_server_info.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_server_info.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_set_mailbox_acl.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_set_mailbox_acl.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -45,14 +43,14 @@
 identifier = conf.cli_args.pop(0)
 try:
 acl = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, errmsg:
 acl = utils.ask_question(_("ACI Permissions"))
 
- except IndexError:
+ except IndexError, errmsg:
 identifier = utils.ask_question(_("ACI Subject"))
 acl = utils.ask_question(_("ACI Permissions"))
 
- except IndexError:
+ except IndexError, errmsg:
 folder = utils.ask_question(_("Folder name"))
 identifier = utils.ask_question(_("ACI Subject"))
 acl = utils.ask_question(_("ACI Permissions"))
@@ -66,7 +64,7 @@
 imap.connect(domain=domain)
 
 if not imap.has_folder(folder):
- print(_("No such folder %r") % (folder), file=sys.stderr)
+ print >> sys.stderr, _("No such folder %r") % (folder)
 
 else:
 folders = imap.list_folders(folder)

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_set_mailbox_metadata.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_set_mailbox_metadata.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -57,14 +55,14 @@
 metadata_path = conf.cli_args.pop(0)
 try:
 metadata_value = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, errmsg:
 metadata_value = utils.ask_question(_("Metadata value"))
 
- except IndexError:
+ except IndexError, errmsg:
 metadata_path = utils.ask_question(_("Metadata path"))
 metadata_value = utils.ask_question(_("Metadata value"))
 
- except IndexError:
+ except IndexError, errmsg:
 folder = utils.ask_question(_("Folder name"))
 metadata_path = utils.ask_question(_("Metadata path"))
 metadata_value = utils.ask_question(_("Metadata value"))
@@ -93,7 +91,7 @@
 imap.connect(domain=domain)
 
 if not imap.has_folder(folder):
- print(_("No such folder %r") % (folder), file=sys.stderr)
+ print >> sys.stderr, _("No such folder %r") % (folder)
 
 else:
 folders = imap.lm(imap_utf7.encode(folder))

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_set_quota.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_set_quota.py Changed

@@ -17,8 +17,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -43,10 +41,10 @@
         folder = conf.cli_args.pop(0)
         try:
             quota = conf.cli_args.pop(0)
-        except IndexError:
+        except IndexError, errmsg:
             quota = utils.ask_question(_("New quota"))
 
-    except IndexError:
+    except IndexError, errmsg:
         folder = utils.ask_question(_("Folder name"))
         quota = utils.ask_question(_("New quota"))
 
@@ -59,10 +57,10 @@
     imap.connect(domain=domain)
 
     if not imap.has_folder(folder):
-        print(_("No such folder %r") % (folder), file=sys.stderr)
+        print >> sys.stderr, _("No such folder %r") % (folder)
         sys.exit(1)
 
     for _folder in imap.lm(imap.folder_utf7(folder)):
         imap.set_quota(_folder, quota)
-        print("Quota for folder '%s' set to %d" % (_folder, int(quota)), file=sys.stdout)
+        print >> sys.stdout, "Quota for folder '%s' set to %d" % (_folder, int(quota))

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_sync.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_sync.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_sync_mailhost_attrs.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_sync_mailhost_attrs.py Changed

@@ -71,11 +71,8 @@
     auth = Auth()
     auth.connect()
 
-    result_attribute = conf.get('cyrus-sasl', 'result_attribute')
-    if result_attribute is None:
-        result_attribute = 'mail'
-
     domains = auth.list_domains()
+
     folders = imap.lm()
 
     imap_domains_not_domains = 
@@ -113,7 +110,7 @@
                             log.info(_("Deleting mailbox '%s' because it has no recipients") % (folder))
                             try:
                                 imap.dm(folder)
-                            except Exception as errmsg:
+                            except Exception, errmsg:
                                 log.error(_("An error occurred removing mailbox %r: %r") % (folder, errmsg))
                         else:
                             log.info(_("Not automatically deleting shared folder '%s'") % (folder))
@@ -121,7 +118,7 @@
                     log.warning(_("No recipients for '%s' (use --delete to delete)!") % (r_folder))
 
     for primary in list(set(domains.values())):
-        secondaries = x for x in domains if domainsx == primary
+        secondaries = x for x in domains.keys() if domainsx == primary
 
         folders = 
 
@@ -143,7 +140,7 @@
                 recipient = auth.find_folder_resource(folder)
             else:
                 r_folder = '/'.join(folder.split('/')1:)
-                recipient = auth.find_recipient(r_folder, search_attrs=result_attribute)
+                recipient = auth.find_recipient(r_folder)
 
             if (isinstance(recipient, list)):
                 if len(recipient) > 1:
@@ -161,7 +158,7 @@
                                 log.info(_("Deleting mailbox '%s' because it has no recipients") % (folder))
                                 try:
                                     imap.dm(folder)
-                                except Exception as errmsg:
+                                except Exception, errmsg:
                                     log.error(_("An error occurred removing mailbox %r: %r") % (folder, errmsg))
                             else:
                                 log.info(_("Not automatically deleting shared folder '%s'") % (folder))
@@ -174,7 +171,7 @@
 
             if not server == mailhost:
                 if conf.dry_run:
-                    print(folder, server, mailhost)
+                    print folder, server, mailhost
                 else:
                     auth.set_entry_attribute(primary, recipient, 'mailhost', server)
 
@@ -191,6 +188,6 @@
         if folder.startswith('shared/'):
             recipient = auth.find_folder_resource(folder)
         else:
-            recipient = auth.find_recipient('/'.join(folder.split('/')1:), search_attrs=result_attribute)
+            recipient = auth.find_recipient('/'.join(folder.split('/')1:))
 
-        print(folder, server, recipient)
+        print folder, server, recipient

pykolab-0.8.23.tar.gz/pykolab/cli/cmd_user_info.py -> pykolab-0.8.4.tar.gz/pykolab/cli/cmd_user_info.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import sys
 
 import commands
@@ -39,7 +37,7 @@
 
 try:
 user = conf.cli_args.pop(0)
- except IndexError:
+ except IndexError, errmsg:
 user = utils.ask_question(_("Email address"))
 
 result = wap_client.authenticate(username=conf.get("ldap", "bind_dn"), password=conf.get("ldap", "bind_pw"))
@@ -50,13 +48,13 @@
 user_info = wap_client.user_find({'mail':user})
 
 if user_info == None or not user_info:
- print(_("No such user %s") % (user), file=sys.stderr)
+ print >> sys.stderr, _("No such user %s") % (user)
 sys.exit(0)
 
 unic_attrs = 'displayname', 'givenname', 'cn', 'sn', 'ou', 'entrydn'
 
- for (k,v) in user_info.items():
+ for (k,v) in user_info.iteritems():
 if k in unic_attrs:
- print("%s: %s" % (k,v))
+ print "%s: %s" % (k,v)
 else:
- print("%s: %r" % (k,v))
+ print "%s: %r" % (k,v)

pykolab-0.8.23.tar.gz/pykolab/cli/commands.py -> pykolab-0.8.4.tar.gz/pykolab/cli/commands.py Changed

@@ -45,7 +45,7 @@
                 #print "exec(\"from %s import __init__ as %s_register\"" % (module_name,cmd_name)
                 try:
                     exec("from %s import __init__ as %s_register" % (module_name,cmd_name))
-                except ImportError:
+                except ImportError, errmsg:
                     pass
 
                 exec("%s_register()" % (cmd_name))
@@ -68,7 +68,7 @@
 
     __commands = {}
 
-    for command in commands:
+    for command in commands.keys():
         if isinstance(command, tuple):
             command_group, command = command
             __commandscommand_group = {
@@ -81,49 +81,49 @@
     _commands.sort()
 
     for _command in _commands:
-        if 'group' in __commands_command:
+        if __commands_command.has_key('group'):
             continue
 
-        if 'function' in __commands_command:
+        if __commands_command.has_key('function'):
             # This is a top-level command
             if not __commands_command'description' == None:
-                print("%-25s - %s" % (_command.replace('_','-'),__commands_command'description'))
+                print "%-25s - %s" % (_command.replace('_','-'),__commands_command'description')
             else:
-                print("%-25s" % (_command.replace('_','-')))
+                print "%-25s" % (_command.replace('_','-'))
 
     for _command in _commands:
-        if 'function' not in __commands_command:
+        if not __commands_command.has_key('function'):
             # This is a nested command
-            print("\n" + _("Command Group: %s") % (_command) + "\n")
+            print "\n" + _("Command Group: %s") % (_command) + "\n"
             ___commands = __commands_command.keys()
             ___commands.sort()
             for __command in ___commands:
                 if not __commands_command__command'description' == None:
-                    print("%-4s%-21s - %s" % ('',__command.replace('_','-'),__commands_command__command'description'))
+                    print "%-4s%-21s - %s" % ('',__command.replace('_','-'),__commands_command__command'description')
                 else:
-                    print("%-4s%-21s" % ('',__command.replace('_','-')))
+                    print "%-4s%-21s" % ('',__command.replace('_','-'))
 
 def execute(cmd_name, *args, **kw):
     if cmd_name == "":
         execute("help")
         sys.exit(0)
 
-    if cmd_name not in commands:
+    if not commands.has_key(cmd_name):
         log.error(_("No such command."))
         sys.exit(1)
 
-    if 'function' not in commandscmd_name and \
-        'group' not in commandscmd_name:
+    if not commandscmd_name.has_key('function') and \
+        not commandscmd_name.has_key('group'):
         log.error(_("No such command."))
         sys.exit(1)
 
-    if 'group' in commandscmd_name:
+    if commandscmd_name.has_key('group'):
         group = commandscmd_name'group'
         command_name = commandscmd_name'cmd_name'
         try:
             exec("from %s.cmd_%s import cli_options as %s_%s_cli_options" % (group,command_name,group,command_name))
             exec("%s_%s_cli_options()" % (group,command_name))
-        except ImportError:
+        except ImportError, e:
             pass
 
     else:
@@ -131,7 +131,7 @@
         try:
             exec("from cmd_%s import cli_options as %s_cli_options" % (command_name,command_name))
             exec("%s_cli_options()" % (command_name))
-        except ImportError:
+        except ImportError, errmsg:
             pass
 
     conf.finalize_conf()
@@ -163,7 +163,7 @@
     if isinstance(aliases, basestring):
         aliases = aliases
 
-    if command in commands:
+    if commands.has_key(command):
         log.fatal(_("Command '%s' already registered") % (command))
         sys.exit(1)
 
@@ -197,5 +197,5 @@
 ##
 
 def not_yet_implemented(*args, **kw):
-    print(_("Not yet implemented"))
+    print _("Not yet implemented")
     sys.exit(1)

pykolab-0.8.23.tar.gz/pykolab/cli/sieve/cmd_list.py -> pykolab-0.8.4.tar.gz/pykolab/cli/sieve/cmd_list.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/sieve/cmd_refresh.py -> pykolab-0.8.4.tar.gz/pykolab/cli/sieve/cmd_refresh.py Changed

@@ -125,28 +125,28 @@
 
     if not vacation_text_attr == None:
 
-        if vacation_active_attr in user:
+        if user.has_key(vacation_active_attr):
             vacation_active = utils.true_or_false(uservacation_active_attr)
         else:
             vacation_active = False
 
-        if vacation_text_attr in user:
+        if user.has_key(vacation_text_attr):
             vacation_text = uservacation_text_attr
         else:
             vacation_active = False
 
-        if vacation_uce_attr in user:
+        if user.has_key(vacation_uce_attr):
             vacation_uce = utils.true_or_false(uservacation_uce_attr)
         else:
             vacation_uce = False
 
-        if vacation_react_domains_attr in user:
+        if user.has_key(vacation_react_domains_attr):
             if isinstance(uservacation_react_domains_attr, list):
                 vacation_react_domains = uservacation_react_domains_attr
             else:
                 vacation_react_domains =  uservacation_react_domains_attr 
         else:
-            if vacation_noreact_domains_attr in user:
+            if user.has_key(vacation_noreact_domains_attr):
                 if isinstance(uservacation_noreact_domains_attr, list):
                     vacation_noreact_domains = uservacation_noreact_domains_attr
                 else:
@@ -159,7 +159,7 @@
     #
     dtf_active_attr = conf.get('sieve', 'deliver_to_folder_active')
     if not dtf_active_attr == None:
-        if dtf_active_attr in user:
+        if user.has_key(dtf_active_attr):
             dtf_active = utils.true_or_false(userdtf_active_attr)
         else:
             dtf_active = False
@@ -172,7 +172,7 @@
     if dtf_active:
         dtf_folder_name_attr = conf.get('sieve', 'deliver_to_folder_attr')
         if not dtf_folder_name_attr == None:
-            if dtf_folder_name_attr in user:
+            if user.has_key(dtf_folder_name_attr):
                 dtf_folder = userdtf_folder_name_attr
             else:
                 log.warning(_("Delivery to folder active, but no folder name attribute available for user %r") % (user))
@@ -204,14 +204,14 @@
 
     forward_active_attr = conf.get('sieve', 'forward_address_active')
     if not forward_active_attr == None:
-        if forward_active_attr in user:
+        if user.has_key(forward_active_attr):
             forward_active = utils.true_or_false(userforward_active_attr)
         else:
             forward_active = False
 
     if not forward_active == False:
         forward_address_attr = conf.get('sieve', 'forward_address_attr')
-        if forward_address_attr in user:
+        if user.has_key(forward_address_attr):
             if isinstance(userforward_address_attr, basestring):
                 forward_addresses =  userforward_address_attr 
             elif isinstance(userforward_address_attr, str):
@@ -224,14 +224,14 @@
 
         forward_keepcopy_attr = conf.get('sieve', 'forward_keepcopy_active')
         if not forward_keepcopy_attr == None:
-            if forward_keepcopy_attr in user:
+            if user.has_key(forward_keepcopy_attr):
                 forward_keepcopy = utils.true_or_false(userforward_keepcopy_attr)
             else:
                 forward_keepcopy = False
 
         forward_uce_attr = conf.get('sieve', 'forward_uce_active')
         if not forward_uce_attr == None:
-            if forward_uce_attr in user:
+            if user.has_key(forward_uce_attr):
                 forward_uce = utils.true_or_false(userforward_uce_attr)
             else:
                 forward_uce = False
@@ -356,7 +356,7 @@
 
     mgmt_script = mgmt_script.__str__()
 
-    log.debug(_("MANAGEMENT script for user %s contents: %r") % (address,mgmt_script), level=8)
+    log.debug(_("MANAGEMENT script for user %s contents: %r") % (address,mgmt_script), level=9)
 
     result = sieveclient.putscript("MANAGEMENT", mgmt_script)

pykolab-0.8.23.tar.gz/pykolab/cli/sieve/cmd_test.py -> pykolab-0.8.4.tar.gz/pykolab/cli/sieve/cmd_test.py Changed

@@ -89,7 +89,7 @@
 
     active, scripts = sieveclient.listscripts()
 
-    print("%s (active)" % (active))
+    print "%s (active)" % (active)
     
     _all_scripts =  active  + scripts
     _used_scripts =  active 
@@ -97,7 +97,7 @@
 
     _a_script = sieveclient.getscript(active)
 
-    print(_a_script)
+    print _a_script
 
     import sievelib.parser
 
@@ -107,23 +107,23 @@
     #print "%r" % (_a_parsed)
 
     if not _a_parsed:
-        print(_a_parser.error)
+        print _a_parser.error
 
-    print("%r" % (_a_parser.result))
+    print "%r" % (_a_parser.result)
 
     for _a_command in _a_parser.result:
-        print(_a_command.name, _a_command.arguments)
+        print _a_command.name, _a_command.arguments
         if len(_a_command.children) > 0:
             for _a_child in _a_command.children:
-                print("  ", _a_child.name, _a_child.arguments)
+                print "  ", _a_child.name, _a_child.arguments
 
         if _a_command.name == "include":
             if _a_command.arguments"script".strip('"') in scripts:
-                print("OK")
+                print "OK"
                 _used_scripts.append(_a_command.arguments"script".strip('"'))
             else:
-                print("Not OK")
+                print "Not OK"
 
     for script in scripts:
-        print(script)
+        print script

pykolab-0.8.23.tar.gz/pykolab/cli/telemetry/cmd_examine_command_issue.py -> pykolab-0.8.4.tar.gz/pykolab/cli/telemetry/cmd_examine_command_issue.py Changed

@@ -72,7 +72,7 @@
                 id=session.server_id
             ).first()
 
-    print(_("Session by %s on server %s") % (user.sasl_username,server.fqdn))
+    print _("Session by %s on server %s") % (user.sasl_username,server.fqdn)
 
     command_issues = db.query(
             telemetry.TelemetryCommandIssue
@@ -94,14 +94,14 @@
                 ).first()
 
         if command_issue.id == _command_issue.id:
-            print("=========")
+            print "========="
 
-        print("Client(%d): %s %s %s" % (
+        print "Client(%d): %s %s %s" % (
                 _command_issue.id,
                 _command_issue.command_tag,
                 command.command,
                 command_arg.command_arg
-            ))
+            )
 
         server_responses = db.query(
                 telemetry.TelemetryServerResponse
@@ -113,11 +113,11 @@
             server_response_lines = server_response.response.split('\n');
 
             for server_response_line in server_response_lines:
-                print("Server(%d): %s" % (
+                print "Server(%d): %s" % (
                         server_response.id,
                         server_response_line
-                    ))
+                    )
 
         if command_issue.id == _command_issue.id:
-            print("=========")
+            print "========="

pykolab-0.8.23.tar.gz/pykolab/cli/telemetry/cmd_examine_session.py -> pykolab-0.8.4.tar.gz/pykolab/cli/telemetry/cmd_examine_session.py Changed

@@ -97,7 +97,7 @@
 
         return
 
-    print(_("Session by %s on server %s") % (user.sasl_username,server.fqdn))
+    print _("Session by %s on server %s") % (user.sasl_username,server.fqdn)
 
     command_issues = db.query(
             telemetry.TelemetryCommandIssue
@@ -118,12 +118,12 @@
                     id=command_issue.command_arg_id
                 ).first()
 
-        print("Client(%d): %s %s %s" % (
+        print "Client(%d): %s %s %s" % (
                 command_issue.id,
                 command_issue.command_tag,
                 command.command,
                 command_arg.command_arg
-            ))
+            )
 
         server_responses = db.query(
                 telemetry.TelemetryServerResponse
@@ -134,8 +134,8 @@
         for server_response in server_responses:
             server_response_lines = server_response.response.split('\n');
             for server_response_line in server_response_lines:
-                print("Server(%d): %s" % (
+                print "Server(%d): %s" % (
                         server_response.id,
                         server_response_line
-                    ))
+                    )

pykolab-0.8.23.tar.gz/pykolab/cli/telemetry/cmd_list_sessions.py -> pykolab-0.8.4.tar.gz/pykolab/cli/telemetry/cmd_list_sessions.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/wap/cmd_system_capabilities.py -> pykolab-0.8.4.tar.gz/pykolab/cli/wap/cmd_system_capabilities.py Changed

pykolab-0.8.23.tar.gz/pykolab/cli/wap/cmd_user_types_list.py -> pykolab-0.8.4.tar.gz/pykolab/cli/wap/cmd_user_types_list.py Changed

pykolab-0.8.23.tar.gz/pykolab/conf/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/conf/__init__.py Changed

@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
 
 import logging
 import os
@@ -34,7 +33,6 @@
 
 log = pykolab.getLogger('pykolab.conf')
 
-
 class Conf(object):
 def __init__(self):
 """
@@ -55,7 +53,7 @@
 try:
 from pykolab.conf.entitlement import Entitlement
 entitlements = True
- except Exception:
+ except:
 entitlements = False
 pass
 
@@ -70,7 +68,7 @@
 # Create the options
 self.create_options()
 
- def finalize_conf(self, fatal=True):
+ def finalize_conf(self,fatal=True):
 
 self.create_options_from_plugins()
 self.parse_options(fatal=fatal)
@@ -85,16 +83,9 @@
 self.defaults = Defaults(self.plugins)
 
 # But, they should be available in our class as well
- for option in self.defaults.__dict__:
- log.debug(
- _("Setting %s to %r (from defaults)") % (
- option,
- self.defaults.__dict__option
- ),
- level=8
- )
-
- setattr(self, option, self.defaults.__dict__option)
+ for option in self.defaults.__dict__.keys():
+ log.debug(_("Setting %s to %r (from defaults)") % (option, self.defaults.__dict__option), level=8)
+ setattr(self,option,self.defaults.__dict__option)
 
 # This is where we check our parser for the defaults being set there.
 self.set_defaults_from_cli_options()
@@ -102,41 +93,21 @@
 self.options_set_from_config()
 
 # Also set the cli options
- if hasattr(self, 'cli_keywords') and self.cli_keywords is not None:
- for option in self.cli_keywords.__dict__:
+ if hasattr(self,'cli_keywords') and not self.cli_keywords == None:
+ for option in self.cli_keywords.__dict__.keys():
 retval = False
 if hasattr(self, "check_setting_%s" % (option)):
- exec(
- "retval = self.check_setting_%s(%r)" % (
- option,
- self.cli_keywords.__dict__option
- )
- )
-
- # The warning, error or confirmation dialog is in the check_setting_%s()
- # function
+ exec("retval = self.check_setting_%s(%r)" % (option, self.cli_keywords.__dict__option))
+
+ # The warning, error or confirmation dialog is in the check_setting_%s() function
 if not retval:
 continue
 
- log.debug(
- _("Setting %s to %r (from CLI, verified)") % (
- option,
- self.cli_keywords.__dict__option
- ),
- level=8
- )
-
- setattr(self, option, self.cli_keywords.__dict__option)
+ log.debug(_("Setting %s to %r (from CLI, verified)") % (option, self.cli_keywords.__dict__option), level=8)
+ setattr(self,option,self.cli_keywords.__dict__option)
 else:
- log.debug(
- _("Setting %s to %r (from CLI, not checked)") % (
- option,
- self.cli_keywords.__dict__option
- ),
- level=8
- )
-
- setattr(self, option, self.cli_keywords.__dict__option)
+ log.debug(_("Setting %s to %r (from CLI, not checked)") % (option, self.cli_keywords.__dict__option), level=8)
+ setattr(self,option,self.cli_keywords.__dict__option)
 
 def load_config(self, config):
 """
@@ -144,31 +115,31 @@
 file and checks, then sets everything it can find.
 """
 
- for section in self.defaults.__dict__:
+ for section in self.defaults.__dict__.keys():
 if section == 'testing':
 continue
 
 if not config.has_section(section):
 continue
 
- for key in self.defaults.__dict__section:
+ for key in self.defaults.__dict__section.keys():
 retval = False
 if not config.has_option(section, key):
 continue
 
 if isinstance(self.defaults.__dict__sectionkey, int):
- value = config.getint(section, key)
+ value = config.getint(section,key)
 elif isinstance(self.defaults.__dict__sectionkey, bool):
- value = config.getboolean(section, key)
+ value = config.getboolean(section,key)
 elif isinstance(self.defaults.__dict__sectionkey, str):
- value = config.get(section, key)
+ value = config.get(section,key)
 elif isinstance(self.defaults.__dict__sectionkey, list):
- value = eval(config.get(section, key))
+ value = eval(config.get(section,key))
 elif isinstance(self.defaults.__dict__sectionkey, dict):
- value = eval(config.get(section, key))
+ value = eval(config.get(section,key))
 
- if hasattr(self, "check_setting_%s_%s" % (section, key)):
- exec("retval = self.check_setting_%s_%s(%r)" % (section, key, value))
+ if hasattr(self,"check_setting_%s_%s" % (section,key)):
+ exec("retval = self.check_setting_%s_%s(%r)" % (section,key,value))
 if not retval:
 # We just don't set it, check_setting_%s should have
 # taken care of the error messages
@@ -176,25 +147,10 @@
 
 if not self.defaults.__dict__sectionkey == value:
 if key.count('password') >= 1:
- log.debug(
- _("Setting %s_%s to '****' (from configuration file)") % (
- section,
- key
- ),
- level=8
- )
-
+ log.debug(_("Setting %s_%s to '****' (from configuration file)") % (section,key), level=8)
 else:
- log.debug(
- _("Setting %s_%s to %r (from configuration file)") % (
- section,
- key,
- value
- ),
- level=8
- )
-
- setattr(self, "%s_%s" % (section, key), value)
+ log.debug(_("Setting %s_%s to %r (from configuration file)") % (section,key,value), level=8)
+ setattr(self,"%s_%s" % (section,key),value)
 
 def options_set_from_config(self):
 """
@@ -209,7 +165,7 @@
 # Other then default?
 self.config_file = self.defaults.config_file
 
- if hasattr(self, 'cli_keywords') and self.cli_keywords is not None:
+ if hasattr(self,'cli_keywords') and not self.cli_keywords == None:
 if not self.cli_keywords.config_file == self.defaults.config_file:
 self.config_file = self.cli_keywords.config_file
 
@@ -229,35 +185,28 @@
 retval = False
 
 if isinstance(self.defaults.__dict__'testing'key, int):
- value = config.getint('testing', key)
+ value = config.getint('testing',key)
 elif isinstance(self.defaults.__dict__'testing'key, bool):
- value = config.getboolean('testing', key)
+ value = config.getboolean('testing',key)
 elif isinstance(self.defaults.__dict__'testing'key, str):
- value = config.get('testing', key)
+ value = config.get('testing',key)
 elif isinstance(self.defaults.__dict__'testing'key, list):
- value = eval(config.get('testing', key))
+ value = eval(config.get('testing',key))
 elif isinstance(self.defaults.__dict__'testing'key, dict):
- value = eval(config.get('testing', key))
+ value = eval(config.get('testing',key))
 
- if hasattr(self, "check_setting_%s_%s" % ('testing', key)):
- exec("retval = self.check_setting_%s_%s(%r)" % ('testing', key, value))
+ if hasattr(self,"check_setting_%s_%s" % ('testing',key)):
+ exec("retval = self.check_setting_%s_%s(%r)" % ('testing',key,value))
 if not retval:
 # We just don't set it, check_setting_%s should have
 # taken care of the error messages
 continue
 
- setattr(self, "%s_%s" % ('testing', key), value)
+ setattr(self,"%s_%s" % ('testing',key),value)
 if key.count('password') >= 1:
- log.debug(
- _("Setting %s_%s to '****' (from configuration file)") % ('testing', key),
- level=8
- )
-
+ log.debug(_("Setting %s_%s to '****' (from configuration file)") % ('testing',key), level=8)
 else:
- log.debug(
- _("Setting %s_%s to %r (from configuration file)") % ('testing', key, value),
- level=8
- )
+ log.debug(_("Setting %s_%s to %r (from configuration file)") % ('testing',key,value), level=8)
 
 def check_config(self, val=None):
 """
@@ -265,7 +214,7 @@
 and returns a SafeConfigParser instance if everything is OK.
 """
 
- if val is not None:
+ if not val == None:
 config_file = val
 else:
 config_file = self.config_file
@@ -277,13 +226,11 @@
 log.debug(_("Reading configuration file %s") % config_file, level=8)
 try:
 config.read(config_file)
- except Exception:
+ except:
 log.error(_("Invalid configuration file %s") % config_file)
 
 if not config.has_section("kolab"):
- log.warning(
- _("No master configuration section kolab in configuration file %s") % config_file
- )
+ log.warning(_("No master configuration section kolab in configuration file %s") % config_file)
 
 return config
 
@@ -311,70 +258,58 @@
 # Enterprise Linux 5 does not have an "epilog" parameter to OptionParser
 try:
 self.cli_parser = OptionParser(epilog=epilog)
- except Exception:
+ except:
 self.cli_parser = OptionParser()
 
- #
- # Runtime Options
- #
+ ##
+ ## Runtime Options
+ ##
 runtime_group = self.cli_parser.add_option_group(_("Runtime Options"))
- runtime_group.add_option(
- "-c", "--config",
- dest="config_file",
- action="store",
- default="/etc/kolab/kolab.conf",
- help=_("Configuration file to use")
- )
-
- runtime_group.add_option(
- "-d", "--debug",
- dest="debuglevel",
- type='int',
- default=0,
- help=_(
- "Set the debugging verbosity. Maximum is 9, tracing protocols LDAP, SQL and IMAP."
- )
- )
-
- runtime_group.add_option(
- "-e", "--default",
- dest="answer_default",
- action="store_true",
- default=False,
- help=_("Use the default answer to all questions.")
- )
-
- runtime_group.add_option(
- "-l",
- dest="loglevel",
- type='str',
- default="CRITICAL",
- help=_("Set the logging level. One of info, warn, error, critical or debug")
- )
-
- runtime_group.add_option(
- "--logfile",
- dest="logfile",
- action="store",
- default="/var/log/kolab/pykolab.log",
- help=_("Log file to use")
- )
-
- runtime_group.add_option(
- "-q", "--quiet",
- dest="quiet",
- action="store_true",
- default=False,
- help=_("Be quiet.")
- )
-
- runtime_group.add_option(
- "-y", "--yes",
- dest="answer_yes",
- action="store_true",
- default=False,
- help=_("Answer yes to all questions.")
- )
+ runtime_group.add_option( "-c", "--config",
+ dest = "config_file",
+ action = "store",
+ default = "/etc/kolab/kolab.conf",
+ help = _("Configuration file to use"))
+
+ runtime_group.add_option( "-d", "--debug",
+ dest = "debuglevel",
+ type = 'int',
+ default = 0,
+ help = _("Set the debugging " + \
+ "verbosity. Maximum is 9, tracing " + \
+ "protocols like LDAP, SQL and IMAP."))
+ 
+ runtime_group.add_option( "-e", "--default",
+ dest = "answer_default",
+ action = "store_true",
+ default = False,
+ help = _("Use the default answer to all questions."))
+
+ runtime_group.add_option( "-l",
+ dest = "loglevel",
+ type = 'str',
+ default = "CRITICAL",
+ help = _("Set the logging level. " + \
+ "One of info, warn, error, " + \
+ "critical or debug"))
+
+ runtime_group.add_option( "--logfile",
+ dest = "logfile",
+ action = "store",
+ default = "/var/log/kolab/pykolab.log",
+ help = _("Log file to use"))
+
+ runtime_group.add_option( "-q", "--quiet",
+ dest = "quiet",
+ action = "store_true",
+ default = False,
+ help = _("Be quiet."))
+
+ runtime_group.add_option( "-y", "--yes",
+ dest = "answer_yes",
+ action = "store_true",
+ default = False,
+ help = _("Answer yes to all questions."))
 
 def parse_options(self, fatal=True):
 """
@@ -388,18 +323,15 @@
 """
 Run Forest, RUN!
 """
+
+ exitcode = 0
+
 if self.cli_args:
 if len(self.cli_args) >= 1:
- if hasattr(self, "command_%s" % self.cli_args0.replace('-', '_')):
- exec(
- "self.command_%s(%r)" % (
- self.cli_args0.replace('-', '_'),
- self.cli_args1:
- )
- )
-
+ if hasattr(self,"command_%s" % self.cli_args0.replace('-','_')):
+ exec("self.command_%s(%r)" % (self.cli_args0.replace('-','_'), self.cli_args1:))
 else:
- print(_("No command supplied"), file=sys.stderr)
+ print >> sys.stderr, _("No command supplied")
 
 def command_dump(self, *args, **kw):
 """
@@ -410,7 +342,7 @@
 self.read_config()
 
 if not self.cfg_parser.has_section('kolab'):
- print("No section found for kolab", file=sys.stderr)
+ print "No section found for kolab"
 sys.exit(1)
 
 # Get the sections, and then walk through the sections in a
@@ -420,22 +352,22 @@
 items.sort()
 
 for item in items:
- mode = self.cfg_parser.get('kolab', item)
- print("%s = %s" % (item, mode))
+ mode = self.cfg_parser.get('kolab',item)
+ print "%s = %s" % (item,mode)
 
 if not self.cfg_parser.has_section(mode):
- print("WARNING: No configuration section %s for item %s" % (mode, item))
+ print "WARNING: No configuration section %s for item %s" % (mode,item)
 continue
 
 keys = self.cfg_parser.options(mode)
 keys.sort()
 
 if self.cfg_parser.has_option(mode, 'leave_this_one_to_me'):
- print("Ignoring section %s" % (mode))
+ print "Ignoring section %s" % (mode,)
 continue
 
 for key in keys:
- print("%s_%s = %s" % (mode, key, self.cfg_parser.get(mode, key)))
+ print "%s_%s = %s" % (mode, key ,self.cfg_parser.get(mode,key))
 
 def read_config(self, value=None):
 """
@@ -445,7 +377,7 @@
 if not value:
 value = self.defaults.config_file
 
- if hasattr(self, 'cli_keywords') and self.cli_keywords is not None:
+ if hasattr(self, 'cli_keywords') and not self.cli_keywords == None:
 value = self.cli_keywords.config_file
 
 self.cfg_parser = SafeConfigParser()
@@ -465,7 +397,7 @@
 
 exec("args = %r" % args)
 
- print("%s/%s: %r" % (args0, args1, self.get(args0, args1)))
+ print "%s/%s: %r" % (args0,args1,self.get(args0, args1))
 
 # if len(args) == 3:
 # # Return non-zero if no match
@@ -512,9 +444,8 @@
 """
 Create a logger instance using cli_options.debuglevel
 """
- global log
 
- if self.cli_keywords.debuglevel is not None:
+ if not self.cli_keywords.debuglevel == None:
 loglevel = logging.DEBUG
 else:
 loglevel = logging.INFO
@@ -523,34 +454,18 @@
 self.debuglevel = self.cli_keywords.debuglevel
 
 # Initialize logger
- log = pykolab.logger.Logger(
- loglevel=loglevel,
- debuglevel=self.cli_keywords.debuglevel,
- logfile=self.cli_keywords.logfile
- )
+ log = pykolab.logger.Logger(loglevel=loglevel, debuglevel=self.cli_keywords.debuglevel, logfile=self.cli_keywords.logfile)
 
 def set_defaults_from_cli_options(self):
- for long_opt in self.cli_parser.__dict__'_long_opt':
+ for long_opt in self.cli_parser.__dict__'_long_opt'.keys():
 if long_opt == "--help":
 continue
-
- setattr(
- self.defaults,
- self.cli_parser._long_optlong_opt.dest,
- self.cli_parser._long_optlong_opt.default
- )
+ setattr(self.defaults,self.cli_parser._long_optlong_opt.dest,self.cli_parser._long_optlong_opt.default)
 
 # But, they should be available in our class as well
- for option in self.cli_parser.defaults:
- log.debug(
- _("Setting %s to %r (from the default values for CLI options)") % (
- option,
- self.cli_parser.defaultsoption
- ),
- level=8
- )
-
- setattr(self, option, self.cli_parser.defaultsoption)
+ for option in self.cli_parser.defaults.keys():
+ log.debug(_("Setting %s to %r (from the default values for CLI options)") % (option, self.cli_parser.defaultsoption), level=8)
+ setattr(self,option,self.cli_parser.defaultsoption)
 
 def has_section(self, section):
 if not self.cfg_parser:
@@ -564,7 +479,7 @@
 
 return self.cfg_parser.has_option(section, option)
 
- def get_list(self, section, key, default=None):
+ def get_list(self, section, key):
 """
 Gets a comma and/or space separated list from the configuration file
 and returns a list.
@@ -573,14 +488,13 @@
 untrimmed_values = 
 
 setting = self.get_raw(section, key)
-
- if setting is None:
- return default if default else 
+ if setting == None:
+ return 
 
 raw_values = setting.split(',')
 
- if raw_values is None:
- return default if default else 
+ if raw_values == None:
+ return 
 
 for raw_value in raw_values:
 untrimmed_values.extend(raw_value.split(' '))
@@ -591,16 +505,14 @@
 
 return values
 
- def get_raw(self, section, key, default=None):
+ def get_raw(self, section, key):
 if not self.cfg_parser:
 self.read_config()
 
 if self.cfg_parser.has_option(section, key):
- return self.cfg_parser.get(section, key, 1)
-
- return default
+ return self.cfg_parser.get(section,key, 1)
 
- def get(self, section, key, default=None, quiet=False):
+ def get(self, section, key, quiet=False):
 """
 Get a configuration option from our store, the configuration file,
 or an external source if we have some sort of function for it.
@@ -612,57 +524,40 @@
 if not self.cfg_parser:
 self.read_config()
 
- # log.debug(_("Obtaining value for section %r, key %r") % (section, key), level=8)
+ #log.debug(_("Obtaining value for section %r, key %r") % (section, key), level=8)
 
 if self.cfg_parser.has_option(section, key):
 try:
 return self.cfg_parser.get(section, key)
- except Exception:
+ except:
 self.read_config()
 return self.cfg_parser.get(section, key)
 
- if hasattr(self, "get_%s_%s" % (section, key)):
+ if hasattr(self, "get_%s_%s" % (section,key)):
 try:
- exec("retval = self.get_%s_%s(quiet)" % (section, key))
- except Exception:
- log.error(
- _("Could not execute configuration function: %s") % (
- "get_%s_%s(quiet=%r)" % (
- section,
- key,
- quiet
- )
- )
- )
-
- return default
+ exec("retval = self.get_%s_%s(quiet)" % (section,key))
+ except Exception, e:
+ log.error(_("Could not execute configuration function: %s") % ("get_%s_%s(quiet=%r)" % (section,key,quiet)))
+ return None
 
 return retval
 
 if quiet:
 return ""
 else:
- log.debug(
- _("Option %s/%s does not exist in config file %s, pulling from defaults") % (
- section,
- key,
- self.config_file
- ),
- level=8
- )
-
- if hasattr(self.defaults, "%s_%s" % (section, key)):
- return getattr(self.defaults, "%s_%s" % (section, key))
+ log.warning(_("Option %s/%s does not exist in config file %s, pulling from defaults") % (section, key, self.config_file))
+ if hasattr(self.defaults, "%s_%s" % (section,key)):
+ return getattr(self.defaults, "%s_%s" % (section,key))
 elif hasattr(self.defaults, "%s" % (section)):
 if key in getattr(self.defaults, "%s" % (section)):
 _dict = getattr(self.defaults, "%s" % (section))
 return _dictkey
 else:
 log.warning(_("Option does not exist in defaults."))
- return default
+ return None
 else:
 log.warning(_("Option does not exist in defaults."))
- return default
+ return None
 
 def check_setting_config_file(self, value):
 if os.path.isfile(value):
@@ -679,13 +574,7 @@
 
 def check_setting_debuglevel(self, value):
 if value < 0:
- log.info(
- _(
- "WARNING: A negative debug level value does not "
- + "make this program be any more silent."
- )
- )
-
+ log.info(_("WARNING: A negative debug level value does not make this program be any more silent."))
 elif value == 0:
 return True
 elif value <= 9:
@@ -704,7 +593,7 @@
 else:
 try:
 os.remove("/var/run/saslauthd/mux")
- except IOError:
+ except IOError, e:
 log.error(_("Cannot start SASL authentication daemon"))
 return False
 elif os.path.isfile("/var/run/sasl2/mux"):
@@ -714,7 +603,7 @@
 else:
 try:
 os.remove("/var/run/sasl2/mux")
- except IOError:
+ except IOError, e:
 log.error(_("Cannot start SASL authentication daemon"))
 return False
 return True
@@ -753,18 +642,14 @@
 # Attempt to load the suite,
 # Get the suite's options,
 # Set them here.
- if not hasattr(self, 'test_suites'):
+ if not hasattr(self,'test_suites'):
 self.test_suites = 
 
 if "zpush" in value:
 selectively = False
- for item in 'calendar', 'contacts', 'mail':
+ for item in 'calendar', 'contacts', 'mail' :
 if self.cli_keywords.__dict__item:
- log.debug(
- _("Found you specified a specific set of items to test: %s") % (item),
- level=8
- )
-
+ log.debug(_("Found you specified a specific set of items to test: %s") % (item), level=8)
 selectively = item
 
 if not selectively:

pykolab-0.8.23.tar.gz/pykolab/conf/defaults.py -> pykolab-0.8.4.tar.gz/pykolab/conf/defaults.py Changed

pykolab-0.8.23.tar.gz/pykolab/conf/entitlement.py -> pykolab-0.8.4.tar.gz/pykolab/conf/entitlement.py Changed

@@ -54,8 +54,8 @@
                 )
 
             if (bool)(ca_cert.has_expired()):
-                raise Exception(_("Invalid entitlement verification " + \
-                        "certificate at %s" % (ca_cert_file)))
+                raise Exception, _("Invalid entitlement verification " + \
+                        "certificate at %s" % (ca_cert_file))
 
             # TODO: Check validity and warn ~1-2 months in advance.
 
@@ -77,8 +77,8 @@
             ca_cert_issuer_hash_digest = hashlib.sha224(ca_cert_issuer_hash).hexdigest()
 
             if not ca_cert_issuer_hash_digest in self.entitlement_verification:
-                raise Exception(_("Invalid entitlement verification " + \
-                        "certificate at %s") % (ca_cert_file))
+                raise Exception, _("Invalid entitlement verification " + \
+                        "certificate at %s") % (ca_cert_file)
 
             ca_cert_subject_hash = subprocess.Popen(
                     
@@ -95,8 +95,8 @@
             ca_cert_subject_hash_digest = hashlib.sha224(ca_cert_subject_hash).hexdigest()
 
             if not ca_cert_subject_hash_digest in self.entitlement_verification:
-                raise Exception(_("Invalid entitlement verification " + \
-                        "certificate at %s") % (ca_cert_file))
+                raise Exception, _("Invalid entitlement verification " + \
+                        "certificate at %s") % (ca_cert_file)
 
             customer_cert_issuer_hash = subprocess.Popen(
                     
@@ -113,14 +113,14 @@
             customer_cert_issuer_hash_digest = hashlib.sha224(customer_cert_issuer_hash).hexdigest()
 
             if not customer_cert_issuer_hash_digest in self.entitlement_verification:
-                raise Exception(_("Invalid entitlement verification " + \
-                        "certificate at %s") % (customer_cert_file))
+                raise Exception, _("Invalid entitlement verification " + \
+                        "certificate at %s") % (customer_cert_file)
 
             if not ca_cert_issuer.countryName == ca_cert_subject.countryName:
-                raise Exception(_("Invalid entitlement certificate"))
+                raise Exception, _("Invalid entitlement certificate")
 
             if not ca_cert_issuer.organizationName == ca_cert_subject.organizationName:
-                raise Exception(_("Invalid entitlement certificate"))
+                raise Exception, _("Invalid entitlement certificate")
 
             if os.path.isdir('/etc/kolab/entitlement.d/') and \
                     os.access('/etc/kolab/entitlement.d/', os.R_OK):
@@ -192,7 +192,7 @@
 #            log.error(_("Error reading entitlement certificate authority file"))
 
     def get(self):
-        if len(self.entitlement) == 0:
+        if len(self.entitlement.keys()) == 0:
             return None
         else:
             return self.entitlement
@@ -227,8 +227,8 @@
             ).communicate()0.strip().split('=')1
 
         if not customer_cert_serial == cert_serial:
-            raise Exception(_("Invalid entitlement verification " + \
-                    "certificate at %s") % (customer_cert_file))
+            raise Exception, _("Invalid entitlement verification " + \
+                    "certificate at %s") % (customer_cert_file)
 
         customer_cert_issuer_hash = subprocess.Popen(
                 
@@ -243,8 +243,8 @@
             ).communicate()0.strip()
 
         if not customer_cert_issuer_hash == cert_issuer_hash:
-            raise Exception(_("Invalid entitlement verification " + \
-                    "certificate at %s") % (customer_cert_file))
+            raise Exception, _("Invalid entitlement verification " + \
+                    "certificate at %s") % (customer_cert_file)
 
         customer_cert_subject_hash = subprocess.Popen(
                 
@@ -259,8 +259,8 @@
             ).communicate()0.strip()
 
         if not customer_cert_subject_hash == cert_subject_hash:
-            raise Exception(_("Invalid entitlement verification " + \
-                    "certificate at %s") % (customer_cert_file))
+            raise Exception, _("Invalid entitlement verification " + \
+                    "certificate at %s") % (customer_cert_file)
 
     def get(self):
         return self.entitlement

pykolab-0.8.23.tar.gz/pykolab/constants.py.in -> pykolab-0.8.4.tar.gz/pykolab/constants.py.in Changed

pykolab-0.8.23.tar.gz/pykolab/imap/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/imap/__init__.py Changed

@@ -21,7 +21,6 @@
 import logging
 import re
 import time
-import socket
 import sys
 
 from urlparse import urlparse
@@ -33,7 +32,6 @@
 log = pykolab.getLogger('pykolab.imap')
 conf = pykolab.getConf()
 
-
 class IMAP(object):
     def __init__(self):
         # Pool of named IMAP connections, by hostname
@@ -43,19 +41,28 @@
         self.imap = None
 
     def cleanup_acls(self, aci_subject):
-        log.info(
-            _("Cleaning up ACL entries for %s across all folders") % (
-                aci_subject
-            )
-        )
-
         lm_suffix = ""
+
+        log.info(_("Cleaning up ACL entries for %s across all folders") % (aci_subject))
+
         if len(aci_subject.split('@')) > 1:
             lm_suffix = "@%s" % (aci_subject.split('@')1)
 
-        shared_folders = self.imap.lm("shared/*%s" % (lm_suffix))
 
-        user_folders = self.imap.lm("user/*%s" % (lm_suffix))
+        shared_folders = self.imap.lm(
+                "shared/*%s" % (lm_suffix)
+            )
+
+        user_folders = self.imap.lm(
+                "user/*%s" % (lm_suffix)
+            )
+
+        log.debug(
+                _("Cleaning up ACL entries referring to identifier %s") % (
+                        aci_subject
+                    ),
+                level=5
+            )
 
         # For all folders (shared and user), ...
         folders = user_folders + shared_folders
@@ -64,38 +71,17 @@
 
         # ... loop through them and ...
         for folder in folders:
-            try:
-                # ... list the ACL entries
-                acls = self.imap.lam(folder)
-
-                # For each ACL entry, see if we think it is a current, valid
-                # entry
-                for acl_entry in acls:
-                    # If the key 'acl_entry' does not exist in the dictionary
-                    # of valid ACL entries, this ACL entry has got to go.
-                    if acl_entry == aci_subject:
-                        # Set the ACL to '' (effectively deleting the ACL
-                        # entry)
-                        log.debug(
-                            _(
-                                "Removing acl %r for subject %r from folder %r"
-                            ) % (
-                                aclsacl_entry,
-                                acl_entry,
-                                folder
-                            ),
-                            level=8
-                        )
-
-                        self.set_acl(folder, acl_entry, '')
-
-            except Exception as errmsg:
-                log.error(
-                    _("Failed to read/set ACL on folder %s: %r") % (
-                        folder,
-                        errmsg
-                    )
-                )
+            # ... list the ACL entries
+            acls = self.imap.lam(folder)
+
+            # For each ACL entry, see if we think it is a current, valid entry
+            for acl_entry in acls.keys():
+                # If the key 'acl_entry' does not exist in the dictionary of valid
+                # ACL entries, this ACL entry has got to go.
+                if acl_entry == aci_subject:
+                    # Set the ACL to '' (effectively deleting the ACL entry)
+                    log.debug(_("Removing acl %r for subject %r from folder %r") % (aclsacl_entry,acl_entry,folder), level=8)
+                    self.set_acl(folder, acl_entry, '')
 
     def connect(self, uri=None, server=None, domain=None, login=True):
         """
@@ -116,12 +102,12 @@
         # deployment.
         backend = conf.get('kolab', 'imap_backend')
 
-        if domain is not None:
+        if not domain == None:
             self.domain = domain
             if conf.has_section(domain) and conf.has_option(domain, 'imap_backend'):
                 backend = conf.get(domain, 'imap_backend')
 
-            if uri is None:
+            if uri == None:
                 if conf.has_section(domain) and conf.has_option(domain, 'imap_uri'):
                     uri = conf.get(domain, 'imap_uri')
         else:
@@ -131,7 +117,7 @@
         hostname = None
         port = None
 
-        if uri is None:
+        if uri == None:
             uri = conf.get(backend, 'uri')
 
         result = urlparse(uri)
@@ -150,13 +136,13 @@
             scheme = uri.split(':')0
             (hostname, port) = uri.split('/')2.split(':')
 
-        if server is not None:
+        if not server == None:
             hostname = server
 
-        if scheme is None or scheme == "":
+        if scheme == None or scheme == "":
             scheme = 'imaps'
 
-        if port is None:
+        if port == None:
             if scheme == "imaps":
                 port = 993
             elif scheme == "imap":
@@ -170,10 +156,10 @@
         admin_login = conf.get(backend, 'admin_login')
         admin_password = conf.get(backend, 'admin_password')
 
-        if admin_password is None or admin_password == '':
+        if admin_password == None or admin_password == '':
             log.error(_("No administrator password is available."))
 
-        if hostname not in self._imap:
+        if not self._imap.has_key(hostname):
             if backend == 'cyrus-imap':
                 import cyrus
                 self._imaphostname = cyrus.Cyrus(uri)
@@ -204,25 +190,19 @@
         else:
             if not login:
                 self.disconnect(hostname)
-                self.connect(uri=uri, login=False)
-            elif login and not hasattr(self._imaphostname, 'logged_in'):
+                self.connect(uri=uri,login=False)
+            elif login and not hasattr(self._imaphostname,'logged_in'):
                 self.disconnect(hostname)
                 self.connect(uri=uri)
             else:
                 try:
                     if hasattr(self._imaphostname, 'm'):
                         self._imaphostname.m.noop()
-                    elif hasattr(self._imaphostname, 'noop') \
-                            and callable(self._imaphostname.noop):
-
+                    elif hasattr(self._imaphostname, 'noop') and callable(self._imaphostname.noop):
                         self._imaphostname.noop()
 
-                    log.debug(
-                        _("Reusing existing IMAP server connection to %s") % (hostname),
-                        level=8
-                    )
-
-                except Exception:
+                    log.debug(_("Reusing existing IMAP server connection to %s") % (hostname), level=8)
+                except:
                     log.debug(_("Reconnecting to IMAP server %s") % (hostname), level=8)
                     self.disconnect(hostname)
                     self.connect()
@@ -231,63 +211,52 @@
         # IMAP connection to be used.
         self.imap = self._imaphostname
 
-        if hasattr(self.imap, 'm') and hasattr(self.imap.m, 'sock'):
-            self._set_socket_keepalive(self.imap.m.sock)
-        elif hasattr(self.imap, 'sock'):
-            self._set_socket_keepalive(self.imap.sock)
-
     def disconnect(self, server=None):
-        if server is None:
+        if server == None:
             # No server specified, but make sure self.imap is None anyways
             if hasattr(self, 'imap'):
                 del self.imap
-
-            # Empty out self._imap as well
-            for key in list(self._imap):
-                del self._imapkey
-
         else:
-            if server in self._imap:
+            if self._imap.has_key(server):
                 del self._imapserver
             else:
-                log.warning(
-                    _("Called imap.disconnect() on a server that we had no connection to.")
-                )
+                log.warning(_("Called imap.disconnect() on a server that we had no connection to."))
 
     def create_folder(self, folder_path, server=None, partition=None):
         folder_path = self.folder_utf7(folder_path)
 
-        if server is not None:
+        if not server == None:
             self.connect(server=server)
 
             try:
                 self._imapserver.cm(folder_path, partition=partition)
                 return True
-            except Exception as excpt:
+            except:
                 log.error(
-                    _("Could not create folder %r on server %r: %r") % (folder_path, server, excpt)
-                )
+                        _("Could not create folder %r on server %r") % (
+                                folder_path,
+                                server
+                            )
+                    )
 
         else:
             try:
                 self.imap.cm(folder_path, partition=partition)
                 return True
-            except Exception as excpt:
-                log.error(_("Could not create folder %r: %r") % (folder_path, excpt))
+            except:
+                log.error(_("Could not create folder %r") % (folder_path))
                 return False
 
     def __getattr__(self, name):
         if hasattr(self.imap, name):
             return getattr(self.imap, name)
-
-        if hasattr(self.imap, 'm'):
+        elif hasattr(self.imap, 'm'):
             if hasattr(self.imap.m, name):
                 return getattr(self.imap.m, name)
-
-        raise AttributeError(_("%r has no attribute %s") % (self, name))
-
-    def append(self, folder, message):
-        return self.imap.m.append(self.folder_utf7(folder), None, None, message)
+            else:
+                raise AttributeError, _("%r has no attribute %s") % (self,name)
+        else:
+            raise AttributeError, _("%r has no attribute %s") % (self,name)
 
     def folder_utf7(self, folder):
         from pykolab import imap_utf7
@@ -308,13 +277,13 @@
 
         _metadata = self.imap.getannotation(self.folder_utf7(folder), '*')
 
-        for (k, v) in _metadata.items():
+        for (k,v) in _metadata.items():
             metadataself.folder_utf8(k) = v
 
         return metadata
 
     def get_separator(self):
-        if not hasattr(self, 'imap') or self.imap is None:
+        if not hasattr(self, 'imap') or self.imap == None:
             self.connect()
 
         if hasattr(self.imap, 'separator'):
@@ -352,13 +321,13 @@
 
         if len(_namespaces) >= 3:
             _shared = 
-            _shared.append(' '.join(_namespaces2.replace('((', '').replace('))', '').split():-1).replace('"', ''))
+            _shared.append(' '.join(_namespaces2.replace('((','').replace('))','').split():-1).replace('"', ''))
 
         if len(_namespaces) >= 2:
-            _other_users = ' '.join(_namespaces1.replace('((', '').replace('))', '').split():-1).replace('"', '')
+            _other_users = ' '.join(_namespaces1.replace('((','').replace('))','').split():-1).replace('"', '')
 
         if len(_namespaces) >= 1:
-            _personal = _namespaces0.replace('((', '').replace('))', '').split()0.replace('"', '')
+            _personal = _namespaces0.replace('((','').replace('))','').split()0.replace('"', '')
 
         return (_personal, _other_users, _shared)
 
@@ -380,7 +349,7 @@
                 'write': 'lrswite',
             }
 
-        if acl in short_rights:
+        if short_rights.has_key(acl):
             acl = short_rightsacl
         else:
             for char in acl:
@@ -411,7 +380,7 @@
                 acl_mapmode += char
 
             current_acls = self.imap.lam(self.folder_utf7(folder))
-            for current_acl in current_acls:
+            for current_acl in current_acls.keys():
                 if current_acl == identifier:
                     _acl = current_aclscurrent_acl
                     break
@@ -423,14 +392,14 @@
 
         try:
             self.imap.sam(self.folder_utf7(folder), identifier, acl)
-        except Exception as errmsg:
+        except Exception, errmsg:
             log.error(
-                _("Could not set ACL for %s on folder %s: %r") % (
-                    identifier,
-                    folder,
-                    errmsg
+                    _("Could not set ACL for %s on folder %s: %r") % (
+                            identifier,
+                            folder,
+                            errmsg
+                        )
                 )
-            )
 
     def set_metadata(self, folder, metadata_path, metadata_value, shared=True):
         """
@@ -439,6 +408,8 @@
 
         if metadata_path.startswith('/shared/'):
             shared = True
+
+        if metadata_path.startswith('/shared/'):
             metadata_path = metadata_path.replace('/shared/', '/')
         elif metadata_path.startswith('/private/'):
             shared = False
@@ -457,7 +428,7 @@
         if folder_name.startswith("shared%s" % (self.get_separator()) * 2):
             folder_name = folder_name7:
 
-        log.info(_("Creating new shared folder %s") % (folder_name))
+        log.info(_("Creating new shared folder %s") %(folder_name))
         self.create_folder(folder_name, server)
 
     def shared_folder_exists(self, folder_path):
@@ -472,17 +443,6 @@
 
         return self.has_folder(folder_name)
 
-    def shared_folder_rename(self, old, new):
-        if not self.has_folder(old):
-            log.error("Shared Folder rename error: Folder %s does not exist" % (old))
-            return
-
-        if self.has_folder(new):
-            log.error("Shared Folder rename error: Folder %s already exists" % (new))
-            return
-
-        self.imap._rename(old, new)
-
     def shared_folder_set_type(self, folder_path, folder_type):
         folder_name = 'shared%s%s' % (self.get_separator(), folder_path)
 
@@ -539,21 +499,33 @@
         folder_name = "user%s%s" % (self.get_separator(), mailbox_base_name)
         log.info(_("Creating new mailbox for user %s") %(mailbox_base_name))
 
-        success = self._create_folder_waiting(folder_name, server)
+        self.create_folder(folder_name, server)
 
-        if not success:
-            log.error(_("Could not create the mailbox for user %s, aborting." % (mailbox_base_name)))
-            return False
+        # In a Cyrus IMAP Murder topology, wait for the murder to have settled
+        if self.imap_murder():
+            self.disconnect()
+            self.connect()
+
+            created = False
+            last_log = time.time()
+            while not created:
+                created = self.has_folder(folder_name)
+                if not created:
+                    if time.time() - last_log > 5:
+                        log.info(_("Waiting for the Cyrus IMAP Murder to settle..."))
+                        last_log = time.time()
+
+                    time.sleep(0.5)
 
         _additional_folders = None
 
         if not hasattr(self, 'domain'):
             self.domain = None
 
-        if self.domain is None and len(mailbox_base_name.split('@')) > 1:
+        if self.domain == None and len(mailbox_base_name.split('@')) > 1:
             self.domain = mailbox_base_name.split('@')1
 
-        if not self.domain is None:
+        if not self.domain == None:
             if conf.has_option(self.domain, "autocreate_folders"):
                 _additional_folders = conf.get_raw(
                         self.domain,
@@ -569,8 +541,8 @@
 
                 auth.disconnect()
 
-                if len(domains) > 0:
-                    if self.domain in domains:
+                if len(domains.keys()) > 0:
+                    if domains.has_key(self.domain):
                         primary = domainsself.domain
 
                         if conf.has_option(primary, "autocreate_folders"):
@@ -579,7 +551,7 @@
                                     "autocreate_folders"
                                 )
 
-        if _additional_folders is None:
+        if _additional_folders == None:
             if conf.has_option('kolab', "autocreate_folders"):
                 _additional_folders = conf.get_raw(
                         'kolab',
@@ -594,13 +566,13 @@
                     }
             )
 
-        if additional_folders is not None:
+        if not additional_folders == None:
             self.user_mailbox_create_additional_folders(
                     mailbox_base_name,
                     additional_folders
                 )
 
-        if not self.domain is None:
+        if not self.domain == None:
             if conf.has_option(self.domain, "sieve_mgmt"):
                 sieve_mgmt_enabled = conf.get(self.domain, 'sieve_mgmt')
                 if utils.true_or_false(sieve_mgmt_enabled):
@@ -635,12 +607,13 @@
         last_log = time.time()
         while not success:
             try:
+
                 self.disconnect()
                 self.connect(login=False, server=server)
                 self.login_plain(admin_login, admin_password, user)
                 (personal, other, shared) = self.namespaces()
                 success = True
-            except Exception as errmsg:
+            except Exception, errmsg:
                 if time.time() - last_log > 5 and self.imap_murder():
                     log.debug(_("Waiting for the Cyrus murder to settle... %r") % (errmsg))
                     last_log = time.time()
@@ -651,7 +624,7 @@
 
                 time.sleep(0.5)
 
-        for additional_folder in additional_folders:
+        for additional_folder in additional_folders.keys():
             _add_folder = {}
 
             folder_name = additional_folder
@@ -660,23 +633,35 @@
                 log.error(_("Correcting additional folder name from %r to %r") % (folder_name, "%s%s" % (personal, folder_name)))
                 folder_name = "%s%s" % (personal, folder_name)
 
+            try:
+                self.create_folder(folder_name)
+                created = False
+                last_log = time.time()
+                while not created:
+                    created = self.has_folder(folder_name)
+                    if not created:
+                        if time.time() - last_log > 5:
+                            log.info(_("Waiting for the Cyrus IMAP Murder to settle..."))
+                            last_log = time.time()
 
-            success = self._create_folder_waiting(folder_name)
-
-            if not success:
-                log.warning(_("Failed to create folder: %s") % (folder_name))
+                        time.sleep(0.5)
+            except:
+                log.warning(_("Mailbox already exists: %s") % (folder_name))
+                if conf.debuglevel > 8:
+                    import traceback
+                    traceback.print_exc()
                 continue
 
-            if "annotations" in additional_foldersadditional_folder:
-                for annotation in additional_foldersadditional_folder"annotations":
+            if additional_foldersadditional_folder.has_key("annotations"):
+                for annotation in additional_foldersadditional_folder"annotations".keys():
                     self.set_metadata(
                             folder_name,
                             "%s" % (annotation),
                             "%s" % (additional_foldersadditional_folder"annotations"annotation)
                         )
 
-            if "acls" in additional_foldersadditional_folder:
-                for acl in additional_foldersadditional_folder"acls":
+            if additional_foldersadditional_folder.has_key("acls"):
+                for acl in additional_foldersadditional_folder"acls".keys():
                     self.set_acl(
                             folder_name,
                             "%s" % (acl),
@@ -692,7 +677,7 @@
             domain = None
             domain_suffix = ""
 
-        if domain is not None:
+        if not domain == None:
             if conf.has_section(domain) and conf.has_option(domain, 'imap_backend'):
                 backend = conf.get(domain, 'imap_backend')
 
@@ -708,10 +693,10 @@
         # Subscribe only to personal folders
         (personal, other, shared) = self.namespaces()
 
-        if other is not None:
+        if not other == None:
             _tests.append(other)
 
-        if shared is not None:
+        if not shared == None:
             for _shared in shared:
                 _tests.append(_shared)
 
@@ -735,13 +720,13 @@
                 log.debug(_("Subscribing %s to folder %s") % (user, _folder), level=8)
                 try:
                     self.subscribe(_folder)
-                except Exception as errmsg:
+                except Exception, errmsg:
                     log.error(_("Subscribing %s to folder %s failed: %r") % (user, _folder, errmsg))
 
         self.logout()
         self.connect(domain=self.domain)
 
-        for additional_folder in additional_folders:
+        for additional_folder in additional_folders.keys():
             if additional_folder.startswith(personal) and not personal == '':
                 folder_name = additional_folder.replace(personal, '')
             else:
@@ -755,73 +740,29 @@
                     domain_suffix
                 )
 
-            if "quota" in additional_foldersadditional_folder:
+            if additional_foldersadditional_folder.has_key("quota"):
                 try:
                     self.imap.sq(
                             folder_name,
                             additional_foldersadditional_folder'quota'
                         )
-                except Exception as errmsg:
+                except Exception, errmsg:
                     log.error(_("Could not set quota on %s") % (additional_folder))
 
-            if "partition" in additional_foldersadditional_folder:
+            if additional_foldersadditional_folder.has_key("partition"):
                 partition = additional_foldersadditional_folder"partition"
                 try:
                     self.imap._rename(folder_name, folder_name, partition)
                 except:
                     log.error(_("Could not rename %s to reside on partition %s") % (folder_name, partition))
 
-    def _create_folder_waiting(self, folder_name, server=None):
-        """
-            Create a folder and wait to make sure it exists
-        """
-
-        created = False
-
-        try:
-            max_tries = 10
-            while not created and max_tries > 0:
-                created = self.create_folder(folder_name, server)
-                if not created:
-                    self.disconnect()
-                    max_tries -= 1
-                    time.sleep(1)
-                    self.connect()
-
-            # In a Cyrus IMAP Murder topology, wait for the murder to have settled
-            if created and self.imap_murder():
-                success = False
-                last_log = time.time()
-                reconnect_counter = 0
-                while not success:
-                    success = self.has_folder(folder_name)
-                    if not success:
-                        if time.time() - last_log > 5:
-                            reconnect_counter += 1
-                            log.info(_("Waiting for the Cyrus IMAP Murder to settle..."))
-                            if reconnect_counter == 6:
-                                log.warning(_("Waited for 15 seconds, going to reconnect"))
-                                reconnect_counter = 0
-                                self.disconnect()
-                                self.connect()
-
-                            last_log = time.time()
-
-                        time.sleep(0.5)
-        except:
-            if conf.debuglevel > 8:
-                import traceback
-                traceback.print_exc()
-
-        return created
-
     def user_mailbox_delete(self, mailbox_base_name):
         """
             Delete a user mailbox.
         """
         self.connect()
 
-        folder = "user%s%s" %(self.get_separator(), mailbox_base_name)
+        folder = "user%s%s" %(self.get_separator(),mailbox_base_name)
         self.delete_mailfolder(folder)
         self.cleanup_acls(mailbox_base_name)
 
@@ -843,23 +784,23 @@
     def user_mailbox_rename(self, old_name, new_name, partition=None):
         self.connect()
 
-        old_name = "user%s%s" % (self.get_separator(), old_name)
-        new_name = "user%s%s" % (self.get_separator(), new_name)
+        old_name = "user%s%s" % (self.get_separator(),old_name)
+        new_name = "user%s%s" % (self.get_separator(),new_name)
 
-        if old_name == new_name and partition is None:
+        if old_name == new_name and partition == None:
             return
 
         if not self.has_folder(old_name):
             log.error(_("INBOX folder to rename (%s) does not exist") % (old_name))
 
-        if not self.has_folder(new_name) or not partition is None:
-            log.info(_("Renaming INBOX from %s to %s") % (old_name, new_name))
+        if not self.has_folder(new_name) or not partition == None:
+            log.info(_("Renaming INBOX from %s to %s") % (old_name,new_name))
             try:
-                self.imap.rename(old_name, new_name, partition)
+                self.imap.rename(old_name,new_name,partition)
             except:
-                log.error(_("Could not rename INBOX folder %s to %s") % (old_name, new_name))
+                log.error(_("Could not rename INBOX folder %s to %s") % (old_name,new_name))
         else:
-            log.warning(_("Moving INBOX folder %s won't succeed as target folder %s already exists") % (old_name, new_name))
+            log.warning(_("Moving INBOX folder %s won't succeed as target folder %s already exists") % (old_name,new_name))
 
     def user_mailbox_server(self, mailbox):
         server = self.imap.find_mailfolder_server(mailbox.lower()).lower()
@@ -871,25 +812,13 @@
             Check if the environment has a folder named folder.
         """
         folders = self.imap.lm(self.folder_utf7(folder))
-        log.debug(_("Looking for folder '%s', we found folders: %r") % (folder, self.folder_utf8(x) for x in folders), level=8)
+        log.debug(_("Looking for folder '%s', we found folders: %r") % (folder,self.folder_utf8(x) for x in folders), level=8)
         # Greater then one, this folder may have subfolders.
         if len(folders) > 0:
             return True
         else:
             return False
 
-    def _set_socket_keepalive(self, sock):
-        sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-
-        with open('/proc/sys/net/ipv4/tcp_keepalive_time', 'r') as f:
-            sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, (int)(f.read()))
-
-        with open('/proc/sys/net/ipv4/tcp_keepalive_intvl', 'r') as f:
-            sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, (int)(f.read()))
-
-        with open('/proc/sys/net/ipv4/tcp_keepalive_probes', 'r') as f:
-            sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, (int)(f.read()))
-
     def _set_kolab_mailfolder_acls(self, acls, folder=None, update=False):
         # special case, folder has no ACLs assigned and update was requested,
         # remove all existing ACL entries
@@ -930,7 +859,7 @@
             if epoch > (int)(time.time()):
                 log.debug(
                         _("Setting ACL rights %s for subject %s on folder " + \
-                            "%s") % (rights, subject, folder), level=8)
+                            "%s") % (rights,subject,folder), level=8)
 
                 self.set_acl(
                         folder,
@@ -941,7 +870,7 @@
             else:
                 log.debug(
                         _("Removing ACL rights %s for subject %s on folder " + \
-                            "%s") % (rights, subject, folder), level=8)
+                            "%s") % (rights,subject,folder), level=8)
 
                 self.set_acl(
                         folder,
@@ -965,7 +894,7 @@
     def move_user_folders(self, users=, domain=None):
         for user in users:
             if type(user) == dict:
-                if 'old_mail' in user:
+                if user.has_key('old_mail'):
                     inbox = "user/%s" % (user'mail')
                     old_inbox = "user/%s" % (user'old_mail')
 
@@ -973,11 +902,11 @@
                         log.debug(_("Found old INBOX folder %s") % (old_inbox), level=8)
 
                         if not self.has_folder(inbox):
-                            log.info(_("Renaming INBOX from %s to %s") % (old_inbox, inbox))
-                            self.imap.rename(old_inbox, inbox)
+                            log.info(_("Renaming INBOX from %s to %s") % (old_inbox,inbox))
+                            self.imap.rename(old_inbox,inbox)
                             self.inbox_folders.append(inbox)
                         else:
-                            log.warning(_("Moving INBOX folder %s won't succeed as target folder %s already exists") % (old_inbox, inbox))
+                            log.warning(_("Moving INBOX folder %s won't succeed as target folder %s already exists") % (old_inbox,inbox))
                     else:
                         log.debug(_("Did not find old folder user/%s to rename") % (user'old_mail'), level=8)
             else:
@@ -1010,7 +939,7 @@
 
         default_quota = auth.domain_default_quota(primary_domain)
 
-        if default_quota == "" or default_quota is None:
+        if default_quota == "" or default_quota == None:
             default_quota = 0
 
         if len(users) == 0:
@@ -1020,19 +949,19 @@
             quota = None
 
             if type(user) == dict:
-                if _quota_attr in user:
+                if user.has_key(_quota_attr):
                     if type(user_quota_attr) == list:
                         quota = user_quota_attr.pop(0)
                     elif type(user_quota_attr) == str:
                         quota = user_quota_attr
                 else:
                     _quota = auth.get_user_attribute(primary_domain, user, _quota_attr)
-                    if _quota is None:
+                    if _quota == None:
                         quota = 0
                     else:
                         quota = _quota
 
-                if _inbox_folder_attr not in user:
+                if not user.has_key(_inbox_folder_attr):
                     continue
                 else:
                     if type(user_inbox_folder_attr) == list:
@@ -1046,7 +975,7 @@
             folder = folder.lower()
 
             try:
-                (used, current_quota) = self.imap.lq(folder)
+                (used,current_quota) = self.imap.lq(folder)
             except:
                 # TODO: Go in fact correct the quota.
                 log.warning(_("Cannot get current IMAP quota for folder %s") % (folder))
@@ -1064,11 +993,11 @@
 
             log.debug(_("Quota for %s currently is %s") % (folder, current_quota), level=7)
 
-            if new_quota is None:
+            if new_quota == None:
                 continue
 
             if not int(new_quota) == int(quota):
-                log.info(_("Adjusting authentication database quota for folder %s to %d") % (folder, int(new_quota)))
+                log.info(_("Adjusting authentication database quota for folder %s to %d") % (folder,int(new_quota)))
                 quota = int(new_quota)
                 auth.set_user_attribute(primary_domain, user, _quota_attr, new_quota)
 
@@ -1092,7 +1021,7 @@
             mailhost = None
 
             if type(user) == dict:
-                if _mailserver_attr in user:
+                if user.has_key(_mailserver_attr):
                     if type(user_mailserver_attr) == list:
                         _mailserver = user_mailserver_attr.pop(0)
                     elif type(user_mailserver_attr) == str:
@@ -1100,7 +1029,7 @@
                 else:
                     _mailserver = auth.get_user_attribute(primary_domain, user, _mailserver_attr)
 
-                if _inbox_folder_attr not in user:
+                if not user.has_key(_inbox_folder_attr):
                     continue
                 else:
                     if type(user_inbox_folder_attr) == list:
@@ -1116,7 +1045,7 @@
 
             _current_mailserver = self.imap.find_mailfolder_server(folder)
 
-            if _mailserver is not None:
+            if not _mailserver == None:
                 # TODO:
                 if not _current_mailserver == _mailserver:
                     self.imap._xfer(folder, _current_mailserver, _mailserver)
@@ -1144,7 +1073,7 @@
 
                 primary_domain, secondary_domains
         """
-        if inbox_folders is None:
+        if inbox_folders == None:
             inbox_folders = 
 
         folders = self.list_user_folders()
@@ -1171,7 +1100,7 @@
 
         mbox_parts = self.parse_mailfolder(mailfolder_path)
 
-        if mbox_parts is None:
+        if mbox_parts == None:
             # We got user identifier only
             log.error(_("Please don't give us just a user identifier"))
             return
@@ -1210,7 +1139,7 @@
 
         acceptable_domain_name_res = 
 
-        if primary_domain is not None:
+        if not primary_domain == None:
             for domain in  primary_domain  + secondary_domains:
                 acceptable_domain_name_res.append(domain_re % (domain))
 
@@ -1227,16 +1156,16 @@
                         #print "Acceptable indeed"
                         #acceptable = True
                     #if not acceptable:
-                        #print "%s is not acceptable against %s yet using %s" % (folder.split('@')1, folder, domain_name_re)
+                        #print "%s is not acceptable against %s yet using %s" % (folder.split('@')1,folder,domain_name_re)
 
                 #if acceptable:
-                    #folder_name = "%s@%s" % (folder.split(self.separator)1.split('@')0, folder.split('@')1)
+                    #folder_name = "%s@%s" % (folder.split(self.separator)1.split('@')0,folder.split('@')1)
 
-                folder_name = "%s@%s" % (folder.split(self.get_separator())1.split('@')0, folder.split('@')1)
+                folder_name = "%s@%s" % (folder.split(self.get_separator())1.split('@')0,folder.split('@')1)
             else:
                 folder_name = "%s" % (folder.split(self.get_separator())1)
 
-            if folder_name is not None:
+            if not folder_name == None:
                 if not folder_name in folders:
                     folders.append(folder_name)

pykolab-0.8.23.tar.gz/pykolab/imap/cyrus.py -> pykolab-0.8.4.tar.gz/pykolab/imap/cyrus.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import cyruslib
 import sys
 import time
@@ -92,11 +90,6 @@
 if conf.debuglevel > 8:
 self.VERBOSE = True
 self.m.debug = 5
- sl = pykolab.logger.StderrToLogger(log)
- # imaplib debug outputs everything to stderr. Redirect to Logger
- sys.stderr = sl
- # cyruslib debug outputs everything to LOGFD. Redirect to Logger
- self.LOGFD = sl
 
 # Initialize our variables
 self.separator = self.SEP
@@ -146,17 +139,11 @@
 Login to the Cyrus IMAP server through cyruslib.CYRUS, but set our
 hierarchy separator.
 """
- try:
- cyruslib.CYRUS.login(self, *args, **kw)
- except cyruslib.CYRUSError as errmsg:
- log.error("Login to Cyrus IMAP server failed: %r", errmsg)
- except Exception as errmsg:
- log.exception(errmsg)
-
+ cyruslib.CYRUS.login(self, *args, **kw)
 self.separator = self.SEP
 try:
 self._id()
- except Exception:
+ except Exception, errmsg:
 pass
 
 log.debug(
@@ -186,8 +173,8 @@
 
 _mailfolder = self.parse_mailfolder(mailfolder)
 
- prefix = _mailfolder'path_parts'0
- mbox = _mailfolder'path_parts'1
+ prefix = _mailfolder'path_parts'.pop(0)
+ mbox = _mailfolder'path_parts'.pop(0)
 if _mailfolder'domain' is not None:
 mailfolder = "%s%s%s@%s" % (
 prefix,
@@ -197,14 +184,8 @@
 )
 
 # TODO: Workaround for undelete
- if len(self.lm(mailfolder)) < 1 and 'hex_timestamp' in _mailfolder:
- mailfolder = self.folder_utf7("DELETED/%s%s%s@%s" % (
- self.separator.join(_mailfolder'path_parts'),
- self.separator,
- _mailfolder'hex_timestamp',
- _mailfolder'domain')
- )
-
+ if len(self.lm(mailfolder)) < 1:
+ return self.server
 
 # TODO: Murder capabilities may have been suppressed using Cyrus IMAP
 # configuration.
@@ -219,7 +200,7 @@
 level=8
 )
 
- if mailfolder in self.mbox:
+ if self.mbox.has_key(mailfolder):
 log.debug(
 _(
 "Possibly reproducing the find " +
@@ -238,19 +219,17 @@
 max_tries = 20
 num_try = 0
 
- ann_path = "/vendor/cmu/cyrus-imapd/server"
- s_ann_path = "/shared%s" % (ann_path)
+ annotation_path = "/shared/vendor/cmu/cyrus-imapd/server"
 
 while 1:
 num_try += 1
 annotations = self._getannotation(
- '"%s"' % (mailfolder),
- ann_path
+ mailfolder,
+ annotation_path
 )
 
- if mailfolder in annotations:
- if s_ann_path in annotationsmailfolder:
- break
+ if annotations.has_key(mailfolder):
+ break
 
 if max_tries <= num_try:
 log.error(
@@ -261,7 +240,7 @@
 
 annotations = {
 mailfolder: {
- s_ann_path: self.server
+ annotation_path: self.server
 }
 }
 
@@ -276,7 +255,7 @@
 
 time.sleep(1)
 
- server = annotationsmailfolders_ann_path
+ server = annotationsmailfolderannotation_path
 self.mboxmailfolder = server
 
 log.debug(
@@ -382,7 +361,7 @@
 
 try:
 self.setannotation(mailfolder, annotation, value, shared)
- except cyruslib.CYRUSError as errmsg:
+ except cyruslib.CYRUSError, errmsg:
 log.error(
 _("Could not set annotation %r on mail folder %r: %r") % (
 annotation,
@@ -501,16 +480,18 @@
 self.rename(undelete_folder, target_folder)
 else:
 if not target_server == source_server:
- print(_("Would have transferred %s from %s to %s") % (
+ print >> sys.stdout, \
+ _("Would have transferred %s from %s to %s") % (
 undelete_folder,
 source_server,
 target_server
- ), file=sys.stdout)
+ )
 
- print(_("Would have renamed %s to %s") % (
+ print >> sys.stdout, \
+ _("Would have renamed %s to %s") % (
 undelete_folder,
 target_folder
- ), file=sys.stdout)
+ )
 
 def parse_mailfolder(self, mailfolder):
 """
@@ -598,7 +579,8 @@
 
 TODO: It finds virtdomain folders for non-virtdomain searches.
 """
- deleted_folder_search = "%(deleted_prefix)s%(separator)s%(mailfolder)s%(separator)s*" % {
+ deleted_folder_search = "%(deleted_prefix)s%(separator)s" + \
+ "%(mailfolder)s%(separator)s*" % {
 # TODO: The prefix used is configurable
 'deleted_prefix': "DELETED",
 'mailfolder': self.separator.join(mbox'path_parts'),

pykolab-0.8.23.tar.gz/pykolab/imap/dovecot.py -> pykolab-0.8.4.tar.gz/pykolab/imap/dovecot.py Changed

@@ -37,8 +37,6 @@
 # are using need.
 # -----
 
-from __future__ import print_function
-
 import cyruslib
 import imaplib
 import sys
@@ -80,22 +78,20 @@
         entries = " /private%s" % pattern
 
     typ, dat = self._simple_command('GETMETADATA', options, mailbox, entries)
-
     return self._untagged_response(typ, dat, 'METADATA')
 
 def imap_setmetadata(self, mailbox, desc, value, shared=False):
     if value:
-        value = value.join('"', '"')
+        value = quote(value)
     else:
         value = "NIL"
 
     if shared:
         typ, dat = self._simple_command('SETMETADATA', mailbox, 
-                                        "(/shared%s %s)" % (desc,value))
+                                        "(/shared/%s %s)" % (desc,value))
     else:
         typ, dat = self._simple_command('SETMETADATA', mailbox,
-                                        "(/private%s %s)" % (desc,value))
-
+                                        "(/private/%s %s)" % (desc,value))
     return self._untagged_response(typ, dat, 'METADATA')
 
 # Bind the new methods to the cyruslib IMAP4 and IMAP4_SSL objects
@@ -242,7 +238,7 @@
 
     def __verbose(self, msg):
         if self.VERBOSE:
-            print(msg, file=self.LOGFD)
+            print >> self.LOGFD, msg
 
     def connect(self, uri):
         """
@@ -523,9 +519,9 @@
                 self.rename(undelete_folder,target_folder)
             else:
                 if not target_server == self.server:
-                    print(_("Would have transfered %s from %s to %s") % (undelete_folder, self.server, target_server), file=sys.stdout)
+                    print >> sys.stdout, _("Would have transfered %s from %s to %s") % (undelete_folder, self.server, target_server)
 
-                print(_("Would have renamed %s to %s") % (undelete_folder, target_folder), file=sys.stdout)
+                print >> sys.stdout, _("Would have renamed %s to %s") % (undelete_folder, target_folder)
 
     def parse_mailfolder(self, mailfolder):
         """

pykolab-0.8.23.tar.gz/pykolab/imap_utf7.py -> pykolab-0.8.4.tar.gz/pykolab/imap_utf7.py Changed

pykolab-0.8.23.tar.gz/pykolab/itip/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/itip/__init__.py Changed

@@ -1,33 +1,25 @@
-import re
-import traceback
-
 import icalendar
+import pykolab
+import traceback
 import kolabformat
 
-import pykolab
-from pykolab.translate import _
 from pykolab.xml import to_dt
 from pykolab.xml import event_from_ical
 from pykolab.xml import todo_from_ical
 from pykolab.xml import participant_status_label
+from pykolab.translate import _
 
-from tzlocal import windows_tz
-
-# pylint: disable=invalid-name
 log = pykolab.getLogger('pykolab.wallace')
 
 
 def events_from_message(message, methods=None):
 return objects_from_message(message, "VEVENT", methods)
 
-
 def todos_from_message(message, methods=None):
 return objects_from_message(message, "VTODO", methods)
 
 
-# pylint: disable=too-many-branches
-# pylint: disable=too-many-statements
-def objects_from_message(message, objnames, methods=None): # noqa: C901
+def objects_from_message(message, objnames, methods=None):
 """
 Obtain the iTip payload from email.message <message>
 """
@@ -37,7 +29,7 @@
 
 # iTip methods we are actually interested in. Other methods will be ignored.
 if methods is None:
- methods = "REQUEST", "CANCEL"
+ methods = "REQUEST", "CANCEL" 
 
 # Are all iTip messages multipart? No! RFC 6047, section 2.4 states "A
 # MIME body part containing content information that conforms to this
@@ -45,26 +37,19 @@
 # therefore also be multipart.
 
 # Check each part
- # pylint: disable=too-many-nested-blocks
 for part in message.walk():
 
 # The iTip part MUST be Content-Type: text/calendar (RFC 6047, section 2.4)
 # But in real word, other mime-types are used as well
- if part.get_content_type() in "text/calendar", "text/x-vcalendar", "application/ics":
- if str(part.get_param('method')).upper() not in methods:
- log.info("Method %r not really interesting for us." % (part.get_param('method')))
+ if part.get_content_type() in "text/calendar", "text/x-vcalendar", "application/ics" :
+ if not str(part.get_param('method')).upper() in methods:
+ log.info(_("Method %r not really interesting for us.") % (part.get_param('method')))
 continue
 
 # Get the itip_payload
 itip_payload = part.get_payload(decode=True)
 
- log.debug(
- "Raw iTip payload (%r): %r" % (part.get_param('charset'), itip_payload),
- level=8
- )
-
- # Convert unsupported timezones, etc.
- itip_payload = _convert_itip_payload(itip_payload)
+ log.debug(_("Raw iTip payload (%r): %r") % (part.get_param('charset'), itip_payload), level=9)
 
 # Python iCalendar prior to 3.0 uses "from_string".
 if hasattr(icalendar.Calendar, 'from_ical'):
@@ -82,7 +67,7 @@
 itip = {}
 
 if c'uid' in seen_uids:
- log.debug(_("Duplicate iTip object: %s") % (c'uid'), level=8)
+ log.debug(_("Duplicate iTip object: %s") % (c'uid'), level=9)
 continue
 
 # From the event, take the following properties:
@@ -101,37 +86,30 @@
 itip'type' = 'task' if c.name == 'VTODO' else 'event'
 itip'uid' = str(c'uid')
 itip'method' = str(cal'method').upper()
- itip'sequence' = int(c'sequence') if 'sequence' in c else 0
-
- itip'recurrence-id' = None
- if 'recurrence-id' in c:
- if hasattr(c'recurrence-id', 'dt'):
- itip'recurrence-id' = c'recurrence-id'.dt
+ itip'sequence' = int(c'sequence') if c.has_key('sequence') else 0
+ itip'recurrence-id' = c'recurrence-id'.dt if c.has_key('recurrence-id') and hasattr(c'recurrence-id', 'dt') else None
 
- if 'dtstart' in c:
+ if c.has_key('dtstart'):
 itip'start' = c'dtstart'.dt
 elif itip'type' == 'event':
 log.error(_("iTip event without a start"))
 continue
 
- if 'dtend' in c:
+ if c.has_key('dtend'):
 itip'end' = c'dtend'.dt
 
- if 'duration' in c:
+ if c.has_key('duration'):
 itip'duration' = c'duration'.dt
 itip'end' = itip'start' + c'duration'.dt
 
- # Outlook can send itip replies with no organizer property
- if 'organizer' in c:
- itip'organizer' = c'organizer'
+ itip'organizer' = c'organizer'
 
- if 'attendee' in c:
- itip'attendees' = c'attendee'
+ itip'attendees' = c'attendee'
 
- if 'attendees' in itip and not isinstance(itip'attendees', list):
+ if itip.has_key('attendees') and not isinstance(itip'attendees', list):
 itip'attendees' = c'attendee'
 
- if 'resources' in c:
+ if c.has_key('resources'):
 itip'resources' = c'resources'
 
 itip'raw' = itip_payload
@@ -142,13 +120,8 @@
 itip'xml' = todo_from_ical(c, itip_payload)
 else:
 itip'xml' = event_from_ical(c, itip_payload)
-
- # pylint: disable=broad-except
- except Exception as e:
- log.error(
- "event|todo_from_ical() exception: %r; iCal: %s" % (e, itip_payload)
- )
-
+ except Exception, e:
+ log.error("event|todo_from_ical() exception: %r; iCal: %s" % (e, itip_payload))
 continue
 
 itip_objects.append(itip)
@@ -183,94 +156,57 @@
 if _is_transparent(kolab_event):
 return conflict
 
- if _is_transparent(itip_event'xml'):
- return conflict
-
 _es = to_dt(kolab_event.get_start())
- # use iCal style end date: next day for all-day events
- _ee = to_dt(kolab_event.get_ical_dtend())
-
- _is = to_dt(itip_event'start')
- _ie = to_dt(itip_event'end')
-
- # Escape looping through anything if neither of the events is recurring.
- if not itip_event'xml'.is_recurring() and not kolab_event.is_recurring():
- return check_date_conflict(_es, _ee, _is, _ie)
-
- loop = 0
-
- done = False
+ _ee = to_dt(kolab_event.get_ical_dtend()) # use iCal style end date: next day for all-day events
+ _ev = kolab_event
+ _ei = 0
 
 # naive loops to check for collisions in (recurring) events
 # TODO: compare recurrence rules directly (e.g. matching time slot or weekday or monthday)
- while not conflict and not done:
- loop += 1
-
- # Scroll forward the kolab event recurrence until we're in the prime
- # spot. We choose to start with the Kolab event because that is likely
- # the older one.
- if _ee < _is:
- while _ee < _is and _es is not None and kolab_event.is_recurring():
- log.debug(
- "Attempt to move forward kolab event recurrence from {} closer to {}".format(
- _ee,
- _is
- ),
- level=8
- )
-
- __es = to_dt(kolab_event.get_next_occurence(_es))
-
- if __es is not None and not __es == _es:
- _es = __es
- _ee = to_dt(kolab_event.get_occurence_end_date(_es))
- else:
- done = True
- break
-
- # Scroll forward the itip event recurrence until we're in the
- # prime spot, this time with the iTip event.
- elif _ie < _es:
- while _ie < _es and _is is not None and itip_event'xml'.is_recurring():
- log.debug(
- "Attempt to move forward itip event recurrence from {} closer to {}".format(
- _ie,
- _es
- ),
- level=8
- )
-
- __is = to_dt(itip_event'xml'.get_next_occurence(_is))
-
- if __is is not None and not _is == __is:
- _is = __is
- _ie = to_dt(itip_event'xml'.get_occurence_end_date(_is))
- else:
- done = True
- break
-
- # Now that we have some events somewhere in the same neighborhood...
- conflict = check_date_conflict(_es, _ee, _is, _ie)
- log.debug(
- "* Comparing itip at %s/%s with kolab at %s/%s: conflict - %r (occurence - %d)" % (
- _is, _ie, _es, _ee, conflict, loop
- ),
- level=8
- )
-
- if not conflict:
- if kolab_event.is_recurring() and itip_event'xml'.is_recurring():
- if not kolab_event.has_exceptions() and not itip_event'xml'.has_exceptions():
- log.debug("No conflict, both recurring, but neither with exceptions", level=8)
- done = True
- break
-
- _is = to_dt(itip_event'xml'.get_next_occurence(_is))
-
- if _is is not None:
- _ie = to_dt(itip_event'xml'.get_occurence_end_date(_is))
- else:
- done = True
+ while not conflict and _es is not None:
+ _is = to_dt(itip_event'start')
+ _ie = to_dt(itip_event'end')
+ _iv = itip_event'xml'
+ _ii = 0
+
+ while not conflict and _is is not None:
+ # log.debug("* Comparing event dates at %s/%s with %s/%s" % (_es, _ee, _is, _ie), level=9)
+ conflict = not _is_transparent(_ev) and not _is_transparent(_iv) and check_date_conflict(_es, _ee, _is, _ie)
+ _is = to_dt(itip_event'xml'.get_next_occurence(_is)) if itip_event'xml'.is_recurring() else None
+ _ie = to_dt(itip_event'xml'.get_occurence_end_date(_is))
+
+ # get full occurrence to compare the dates from a possible exception
+ if _is is not None and itip_event'xml'.has_exceptions():
+ _ix = itip_event'xml'.get_instance(_is)
+ if _ix is not None:
+ _is = to_dt(_ix.get_start())
+ _ie = to_dt(_ix.get_end())
+ _iv = _ix
+
+ # iterate through all exceptions (non-recurring)
+ elif _is is None and not itip_event'xml'.is_recurring() and len(itip_event'xml'.get_exceptions()) > _ii:
+ _iv = itip_event'xml'.get_exceptions()_ii
+ _is = to_dt(_iv.get_start())
+ _ie = to_dt(_iv.get_end())
+ _ii += 1
+
+ _es = to_dt(kolab_event.get_next_occurence(_es)) if kolab_event.is_recurring() else None
+ _ee = to_dt(kolab_event.get_occurence_end_date(_es))
+
+ # get full instance to compare the dates from a possible exception
+ if _es is not None and kolab_event.has_exceptions():
+ _ex = kolab_event.get_instance(_es)
+ if _ex is not None:
+ _es = to_dt(_ex.get_start())
+ _ee = to_dt(_ex.get_end())
+ _ev = _ex
+
+ # iterate through all exceptions (non-recurring)
+ elif _es is None and not kolab_event.is_recurring() and len(kolab_event.get_exceptions()) > _ei:
+ _ev = kolab_event.get_exceptions()_ei
+ _es = to_dt(_ev.get_start())
+ _ee = to_dt(_ev.get_end())
+ _ei += 1
 
 return conflict
 
@@ -279,34 +215,6 @@
 return event.get_transparency() or event.get_status() == kolabformat.StatusCancelled
 
 
-def _convert_itip_payload(itip):
- matchlist = re.findall("^((DTSTART|DTEND|DUE|EXDATE|COMPLETED):;^\n+)$", itip, re.MULTILINE)
-
- for match in matchlist:
- match = match0
- search = re.search(";TZID=(^:;+)", match)
-
- if search:
- tzorig = tzdest = search.group(1).replace('"', '')
-
- # timezone in Olson-database format, nothing to convert
- if re.match("a-zA-Z+/a-zA-Z0-9_+-+", tzorig):
- continue
-
- # convert timezone from windows format to Olson
- if tzorig in windows_tz.win_tz:
- tzdest = windows_tz.win_tztzorig
-
- # @TODO: Should be prefer server time if it has the same offset?
-
- # replace old with new timezone name
- if tzorig != tzdest:
- replace = match.replace(search.group(0), ";TZID=" + tzdest)
- itip = itip.replace("\n" + match, "\n" + replace)
-
- return itip
-
-
 def check_date_conflict(_es, _ee, _is, _ie):
 """
 Check the given event start/end dates for conflicts
@@ -325,12 +233,12 @@
 conflict = True
 elif _es == _is:
 conflict = True
- else: # _es > _is
+ else: # _es > _is
 if _es < _ie:
 conflict = True
 else:
 conflict = False
-
+ 
 return conflict
 
 
@@ -344,47 +252,29 @@
 smtp = None
 
 if isinstance(itip_events, dict):
- itip_events = itip_events
+ itip_events = itip_events 
 
 for itip_event in itip_events:
 attendee = itip_event'xml'.get_attendee_by_email(from_address)
 participant_status = itip_event'xml'.get_ical_attendee_participant_status(attendee)
 
- log.debug(
- "Send iTip reply {} for {} {}".format(
- participant_status,
- itip_event'xml'.type,
- itip_event'xml'.uid
- ),
- level=8
- )
+ log.debug(_("Send iTip reply %s for %s %r") % (participant_status, itip_event'xml'.type, itip_event'xml'.uid), level=8)
 
 event_summary = itip_event'xml'.get_summary()
- message_text = response_text % {
- 'summary': event_summary,
- 'status': participant_status_label(participant_status),
- 'name': attendee.get_name()
- }
+ message_text = response_text % { 'summary':event_summary, 'status':participant_status_label(participant_status), 'name':attendee.get_name() }
 
 if subject is not None:
- subject = subject % {
- 'summary': event_summary,
- 'status': participant_status_label(participant_status),
- 'name': attendee.get_name()
- }
+ subject = subject % { 'summary':event_summary, 'status':participant_status_label(participant_status), 'name':attendee.get_name() }
 
 try:
- message = itip_event'xml'.to_message_itip(
- from_address,
+ message = itip_event'xml'.to_message_itip(from_address,
 method="REPLY",
 participant_status=participant_status,
 message_text=message_text,
 subject=subject
 )
-
- # pylint: disable=broad-except
- except Exception as e:
- log.error("Failed to compose iTip reply message: %r: %s" % (e, traceback.format_exc()))
+ except Exception, e:
+ log.error(_("Failed to compose iTip reply message: %r: %s") % (e, traceback.format_exc()))
 return
 
 smtp = smtplib.SMTP("localhost", 10026) # replies go through wallace again
@@ -394,9 +284,7 @@
 
 try:
 smtp.sendmail(message'From', message'To', message.as_string())
-
- # pylint: disable=broad-except
- except Exception as e:
+ except Exception, e:
 log.error(_("SMTP sendmail error: %r") % (e))
 
 if smtp:
@@ -413,25 +301,22 @@
 smtp = None
 
 if isinstance(itip_events, dict):
- itip_events = itip_events
+ itip_events = itip_events 
 
 for itip_event in itip_events:
 event_summary = itip_event'xml'.get_summary()
- message_text = request_text % {'summary': event_summary}
+ message_text = request_text % { 'summary':event_summary }
 
 if subject is not None:
- subject = subject % {'summary': event_summary}
+ subject = subject % { 'summary':event_summary }
 
 try:
- message = itip_event'xml'.to_message_itip(
- None,
+ message = itip_event'xml'.to_message_itip(None,
 method="REQUEST",
 message_text=message_text,
 subject=subject
 )
-
- # pylint: disable=broad-except
- except Exception as e:
+ except Exception, e:
 log.error(_("Failed to compose iTip request message: %r") % (e))
 return
 
@@ -443,9 +328,7 @@
 
 try:
 smtp.sendmail(message'From', to_address, message.as_string())
-
- # pylint: disable=broad-except
- except Exception as e:
+ except Exception, e:
 log.error(_("SMTP sendmail error: %r") % (e))
 
 if smtp:

pykolab-0.8.23.tar.gz/pykolab/logger.py -> pykolab-0.8.4.tar.gz/pykolab/logger.py Changed

@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
 
 import grp
 import logging
@@ -24,53 +23,9 @@
 import os
 import pwd
 import sys
+import time
 
-
-class StderrToLogger:
- """
- Fake file-like stream object that redirects writes to a logger instance.
- """
- def __init__(self, logger, log_level=logging.DEBUG):
- self.logger = logger
- self.log_level = log_level
- self.linebuf = ''
- self.skip_next = False
-
- def write(self, buf):
- # ugly patch to make smtplib and smtpd debug logging records appear on one line in log file
- # smtplib uses "print>>stderr, var, var" statements for debug logging. These
- # statements are splited into separate lines on separating whitespace.
-
- for line in buf.rstrip().splitlines():
- if self.skip_next:
- self.skip_next = False
- continue
-
- if buf != '\n':
- linestarts = line.split(':')0
- if linestarts in 'send', 'reply', 'Data', 'recips', 'Peer', 'sender':
- self.linebuf = line
- elif linestarts.startswith('===>'):
- # Do not log lines starting with ====>
- self.linebuf = ''
- self.skip_next = True
- continue
- else:
- self.logger.log(self.log_level, '%s %s', self.linebuf, line.rstrip():150)
- self.linebuf = ''
-
- def flush(self):
- pass
-
-
-class LoggerAdapter(logging.LoggerAdapter):
- """
- Custom LoggingAdapter to log Wallace mail message Queue ID
- """
-
- def process(self, msg, kwargs):
- return '%s %s' % (self.extra'qid', msg), kwargs
-
+from pykolab.translate import _
 
 class Logger(logging.Logger):
 """
@@ -89,31 +44,31 @@
 for arg in sys.argv:
 if debuglevel == -1:
 try:
- debuglevel = (int)(arg)
- except ValueError:
+ debuglevel = int(arg)
+ except ValueError, errmsg:
 continue
 
 loglevel = logging.DEBUG
 break
 
- if arg == '-d':
+ if '-d' == arg:
 debuglevel = -1
 continue
 
- if arg == '-l':
+ if '-l' == arg:
 loglevel = -1
 continue
 
- if arg == '--fork':
+ if '--fork' == arg:
 fork = True
 
 if loglevel == -1:
- if hasattr(logging, arg.upper()):
- loglevel = getattr(logging, arg.upper())
+ if hasattr(logging,arg.upper()):
+ loglevel = getattr(logging,arg.upper())
 else:
 loglevel = logging.DEBUG
 
- if arg in '-u', '--user':
+ if '-u' == arg or '--user' == arg:
 process_username = -1
 continue
 
@@ -123,7 +78,7 @@
 if process_username == -1:
 process_username = arg
 
- if arg in '-g', '--group':
+ if '-g' == arg or '--group' == arg:
 process_groupname = -1
 continue
 
@@ -133,11 +88,8 @@
 if process_groupname == -1:
 process_groupname = arg
 
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-statements
 def __init__(self, *args, **kw):
- if 'name' in kw:
+ if kw.has_key('name'):
 name = kw'name'
 elif len(args) == 1:
 name = args0
@@ -146,9 +98,7 @@
 
 logging.Logger.__init__(self, name)
 
- plaintextformatter = logging.Formatter(
- "%(asctime)s %(name)s %(levelname)s %(process)d %(message)s"
- )
+ plaintextformatter = logging.Formatter("%(asctime)s %(name)s %(levelname)s %(message)s")
 
 if not self.fork:
 self.console_stdout = logging.StreamHandler(sys.stdout)
@@ -156,7 +106,7 @@
 
 self.addHandler(self.console_stdout)
 
- if 'logfile' in kw:
+ if kw.has_key('logfile'):
 self.logfile = kw'logfile'
 else:
 self.logfile = '/var/log/kolab/pykolab.log'
@@ -167,9 +117,9 @@
 # Make sure (read: attempt to change) the permissions
 try:
 try:
- (ruid, _, _) = os.getresuid()
- (rgid, _, _) = os.getresgid()
- except AttributeError:
+ (ruid, euid, suid) = os.getresuid()
+ (rgid, egid, sgid) = os.getresgid()
+ except AttributeError, errmsg:
 ruid = os.getuid()
 rgid = os.getgid()
 
@@ -179,61 +129,57 @@
 # Get group entry details
 try:
 (
- _,
- _,
- group_gid,
- _
- ) = grp.getgrnam(self.process_groupname)
+ group_name,
+ group_password,
+ group_gid,
+ group_members
+ ) = grp.getgrnam(self.process_groupname)
 
- except KeyError:
- group_gid = False
+ except KeyError, errmsg:
+ group_name = False
 
 if ruid == 0:
 # Means we haven't switched yet.
 try:
 (
- _,
- _,
- user_uid,
- _,
- _,
- _,
- _
- ) = pwd.getpwnam(self.process_username)
-
- except KeyError:
- user_uid = False
+ user_name,
+ user_password,
+ user_uid,
+ user_gid,
+ user_gecos,
+ user_homedir,
+ user_shell
+ ) = pwd.getpwnam(self.process_username)
+
+ except KeyError, errmsg:
+ user_name = False
 
 if os.path.isfile(self.logfile):
 try:
- if user_uid > 0 or group_gid > 0:
+ if not user_uid == 0 or group_gid == 0:
 os.chown(
- self.logfile,
- user_uid,
- group_gid
- )
-
- os.chmod(self.logfile, 0o660)
-
- except Exception as errmsg:
- print(
- _("Could not change permissions on %s: %r") % (self.logfile, errmsg)
- )
-
+ self.logfile,
+ user_uid,
+ group_gid
+ )
+ os.chmod(self.logfile, 0660)
+
+ except Exception, errmsg:
+ self.error(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
 if self.debuglevel > 8:
 import traceback
 traceback.print_exc()
 
- except Exception as errmsg:
+ except Exception, errmsg:
 if os.path.isfile(self.logfile):
- print(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
+ self.error(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
 if self.debuglevel > 8:
 import traceback
 traceback.print_exc()
 
 # Make sure the log file exists
 try:
- fhandle = open(self.logfile, 'a')
+ fhandle = file(self.logfile, 'a')
 try:
 os.utime(self.logfile, None)
 finally:
@@ -242,16 +188,16 @@
 try:
 filelog_handler = logging.FileHandler(filename=self.logfile)
 filelog_handler.setFormatter(plaintextformatter)
- except IOError as errmsg:
- print(_("Cannot log to file %s: %s") % (self.logfile, errmsg), file=sys.stderr)
+ except IOError, e:
+ print >> sys.stderr, _("Cannot log to file %s: %s") % (self.logfile, e)
 
- if len(self.handlers) <= 1:
+ if not len(self.handlers) > 1:
 try:
 self.addHandler(filelog_handler)
- except Exception:
+ except:
 pass
 
- except IOError:
+ except IOError, errmsg:
 pass
 
 def remove_stdout_handler(self):
@@ -259,16 +205,15 @@
 self.console_stdout.close()
 self.removeHandler(self.console_stdout)
 
- # pylint: disable=arguments-differ
- # pylint: disable=keyword-arg-before-vararg
 def debug(self, msg, level=1, *args, **kw):
 self.setLevel(self.loglevel)
 # Work around other applications not using various levels of debugging
- if not self.name.startswith('pykolab') and self.debuglevel != 9:
+ if not self.name.startswith('pykolab') and not self.debuglevel == 9:
 return
 
 if level <= self.debuglevel:
- self.log(logging.DEBUG, msg)
+ # TODO: Not the way it's supposed to work!
+ self.log(logging.DEBUG, '%d: %s' % (os.getpid(),msg))
 
 
 logging.setLoggerClass(Logger)

pykolab-0.8.23.tar.gz/pykolab/plugins/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/plugins/__init__.py Changed

@@ -30,7 +30,6 @@
 log = pykolab.getLogger('pykolab.plugins')
 conf = pykolab.getConf()
 
-
 class KolabPlugins(object):
 """
 Detects, loads and interfaces with plugins for different
@@ -51,7 +50,7 @@
 
 if os.path.isdir(plugin_path):
 for plugin in os.listdir(plugin_path):
- if os.path.isdir('%s/%s/' % (plugin_path, plugin, )):
+ if os.path.isdir('%s/%s/' % (plugin_path,plugin,)):
 self.pluginsplugin = False
 
 self.check_plugins()
@@ -67,15 +66,15 @@
 exec("from pykolab.plugins import %s" % (plugin))
 self.pluginsplugin = True
 self.load_plugins(plugins=plugin)
- except ImportError as e:
- log.error(_("ImportError for plugin %s: %s") % (plugin, e))
+ except ImportError, e:
+ log.error(_("ImportError for plugin %s: %s") % (plugin,e))
 traceback.print_exc()
 self.pluginsplugin = False
- except RuntimeError as e:
- log.error( _("RuntimeError for plugin %s: %s") % (plugin, e))
+ except RuntimeError, e:
+ log.error( _("RuntimeError for plugin %s: %s") % (plugin,e))
 traceback.print_exc()
 self.pluginsplugin = False
- except Exception as e:
+ except Exception, e:
 log.error(_("Plugin %s failed to load (%s: %s)") % (plugin, e.__class__, e))
 traceback.print_exc()
 except:
@@ -92,7 +91,7 @@
 for plugin in plugins:
 if self.pluginsplugin:
 try:
- exec("self.%s = %s.Kolab%s()" % (plugin, plugin, plugin.capitalize()))
+ exec("self.%s = %s.Kolab%s()" % (plugin,plugin,plugin.capitalize()))
 except:
 # TODO: A little better verbosity please!
 traceback.print_exc()
@@ -107,16 +106,16 @@
 for plugin in plugins:
 if not self.pluginsplugin:
 continue
- if not hasattr(self, plugin):
+ if not hasattr(self,plugin):
 continue
 
- if hasattr(getattr(self, plugin), "set_defaults"):
+ if hasattr(getattr(self,plugin),"set_defaults"):
 try:
- getattr(self, plugin).set_defaults(defaults)
- except TypeError as e:
- log.error(_("Cannot set defaults for plugin %s: %s") % (plugin, e))
- except RuntimeError as e:
- log.error(_("Cannot set defaults for plugin %s: %s") % (plugin, e))
+ getattr(self,plugin).set_defaults(defaults)
+ except TypeError, e:
+ log.error(_("Cannot set defaults for plugin %s: %s") % (plugin,e))
+ except RuntimeError, e:
+ log.error(_("Cannot set defaults for plugin %s: %s") % (plugin,e))
 except:
 log.error(_("Cannot set defaults for plugin %s: Unknown Error") % (plugin))
 
@@ -133,14 +132,14 @@
 for plugin in plugins:
 if not self.pluginsplugin:
 continue
- if not hasattr(self, plugin):
+ if not hasattr(self,plugin):
 continue
 
- if hasattr(getattr(self, plugin), "set_runtime"):
+ if hasattr(getattr(self,plugin),"set_runtime"):
 try:
- getattr(self, plugin).set_runtime(runtime)
- except RuntimeError as e:
- log.error(_("Cannot set runtime for plugin %s: %s") % (plugin, e))
+ getattr(self,plugin).set_runtime(runtime)
+ except RuntimeError, e:
+ log.error(_("Cannot set runtime for plugin %s: %s") % (plugin,e))
 else:
 log.debug(_("Not setting runtime for plugin %s: No function 'set_runtime()'") % (plugin), level=5)
 
@@ -154,16 +153,16 @@
 for plugin in plugins:
 if not self.pluginsplugin:
 continue
- if not hasattr(self, plugin):
+ if not hasattr(self,plugin):
 continue
 
- if hasattr(getattr(self, plugin), "add_options"):
+ if hasattr(getattr(self,plugin),"add_options"):
 try:
 exec("self.%s.add_options(parser)" % plugin)
- except RuntimeError as e:
- log.error(_("Cannot add options for plugin %s: %s") % (plugin, e))
- except TypeError as e:
- log.error(_("Cannot add options for plugin %s: %s") % (plugin, e))
+ except RuntimeError, e:
+ log.error(_("Cannot add options for plugin %s: %s") % (plugin,e))
+ except TypeError, e:
+ log.error(_("Cannot add options for plugin %s: %s") % (plugin,e))
 else:
 log.debug(_("Not adding options for plugin %s: No function 'add_options()'") % plugin, level=5)
 
@@ -178,14 +177,14 @@
 for plugin in plugins:
 if not self.pluginsplugin:
 continue
- if not hasattr(self, plugin):
+ if not hasattr(self,plugin):
 continue
 
- if hasattr(getattr(self, plugin), "check_options"):
+ if hasattr(getattr(self,plugin),"check_options"):
 try:
 exec("self.%s.check_options()" % plugin)
- except AttributeError as e:
- log.error(_("Cannot check options for plugin %s: %s") % (plugin, e))
+ except AttributeError, e:
+ log.error(_("Cannot check options for plugin %s: %s") % (plugin,e))
 else:
 log.debug(_("Not checking options for plugin %s: No function 'check_options()'") % (plugin), level=5)
 
@@ -200,11 +199,11 @@
 for plugin in plugins:
 if not self.pluginsplugin:
 continue
- if not hasattr(self, plugin):
+ if not hasattr(self,plugin):
 continue
 
- if hasattr(getattr(self, plugin), "%s_%s" % (func, option)):
- exec("retval = getattr(self, plugin).%s_%s(val)" % (func, option))
+ if hasattr(getattr(self,plugin),"%s_%s" % (func,option)):
+ exec("retval = getattr(self,plugin).%s_%s(val)" % (func,option))
 return retval
 
 return False
@@ -220,34 +219,23 @@
 for plugin in plugins:
 if not self.pluginsplugin:
 continue
- if not hasattr(self, plugin):
+ if not hasattr(self,plugin):
 continue
 
- if hasattr(getattr(self, plugin), hook):
+ if hasattr(getattr(self,plugin),hook):
 try:
- log.debug(_("Executing hook %s for plugin %s") % (hook, plugin), level=8)
- func = getattr(getattr(self, plugin), hook)
- retval = func(*args, **kw)
- except TypeError as errmsg:
- log.error(
- _("Cannot execute hook %s for plugin %s: %s") % (hook, plugin, errmsg)
- )
-
- log.error(traceback.format_exc())
- except AttributeError as errmsg:
- log.error(
- _("Cannot execute hook %s for plugin %s: %s") % (hook, plugin, errmsg)
- )
-
- log.error(traceback.format_exc())
+ log.debug(_("Executing hook %s for plugin %s") % (hook,plugin), level=8)
+ #print "retval = self.%s.%s(%r, %r)" % (plugin,hook, args, kw)
+ exec("retval = self.%s.%s(*args, **kw)" % (plugin,hook))
+ except TypeError, e:
+ log.error(_("Cannot execute hook %s for plugin %s: %s") % (hook,plugin,e))
+ except AttributeError, e:
+ log.error(_("Cannot execute hook %s for plugin %s: %s") % (hook,plugin,e))
 
 return retval
 
 def return_true_boolean_from_plugins(self, bool, plugins=):
- """
- Given the name of a boolean, walks all specified plugins, or all available plugins, and
- returns True if a plugin has it set to true
- """
+ """Given the name of a boolean, walks all specified plugins, or all available plugins, and returns True if a plugin has it set to true"""
 if len(plugins) < 1:
 plugins = self.plugins.keys()
 
@@ -256,13 +244,13 @@
 for plugin in plugins:
 if not self.pluginsplugin:
 continue
- if not hasattr(self, plugin):
+ if not hasattr(self,plugin):
 continue
 
- if hasattr(getattr(self, plugin), bool):
+ if hasattr(getattr(self,plugin),bool):
 try:
- exec("boolval = self.%s.%s" % (plugin, bool))
- except AttributeError:
+ exec("boolval = self.%s.%s" % (plugin,bool))
+ except AttributeError, e:
 pass
 else:
 boolval = None

pykolab-0.8.23.tar.gz/pykolab/plugins/defaultfolders/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/plugins/defaultfolders/__init__.py Changed

pykolab-0.8.23.tar.gz/pykolab/plugins/dynamicquota/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/plugins/dynamicquota/__init__.py Changed

pykolab-0.8.23.tar.gz/pykolab/plugins/recipientpolicy/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/plugins/recipientpolicy/__init__.py Changed

@@ -56,12 +56,12 @@
 
         user_attrs = utils.normalize(kw'entry')
 
-        if 'domain' not in user_attrs:
+        if not user_attrs.has_key('domain'):
             user_attrs'domain' = kw'primary_domain'
         elif not user_attrs'domain' == kw'primary_domain':
             user_attrs'domain' = kw'primary_domain'
 
-        if 'preferredlanguage' not in user_attrs:
+        if not user_attrs.has_key('preferredlanguage'):
             default_locale = conf.get(user_attrs'domain', 'default_locale')
             if default_locale == None:
                 default_locale = conf.get('kolab', 'default_locale')
@@ -75,9 +75,9 @@
             mail = utils.translate(mail, user_attrs'preferredlanguage')
             mail = mail.lower()
             return mail
-        except KeyError:
+        except KeyError, e:
             log.warning(_("Attribute substitution for 'mail' failed in Recipient Policy"))
-            if 'mail' in user_attrs:
+            if user_attrs.has_key('mail'):
                 return user_attrs'mail'
             else:
                 return None
@@ -96,12 +96,12 @@
 
         user_attrs = utils.normalize(kw'entry')
 
-        if 'domain' not in user_attrs:
+        if not user_attrs.has_key('domain'):
             user_attrs'domain' = kw'primary_domain'
         elif not user_attrs'domain' == kw'primary_domain':
             user_attrs'domain' = kw'primary_domain'
 
-        if 'preferredlanguage' not in user_attrs:
+        if not user_attrs.has_key('preferredlanguage'):
             default_locale = conf.get(user_attrs'domain', 'default_locale')
             if default_locale == None:
                 default_locale = conf.get(user_attrs'domain', 'default_locale')
@@ -112,7 +112,7 @@
 
         try:
             exec("alternative_mail_routines = %s" % kw'secondary_mail')
-        except Exception:
+        except Exception, e:
             log.error(_("Could not parse the alternative mail routines"))
 
         alternative_mail = 
@@ -123,22 +123,22 @@
         for attr in  'givenname', 'sn', 'surname' :
             try:
                 user_attrsattr = utils.translate(user_attrsattr, user_attrs'preferredlanguage')
-            except Exception:
+            except Exception, errmsg:
                 log.error(_("An error occurred in composing the secondary mail attribute for entry %r") % (user_attrs'id'))
                 if conf.debuglevel > 8:
                     import traceback
                     traceback.print_exc()
                 return 
 
-        for number in alternative_mail_routines:
-            for routine in alternative_mail_routinesnumber:
+        for number in alternative_mail_routines.keys():
+            for routine in alternative_mail_routinesnumber.keys():
                 try:
                     exec("retval = '%s'.%s" % (routine,alternative_mail_routinesnumberroutine % user_attrs))
 
                     log.debug(_("Appending additional mail address: %s") % (retval), level=8)
                     alternative_mail.append(retval)
 
-                except Exception as errmsg:
+                except Exception, errmsg:
                     log.error(_("Policy for secondary email address failed: %r") % (errmsg))
                     if conf.debuglevel > 8:
                         import traceback
@@ -153,7 +153,7 @@
                         log.debug(_("Appending additional mail address: %s") % (retval), level=8)
                         alternative_mail.append(retval)
 
-                    except KeyError:
+                    except KeyError, e:
                         log.warning(_("Attribute substitution for 'alternative_mail' failed in Recipient Policy"))
 
         alternative_mail = utils.normalize(alternative_mail)

pykolab-0.8.23.tar.gz/pykolab/plugins/roundcubedb/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/plugins/roundcubedb/__init__.py Changed

@@ -45,7 +45,7 @@
             domain - domain name
         """
 
-        log.debug(_("user_delete: %r") % (kw), level=8)
+        log.debug(_("user_delete: %r") % (kw), level=9)
 
         if os.path.isdir('/usr/share/roundcubemail'):
             rcpath = '/usr/share/roundcubemail/'
@@ -58,12 +58,12 @@
         result_attribute = conf.get('cyrus-sasl', 'result_attribute')
 
         # execute Roundcube's bin/deluser.sh script to do the work
-        if 'user' in kw and result_attribute in kw'user' and os.path.exists(rcpath + 'bin/deluser.sh'):
+        if kw.has_key('user') and kw'user'.has_key(result_attribute) and os.path.exists(rcpath + 'bin/deluser.sh'):
             proc = subprocess.Popen( 'sudo -u apache', rcpath + 'bin/deluser.sh', kw'user'result_attribute , stderr=subprocess.PIPE, stdout=subprocess.PIPE)
             procout, procerr = proc.communicate()
             if proc.returncode != 0:
                 log.error(rcpath + "bin/deluser.sh exited with error %d: %r" % (proc.returncode, procerr))
             else:
-                log.debug(rcpath + "bin/deluser.sh success: %r; %r" % (procout, procerr), level=8)
+                log.debug(rcpath + "bin/deluser.sh success: %r; %r" % (procout, procerr), level=9)
 
         return None

pykolab-0.8.23.tar.gz/pykolab/plugins/sievemgmt/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/plugins/sievemgmt/__init__.py Changed

@@ -47,7 +47,7 @@
 
             user - the user identifier
         """
-        if not len(kw) == 1 or 'user' not in kw:
+        if not len(kw.keys()) == 1 or not kw.has_key('user'):
             log.error(_("Wrong number of arguments for sieve management plugin"))
             return
         else:
@@ -137,28 +137,28 @@
 
         if not vacation_text_attr == None:
 
-            if vacation_active_attr in user:
+            if user.has_key(vacation_active_attr):
                 vacation_active = utils.true_or_false(uservacation_active_attr)
             else:
                 vacation_active = False
 
-            if vacation_text_attr in user:
+            if user.has_key(vacation_text_attr):
                 vacation_text = uservacation_text_attr
             else:
                 vacation_active = False
 
-            if vacation_uce_attr in user:
+            if user.has_key(vacation_uce_attr):
                 vacation_uce = utils.true_or_false(uservacation_uce_attr)
             else:
                 vacation_uce = False
 
-            if vacation_react_domains_attr in user:
+            if user.has_key(vacation_react_domains_attr):
                 if isinstance(uservacation_react_domains_attr, list):
                     vacation_react_domains = uservacation_react_domains_attr
                 else:
                     vacation_react_domains =  uservacation_react_domains_attr 
             else:
-                if vacation_noreact_domains_attr in user:
+                if user.has_key(vacation_noreact_domains_attr):
                     if isinstance(uservacation_noreact_domains_attr, list):
                         vacation_noreact_domains = uservacation_noreact_domains_attr
                     else:
@@ -171,7 +171,7 @@
         #
         dtf_active_attr = conf.get('sieve', 'deliver_to_folder_active')
         if not dtf_active_attr == None:
-            if dtf_active_attr in user:
+            if user.has_key(dtf_active_attr):
                 dtf_active = utils.true_or_false(userdtf_active_attr)
             else:
                 dtf_active = False
@@ -184,7 +184,7 @@
         if dtf_active:
             dtf_folder_name_attr = conf.get('sieve', 'deliver_to_folder_attr')
             if not dtf_folder_name_attr == None:
-                if dtf_folder_name_attr in user:
+                if user.has_key(dtf_folder_name_attr):
                     dtf_folder = userdtf_folder_name_attr
                 else:
                     log.warning(_("Delivery to folder active, but no folder name attribute available for user %r") % (user))
@@ -216,14 +216,14 @@
 
         forward_active_attr = conf.get('sieve', 'forward_address_active')
         if not forward_active_attr == None:
-            if forward_active_attr in user:
+            if user.has_key(forward_active_attr):
                 forward_active = utils.true_or_false(userforward_active_attr)
             else:
                 forward_active = False
 
         if not forward_active == False:
             forward_address_attr = conf.get('sieve', 'forward_address_attr')
-            if forward_address_attr in user:
+            if user.has_key(forward_address_attr):
                 if isinstance(userforward_address_attr, basestring):
                     forward_addresses =  userforward_address_attr 
                 elif isinstance(userforward_address_attr, str):
@@ -236,14 +236,14 @@
 
             forward_keepcopy_attr = conf.get('sieve', 'forward_keepcopy_active')
             if not forward_keepcopy_attr == None:
-                if forward_keepcopy_attr in user:
+                if user.has_key(forward_keepcopy_attr):
                     forward_keepcopy = utils.true_or_false(userforward_keepcopy_attr)
                 else:
                     forward_keepcopy = False
 
             forward_uce_attr = conf.get('sieve', 'forward_uce_active')
             if not forward_uce_attr == None:
-                if forward_uce_attr in user:
+                if user.has_key(forward_uce_attr):
                     forward_uce = utils.true_or_false(userforward_uce_attr)
                 else:
                     forward_uce = False

pykolab-0.8.23.tar.gz/pykolab/setup/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/setup/__init__.py Changed

pykolab-0.8.23.tar.gz/pykolab/setup/components.py -> pykolab-0.8.4.tar.gz/pykolab/setup/components.py Changed

@@ -64,7 +64,7 @@
 
     __components = {}
 
-    for component in components:
+    for component in components.keys():
         if isinstance(component, tuple):
             component_group, component = component
             __componentscomponent_group = {
@@ -77,24 +77,24 @@
     _components.sort()
 
     for _component in _components:
-        if 'function' in __components_component:
+        if __components_component.has_key('function'):
             # This is a top-level component
             if not __components_component'description' == None:
-                print("%-25s - %s" % (_component.replace('_','-'),__components_component'description'))
+                print "%-25s - %s" % (_component.replace('_','-'),__components_component'description')
             else:
-                print("%-25s" % (_component.replace('_','-')))
+                print "%-25s" % (_component.replace('_','-'))
 
     for _component in _components:
-        if 'function' not in __components_component:
+        if not __components_component.has_key('function'):
             # This is a nested component
-            print("\n" + _("Command Group: %s") % (_component) + "\n")
+            print "\n" + _("Command Group: %s") % (_component) + "\n"
             ___components = __components_component.keys()
             ___components.sort()
             for __component in ___components:
                 if not __components_component__component'description' == None:
-                    print("%-4s%-21s - %s" % ('',__component.replace('_','-'),__components_component__component'description'))
+                    print "%-4s%-21s - %s" % ('',__component.replace('_','-'),__components_component__component'description')
                 else:
-                    print("%-4s%-21s" % ('',__component.replace('_','-')))
+                    print "%-4s%-21s" % ('',__component.replace('_','-'))
 
 def _list_components(*args, **kw):
     """
@@ -104,7 +104,7 @@
 
     __components = {}
 
-    for component in components:
+    for component in components.keys():
         if isinstance(component, tuple):
             component_group, component = component
             __componentscomponent_group = {
@@ -124,20 +124,20 @@
     if component_name in components_included_in_cli:
         return
 
-    if 'group' in componentscomponent_name:
+    if componentscomponent_name.has_key('group'):
         group = componentscomponent_name'group'
         component_name = componentscomponent_name'component_name'
         try:
             exec("from %s.setup_%s import cli_options as %s_%s_cli_options" % (group,component_name,group,component_name))
             exec("%s_%s_cli_options()" % (group,component_name))
-        except ImportError:
+        except ImportError, e:
             pass
 
     else:
         try:
             exec("from setup_%s import cli_options as %s_cli_options" % (component_name,component_name))
             exec("%s_cli_options()" % (component_name))
-        except ImportError:
+        except ImportError, e:
             pass
 
     components_included_in_cli.append(component_name)
@@ -161,7 +161,7 @@
                     execute_this = False
 
                 if execute_this:
-                    if 'after' in componentscomponent:
+                    if componentscomponent.has_key('after'):
                         for _component in componentscomponent'after':
                             if not _component in executed_components:
                                 execute_this = False
@@ -183,12 +183,12 @@
         for component in _list_components():
             cli_options_from_component(component)
 
-    if component_name not in components:
+    if not components.has_key(component_name):
         log.error(_("No such component."))
         sys.exit(1)
 
-    if 'function' not in componentscomponent_name and \
-        'group' not in componentscomponent_name:
+    if not componentscomponent_name.has_key('function') and \
+        not componentscomponent_name.has_key('group'):
         log.error(_("No such component."))
         sys.exit(1)
 
@@ -227,7 +227,7 @@
     if isinstance(aliases, basestring):
         aliases = aliases
 
-    if component in components:
+    if components.has_key(component):
         log.fatal(_("Command '%s' already registered") % (component))
         sys.exit(1)
 
@@ -262,5 +262,5 @@
 ##
 
 def not_yet_implemented(*args, **kw):
-    print(_("Not yet implemented"))
+    print _("Not yet implemented")
     sys.exit(1)

pykolab-0.8.23.tar.gz/pykolab/setup/setup_freebusy.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_freebusy.py Changed

pykolab-0.8.23.tar.gz/pykolab/setup/setup_imap.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_imap.py Changed

pykolab-0.8.23.tar.gz/pykolab/setup/setup_ldap.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_ldap.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import ldap
 import ldap.modlist
 import os
@@ -104,7 +102,7 @@
 ask_questions = False
 
 if conf.without_ldap:
- print(_("Skipping setup of LDAP, as specified"), file=sys.stderr)
+ print >> sys.stderr, _("Skipping setup of LDAP, as specified")
 return
 
 _input = {}
@@ -132,12 +130,12 @@
 return
 
 elif conf.with_ad and conf.with_openldap:
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 You can not configure Kolab to run against OpenLDAP
 and Active Directory simultaneously.
 """)
- ), file=sys.stderr)
+ )
 
 sys.exit(1)
 
@@ -145,7 +143,7 @@
 for path, directories, files in os.walk('/etc/dirsrv/'):
 for direct in directories:
 if direct.startswith('slapd-'):
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 It seems 389 Directory Server has an existing
 instance configured. This setup script does not
@@ -153,20 +151,20 @@
 make sure /etc/dirsrv/ and /var/lib/dirsrv/ are
 clean so that this setup does not have to worry.
 """)
- ), file=sys.stderr)
+ )
 
 sys.exit(1)
 
 _input = {}
 
 if ask_questions:
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 Please supply a password for the LDAP administrator user
 'admin', used to login to the graphical console of 389
 Directory server.
 """)
- ), file=sys.stderr)
+ )
 
 _input'admin_pass' = utils.ask_question(
 _("Administrator password"),
@@ -178,14 +176,14 @@
 if conf.directory_manager_pwd is not None:
 _input'dirmgr_pass' = conf.directory_manager_pwd
 else:
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 Please supply a password for the LDAP Directory Manager
 user, which is the administrator user you will be using
 to at least initially log in to the Web Admin, and that
 Kolab uses to perform administrative tasks.
 """)
- ), file=sys.stderr)
+ )
 
 _input'dirmgr_pass' = utils.ask_question(
 _("Directory Manager password"),
@@ -194,13 +192,13 @@
 confirm=True
 )
 
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 Please choose the system user and group the service
 should use to run under. These should be existing,
 unprivileged, local system POSIX accounts with no shell.
 """)
- ), file=sys.stderr)
+ )
 
 try:
 pw = pwd.getpwnam("dirsrv")
@@ -243,7 +241,7 @@
 _input'rootdn' = utils.standard_root_dn(_input'domain')
 
 if ask_questions:
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 This setup procedure plans to set up Kolab Groupware for
 the following domain name space. This domain name is
@@ -251,7 +249,7 @@
 interface. Please confirm this is the appropriate domain
 name space.
 """)
- ), file=sys.stderr)
+ )
 
 answer = utils.ask_confirmation("%s" % (_input'domain'))
 
@@ -262,21 +260,21 @@
 if not _input'domain' == None and not _input'domain' == "":
 positive_answer = True
 else:
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 Invalid input. Please try again.
 """)
- ), file=sys.stderr)
+ )
 
 _input'nodotdomain' = _input'domain'.replace('.','_')
 _input'rootdn' = utils.standard_root_dn(_input'domain')
 
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 The standard root dn we composed for you follows. Please
 confirm this is the root dn you wish to use.
 """)
- ), file=sys.stderr)
+ )
 
 answer = utils.ask_confirmation("%s" % (_input'rootdn'))
 
@@ -287,11 +285,11 @@
 if not _input'rootdn' == None and not _input'rootdn' == "":
 positive_answer = True
 else:
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 Invalid input. Please try again.
 """)
- ), file=sys.stderr)
+ )
 
 # TODO: Loudly complain if the fqdn does not resolve back to this system.
 
@@ -328,8 +326,8 @@
 
 if os.path.isfile("/usr/sbin/setup-ds-admin.pl"):
 setup_ds_admin = "/usr/sbin/setup-ds-admin.pl"
- elif os.path.isfile("/usr/sbin/setup-ds-admin"):
- setup_ds_admin = "/usr/sbin/setup-ds-admin"
+ #elif os.path.isfile("/usr/sbin/setup-ds-admin"):
+ #setup_ds_admin = "/usr/sbin/setup-ds-admin"
 elif os.path.isfile("/usr/sbin/setup-ds.pl"):
 setup_ds_admin = "/usr/sbin/setup-ds.pl"
 elif os.path.isfile("/usr/sbin/setup-ds"):
@@ -346,13 +344,13 @@
 '--file=%s' % (filename)
 
 
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 Setup is now going to set up the 389 Directory Server. This
 may take a little while (during which period there is no
 output and no progress indication).
 """)
- ), file=sys.stderr)
+ )
 
 log.info(_("Setting up 389 Directory Server"))
 
@@ -365,7 +363,7 @@
 (stdoutdata, stderrdata) = setup_389.communicate()
 
 if not setup_389.returncode == 0:
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 An error was detected in the setup procedure for 389
 Directory Server. This setup will write out stderr and
@@ -373,7 +371,7 @@
 /var/log/kolab/setup.out.log respectively, before it
 exits.
 """)
- ), file=sys.stderr)
+ )
 
 fp = open('/var/log/kolab/setup.error.log', 'w')
 fp.write(stderrdata)
@@ -420,7 +418,6 @@
 
 if os.path.isfile('/bin/systemctl'):
 subprocess.call('/bin/systemctl', 'restart', 'dirsrv.target')
- subprocess.call('/bin/systemctl', 'restart', 'dirsrv@' + _input'hostname')
 time.sleep(20)
 elif os.path.isfile('/sbin/service'):
 subprocess.call('/sbin/service', 'dirsrv', 'restart')
@@ -433,7 +430,6 @@
 
 if os.path.isfile('/bin/systemctl'):
 subprocess.call('/bin/systemctl', 'enable', 'dirsrv.target')
- subprocess.call('/bin/systemctl', 'enable', 'dirsrv@' + _input'hostname')
 elif os.path.isfile('/sbin/chkconfig'):
 subprocess.call('/sbin/chkconfig', 'dirsrv', 'on')
 elif os.path.isfile('/usr/sbin/update-rc.d'):
@@ -443,7 +439,7 @@
 "directory server service."))
 
 if ask_questions:
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 Please supply a Cyrus Administrator password. This
 password is used by Kolab to execute administrative
@@ -451,7 +447,7 @@
 yourself to troubleshoot Cyrus IMAP and/or perform
 other administrative tasks against Cyrus IMAP directly.
 """)
- ), file=sys.stderr)
+ )
 
 _input'cyrus_admin_pass' = utils.ask_question(
 _("Cyrus Administrator password"),
@@ -460,14 +456,14 @@
 confirm=True
 )
 
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
 Please supply a Kolab Service account password. This
 account is used by various services such as Postfix,
 and Roundcube, as anonymous binds to the LDAP server
 will not be allowed.
 """)
- ), file=sys.stderr)
+ )
 
 _input'kolab_service_pass' = utils.ask_question(
 _("Kolab Service password"),

pykolab-0.8.23.tar.gz/pykolab/setup/setup_mta.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_mta.py Changed

@@ -235,17 +235,10 @@
                     },
         }
 
-    if not os.path.isfile('/etc/postfix/main.cf'):
-        if os.path.isfile('/usr/share/postfix/main.cf.debian'):
-            shutil.copy(
-                    '/usr/share/postfix/main.cf.debian',
-                    '/etc/postfix/main.cf'
-                )
-
     if not os.path.isdir('/etc/postfix/ldap'):
-        os.mkdir('/etc/postfix/ldap/', 0o770)
+        os.mkdir('/etc/postfix/ldap/', 0770)
 
-    for filename in files:
+    for filename in files.keys():
         fp = open(filename, 'w')
         fp.write(filesfilename)
         fp.close()
@@ -284,9 +277,13 @@
     if os.path.isfile('/etc/pki/tls/private/localhost.pem'):
         postfix_main_settings'smtpd_tls_cert_file' = "/etc/pki/tls/private/localhost.pem"
         postfix_main_settings'smtpd_tls_key_file' = "/etc/pki/tls/private/localhost.pem"
-    elif os.path.isfile('/etc/ssl/private/cyrus-imapd.pem'): # Debian 9
-        postfix_main_settings'smtpd_tls_cert_file' = "/etc/ssl/private/cyrus-imapd.pem"
-        postfix_main_settings'smtpd_tls_key_file' = "/etc/ssl/private/cyrus-imapd.pem"
+
+    if not os.path.isfile('/etc/postfix/main.cf'):
+        if os.path.isfile('/usr/share/postfix/main.cf.debian'):
+            shutil.copy(
+                    '/usr/share/postfix/main.cf.debian',
+                    '/etc/postfix/main.cf'
+                )
 
     # Copy header checks files
     for hc_file in  'inbound', 'internal', 'submission' :
@@ -305,7 +302,7 @@
 
     setting_base = '/files/etc/postfix/main.cf/'
 
-    for setting_key in postfix_main_settings:
+    for setting_key in postfix_main_settings.keys():
         setting = os.path.join(setting_base,setting_key)
         current_value = myaugeas.get(setting)
 
@@ -475,33 +472,19 @@
         log.error(_("Could not find a ClamAV update configuration file"))
 
     if os.path.isfile('/etc/freshclam.conf'):
-        subprocess.call(
+        subprocess.call(
                 '/usr/bin/freshclam',
                 '--quiet',
                 '--datadir="/var/lib/clamav"'
-            )
+            )
 
     amavisservice = 'amavisd.service'
     clamavservice = 'clamd@amavisd.service'
-
     if os.path.isfile('/usr/lib/systemd/system/amavis.service'):
         amavisservice = 'amavis.service'
-
-    if os.path.isfile('/lib/systemd/system/amavis.service'):
-        amavisservice = 'amavis.service'
-
-    if os.path.isfile('/etc/init.d/amavis'):
-        amavisservice = 'amavis.service'
-
     if os.path.isfile('/usr/lib/systemd/system/clamd.service'):
         clamavservice = 'clamd.service'
 
-    if os.path.isfile('/lib/systemd/system/clamd.service'):
-        clamavservice = 'clamd.service'
-
-    if os.path.isfile('/lib/systemd/system/clamav-daemon.service'):
-        clamavservice = 'clamav-daemon.service'
-
     if os.path.isfile('/bin/systemctl'):
         subprocess.call('systemctl', 'restart', 'postfix.service')
         subprocess.call('systemctl', 'restart', amavisservice)

pykolab-0.8.23.tar.gz/pykolab/setup/setup_mysql.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_mysql.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import os
 import subprocess
 import tempfile
@@ -35,192 +33,119 @@
 log = pykolab.getLogger('pykolab.setup')
 conf = pykolab.getConf()
 
-
 def __init__():
 components.register('mysql', execute, description=description())
 
-
 def cli_options():
- mysql_group = conf.add_cli_parser_option_group(_("MySQL Options"))
-
- mysql_group.add_option(
- "--mysqlserver",
- dest="mysqlserver",
- action="store",
- help=_("Specify whether to use an (existing), (unix_socket) or (new) MySQL server.")
- )
-
- mysql_group.add_option(
- "--mysqlhost",
- dest="mysqlhost",
- action="store",
- default='127.0.0.1',
- help=_("The MySQL host address.")
- )
-
- mysql_group.add_option(
- "--mysqlrootpw",
- dest="mysqlrootpw",
- action="store",
- help=_("The MySQL root user password.")
- )
+ ldap_group = conf.add_cli_parser_option_group(_("MySQL Options"))
 
+ ldap_group.add_option(
+ "--mysqlserver",
+ dest = "mysqlserver",
+ action = "store",
+ help = _("Specify whether to use an (existing) or (new) MySQL server.")
+ )
 
 def description():
 return _("Setup MySQL.")
 
-
-def execute(*args, **kw): # noqa: C901
+def execute(*args, **kw):
 
 socket_paths = 
- "/var/lib/mysql/mysql.sock",
- "/var/run/mysqld/mysqld.sock",
- "/var/run/mysql/mysql.sock",
- "/var/run/mysqld/mysqld.pid"
- 
+ "/var/lib/mysql/mysql.sock",
+ "/var/run/mysqld/mysqld.sock",
+ "/var/run/mysql/mysql.sock",
+ "/var/run/mysqld/mysqld.pid"
+ 
 
 # on CentOS7, there is MariaDB instead of MySQL
- if conf.mysqlserver != 'existing':
- mysqlservice = 'mysqld.service'
- if os.path.isfile('/usr/lib/systemd/system/mariadb.service'):
- mysqlservice = 'mariadb.service'
- elif os.path.isfile('/usr/lib/systemd/system/mysql.service'):
- mysqlservice = 'mysql.service'
- if not os.path.isfile('/usr/lib/systemd/system/' + mysqlservice):
- # on Debian Jessie, systemctl restart mysql
- mysqlservice = 'mysql'
-
- if os.path.isfile('/bin/systemctl'):
- subprocess.call('/bin/systemctl', 'restart', mysqlservice)
- elif os.path.isfile('/sbin/service'):
- subprocess.call('/sbin/service', 'mysqld', 'restart')
- elif os.path.isfile('/usr/sbin/service'):
- subprocess.call('/usr/sbin/service', 'mysql', 'restart')
- else:
- log.error(_("Could not start the MySQL database service."))
-
- if os.path.isfile('/bin/systemctl'):
- subprocess.call('/bin/systemctl', 'enable', mysqlservice)
- elif os.path.isfile('/sbin/chkconfig'):
- subprocess.call('/sbin/chkconfig', 'mysqld', 'on')
- elif os.path.isfile('/usr/sbin/update-rc.d'):
- subprocess.call('/usr/sbin/update-rc.d', 'mysql', 'defaults')
- else:
- log.error(
- _("Could not configure to start on boot, the MySQL database service.")
- )
+ mysqlservice = 'mysqld.service'
+ if os.path.isfile('/usr/lib/systemd/system/mariadb.service'):
+ mysqlservice = 'mariadb.service'
+ elif os.path.isfile('/usr/lib/systemd/system/mysql.service'):
+ mysqlservice = 'mysql.service'
+ if not os.path.isfile('/usr/lib/systemd/system/' + mysqlservice):
+ # on Debian Jessie, systemctl restart mysql
+ mysqlservice = 'mysql'
+
+ if os.path.isfile('/bin/systemctl'):
+ subprocess.call('/bin/systemctl', 'restart', mysqlservice)
+ elif os.path.isfile('/sbin/service'):
+ subprocess.call('/sbin/service', 'mysqld', 'restart')
+ elif os.path.isfile('/usr/sbin/service'):
+ subprocess.call('/usr/sbin/service','mysql','restart')
+ else:
+ log.error(_("Could not start the MySQL database service."))
+
+ if os.path.isfile('/bin/systemctl'):
+ subprocess.call('/bin/systemctl', 'enable', mysqlservice)
+ elif os.path.isfile('/sbin/chkconfig'):
+ subprocess.call('/sbin/chkconfig', 'mysqld', 'on')
+ elif os.path.isfile('/usr/sbin/update-rc.d'):
+ subprocess.call('/usr/sbin/update-rc.d', 'mysql', 'defaults')
+ else:
+ log.error(_("Could not configure to start on boot, the " + \
+ "MySQL database service."))
 
- log.info(_("Waiting for at most 30 seconds for MySQL/MariaDB to settle..."))
- max_wait = 30
- while max_wait > 0:
- for socket_path in socket_paths:
- if os.path.exists(socket_path):
- max_wait = 0
+ log.info(_("Waiting for at most 30 seconds for MySQL/MariaDB to settle..."))
+ max_wait = 30
+ while max_wait > 0:
+ for socket_path in socket_paths:
+ if os.path.exists(socket_path):
+ max_wait = 0
 
- if max_wait > 0:
- max_wait = max_wait - 1
- time.sleep(1)
+ if max_wait > 0:
+ max_wait = max_wait - 1
+ time.sleep(1)
 
 options = {
- 1: "Existing MySQL server (with root password already set).",
- 2: "Existing MySQL server (with unix_socket authentication plugin).",
- 3: "New MySQL server (needs to be initialized)."
- }
+ 1: "Existing MySQL server (with root password already set).",
+ 2: "New MySQL server (needs to be initialized)."
+ }
 
 answer = 0
- if conf.mysqlserver != 'existing':
- if len(x for x in socket_paths if os.path.exists(x)) > 0:
- if conf.mysqlserver:
- if conf.mysqlserver == 'existing':
- answer = 1
- elif conf.mysqlserver == 'unix_socket':
- answer = 2
- elif conf.mysqlserver == 'new':
- answer = 3
- if answer == 0:
- answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
- else:
- answer = 1
+ if len(x for x in socket_paths if os.path.exists(x)) > 0:
+ if conf.mysqlserver:
+ if conf.mysqlserver == 'existing':
+ answer = 1
+ elif conf.mysqlserver == 'new':
+ answer = 2
+ if answer == 0:
+ answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
 
 if answer == "1" or answer == 1:
- if not conf.mysqlrootpw:
- print(utils.multiline_message(
+ print >> sys.stderr, utils.multiline_message(
 _("""
- Please supply the root password for MySQL, so we can set
- up user accounts for other components that use MySQL.
- """)
- ), file=sys.stderr)
+ Please supply the root password for MySQL, so we can set
+ up user accounts for other components that use MySQL.
+ """)
+ )
 
- mysql_root_password = utils.ask_question(
+ mysql_root_password = utils.ask_question(
 _("MySQL root password"),
 password=True
 )
 
- else:
- mysql_root_password = conf.mysqlrootpw
-
- elif answer == "2" or answer == 2:
- mysql_root_password = 'unix_socket'
-
 else:
- print(utils.multiline_message(
- _("""
- Please supply a root password for MySQL. This password
- will be the administrative user for this MySQL server,
- and it should be kept a secret. After this setup process
- has completed, Kolab is going to discard and forget
- about this password, but you will need it for
- administrative tasks in MySQL.
- """)
- ), file=sys.stderr)
+ print >> sys.stderr, utils.multiline_message(
+ _("""
+ Please supply a root password for MySQL. This password
+ will be the administrative user for this MySQL server,
+ and it should be kept a secret. After this setup process
+ has completed, Kolab is going to discard and forget
+ about this password, but you will need it for
+ administrative tasks in MySQL.
+ """)
+ )
 
 mysql_root_password = utils.ask_question(
- _("MySQL root password"),
- default=utils.generate_password(),
- password=True,
- confirm=True
- )
-
- p1 = subprocess.Popen(
- 
- 'echo',
- 'UPDATE mysql.user SET Password=PASSWORD(\'%s\') WHERE User=\'root\';' % (
- mysql_root_password
- )
- ,
- stdout=subprocess.PIPE
- )
-
- p2 = subprocess.Popen('mysql', stdin=p1.stdout)
- p1.stdout.close()
- p2.communicate()
-
- p1 = subprocess.Popen(
- 
- 'echo',
- "UPDATE mysql.user SET authentication_string=PASSWORD('%s') WHERE User='root';" % (
- mysql_root_password
- )
- ,
- stdout=subprocess.PIPE
- )
-
- p2 = subprocess.Popen('mysql', stdin=p1.stdout)
- p1.stdout.close()
- p2.communicate()
-
- p1 = subprocess.Popen(
- 
- 'echo',
- """
- UPDATE mysql.user
- SET plugin='mysql_native_password'
- WHERE User='root' AND plugin='auth_socket';
- """
- ,
- stdout=subprocess.PIPE
- )
+ _("MySQL root password"),
+ default=utils.generate_password(),
+ password=True,
+ confirm=True
+ )
 
+ p1 = subprocess.Popen('echo', 'UPDATE mysql.user SET Password=PASSWORD(\'%s\') WHERE User=\'root\';' % (mysql_root_password), stdout=subprocess.PIPE)
 p2 = subprocess.Popen('mysql', stdin=p1.stdout)
 p1.stdout.close()
 p2.communicate()
@@ -230,35 +155,14 @@
 p1.stdout.close()
 p2.communicate()
 
- socket_path = None
- socket_paths = 
- "/var/lib/mysql/mysql.sock",
- "/var/run/mysqld/mysqld.sock",
- "/var/run/mysql/mysql.sock"
- 
- for sp in socket_paths:
- if os.path.exists(sp):
- socket_path = sp
-
- if mysql_root_password == "unix_socket" and socket_path is not None:
- data = """
-mysql
-user=root
-password=
-host=localhost
-socket=%s
-""" % (socket_path)
- else:
- data = """
+ data = """
 mysql
 user=root
 password='%s'
-host=%s
-""" % (mysql_root_password, conf.mysqlhost)
-
+""" % (mysql_root_password)
 
 fp = open('/tmp/kolab-setup-my.cnf', 'w')
- os.chmod('/tmp/kolab-setup-my.cnf', 0o600)
+ os.chmod('/tmp/kolab-setup-my.cnf', 0600)
 fp.write(data)
 fp.close()
 
@@ -270,74 +174,41 @@
 if filename.endswith('oracle.sql'):
 continue
 
- schema_file = os.path.join(root, filename)
+ schema_file = os.path.join(root,filename)
 
- if schema_file is not None:
+ if not schema_file == None:
 p1 = subprocess.Popen('echo', 'create database kolab;', stdout=subprocess.PIPE)
 p2 = subprocess.Popen('mysql', '--defaults-file=/tmp/kolab-setup-my.cnf', stdin=p1.stdout)
 p1.stdout.close()
 p2.communicate()
 
- print(utils.multiline_message(
- _("""
- Please supply a password for the MySQL user 'kolab'.
- This password will be used by Kolab services, such as
- the Web Administration Panel.
- """)
- ), file=sys.stderr)
+ print >> sys.stderr, utils.multiline_message(
+ _("""
+ Please supply a password for the MySQL user 'kolab'.
+ This password will be used by Kolab services, such as
+ the Web Administration Panel.
+ """)
+ )
 
 mysql_kolab_password = utils.ask_question(
- _("MySQL kolab password"),
- default=utils.generate_password(),
- password=True,
- confirm=True
- )
-
- p1 = subprocess.Popen(
- 
- 'echo',
- "GRANT ALL PRIVILEGES ON kolab.* TO 'kolab'@'localhost' IDENTIFIED BY '%s';" % (
- mysql_kolab_password
- )
- ,
- stdout=subprocess.PIPE
- )
-
- p2 = subprocess.Popen(
- 
- 'mysql',
- '--defaults-file=/tmp/kolab-setup-my.cnf'
- ,
- stdin=p1.stdout
- )
+ _("MySQL kolab password"),
+ default=utils.generate_password(),
+ password=True,
+ confirm=True
+ )
 
+ p1 = subprocess.Popen('echo', 'GRANT ALL PRIVILEGES ON kolab.* TO \'kolab\'@\'localhost\' IDENTIFIED BY \'%s\';' % (mysql_kolab_password), stdout=subprocess.PIPE)
+ p2 = subprocess.Popen('mysql', '--defaults-file=/tmp/kolab-setup-my.cnf', stdin=p1.stdout)
 p1.stdout.close()
 p2.communicate()
 
 p1 = subprocess.Popen('cat', schema_file, stdout=subprocess.PIPE)
- p2 = subprocess.Popen(
- 
- 'mysql',
- '--defaults-file=/tmp/kolab-setup-my.cnf',
- 'kolab'
- ,
- stdin=p1.stdout
- )
-
+ p2 = subprocess.Popen('mysql', '--defaults-file=/tmp/kolab-setup-my.cnf', 'kolab', stdin=p1.stdout)
 p1.stdout.close()
 p2.communicate()
 
- conf.command_set(
- 'kolab_wap',
- 'sql_uri',
- 'mysql://kolab:%s@localhost/kolab' % (mysql_kolab_password)
- )
-
- conf.command_set(
- 'kolab_smtp_access_policy',
- 'cache_uri',
- 'mysql://kolab:%s@localhost/kolab' % (mysql_kolab_password)
- )
-
+ conf.command_set('kolab_wap', 'sql_uri', 'mysql://kolab:%s@localhost/kolab' % (mysql_kolab_password))
+ conf.command_set('kolab_smtp_access_policy', 'cache_uri', 'mysql://kolab:%s@localhost/kolab' % (mysql_kolab_password))
 else:
 log.warning(_("Could not find the MySQL Kolab schema file"))
+

pykolab-0.8.23.tar.gz/pykolab/setup/setup_php.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_php.py Changed

@@ -17,7 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
 from augeas import Augeas
 import os
 import shutil
@@ -36,72 +35,55 @@
 log = pykolab.getLogger('pykolab.setup')
 conf = pykolab.getConf()
 
-
 def __init__():
 components.register('php', execute, description=description())
 
-
 def cli_options():
 php_group = conf.add_cli_parser_option_group(_("PHP Options"))
 
 php_group.add_option(
- "--timezone",
- dest="timezone",
- action="store",
- default=None,
- help=_("Specify the timezone for PHP.")
- )
+ "--timezone",
+ dest = "timezone",
+ action = "store",
+ default = None,
+ help = _("Specify the timezone for PHP.")
+ )
 
 php_group.add_option(
- "--with-php-ini",
- dest="php_ini_path",
- action="store",
- default=None,
- help=_("Specify the path to the php.ini file used with the webserver.")
- )
-
+ "--with-php-ini",
+ dest = "php_ini_path",
+ action = "store",
+ default = None,
+ help = _("Specify the path to the php.ini file used with the webserver.")
+ )
 
 def description():
 return _("Setup PHP.")
 
-
 def execute(*args, **kw):
- if conf.timezone is None:
- print(utils.multiline_message(
- _("""
- Please supply the timezone PHP should be using.
- You have to use a Continent or Country / City locality name
- like 'Europe/Berlin', but not just 'CEST'.
- """)
- ), file=sys.stderr)
+ if conf.timezone == None:
+ print >> sys.stderr, utils.multiline_message(
+ _("""
+ Please supply the timezone PHP should be using.
+ You have to use a Continent or Country / City locality name
+ like 'Europe/Berlin', but not just 'CEST'.
+ """)
+ )
 
 conf.timezone = utils.ask_question(
- _("Timezone ID"),
- default="UTC"
- )
-
- if conf.php_ini_path is not None:
- if not os.path.isfile(conf.php_ini_path):
- log.error(
- _("Cannot configure PHP through %r (No such file or directory)") % (
- conf.php_ini_path
- )
+ _("Timezone ID"),
+ default="UTC"
 )
 
+ if not conf.php_ini_path == None:
+ if not os.path.isfile(conf.php_ini_path):
+ log.error(_("Cannot configure PHP through %r (No such file or directory)") % (conf.php_ini_path))
 return
-
 php_ini = conf.php_ini_path
 
 else:
 # Search and destroy
 php_ini = "/etc/php.ini"
-
- if not os.path.isfile(php_ini):
- php_ini = "/etc/php/7.2/apache2/php.ini"
-
- if not os.path.isfile(php_ini):
- php_ini = "/etc/php/7.0/apache2/php.ini"
-
 if not os.path.isfile(php_ini):
 php_ini = "/etc/php5/apache2/php.ini"
 
@@ -109,31 +91,20 @@
 log.error(_("Could not find PHP configuration file php.ini"))
 return
 
- try:
- myaugeas = Augeas()
-
- setting_base = '/files%s/' % (php_ini)
-
- setting = os.path.join(setting_base, 'Date', 'date.timezone')
- current_value = myaugeas.get(setting)
-
- if current_value is None:
- insert_paths = myaugeas.match('/files%s/Date/*' % (php_ini))
- insert_path = insert_paths(len(insert_paths) - 1)
- myaugeas.insert(insert_path, 'date.timezone', False)
-
- log.debug(_("Setting key %r to %r") % ('Date/date.timezone', conf.timezone), level=8)
- myaugeas.set(setting, conf.timezone)
-
- myaugeas.save()
- except IndexError:
- subprocess.Popen(
- 
- 'sed',
- '-i',
- '-r',
- '-e',
- r's|^(;*)date\.timezone.*$|date.timezone = %s|g' % (conf.timezone),
- php_ini
- 
- )
+ myaugeas = Augeas()
+
+ setting_base = '/files%s/' % (php_ini)
+
+ setting = os.path.join(setting_base, 'Date', 'date.timezone')
+ current_value = myaugeas.get(setting)
+
+ if current_value == None:
+ insert_paths = myaugeas.match('/files%s/Date/*' % (php_ini))
+ insert_path = insert_paths(len(insert_paths)-1)
+ myaugeas.insert(insert_path, 'date.timezone', False)
+
+ log.debug(_("Setting key %r to %r") % ('Date/date.timezone', conf.timezone), level=8)
+ myaugeas.set(setting, conf.timezone)
+
+ myaugeas.save()
+

pykolab-0.8.23.tar.gz/pykolab/setup/setup_roundcube.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_roundcube.py Changed

@@ -17,9 +17,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
-import codecs
+from Cheetah.Template import Template
 import grp
 import hashlib
 import os
@@ -29,8 +27,6 @@
 import sys
 import time
 
-from Cheetah.Template import Template
-
 import components
 
 import pykolab
@@ -39,70 +35,66 @@
 from pykolab.constants import *
 from pykolab.translate import _
 
-# pylint: disable=invalid-name
 log = pykolab.getLogger('pykolab.setup')
 conf = pykolab.getConf()
 
-
 def __init__():
- components.register('roundcube', execute, description=description(), after='mysql', 'ldap')
-
+ components.register('roundcube', execute, description=description(), after='mysql','ldap')
 
 def description():
 return _("Setup Roundcube.")
 
-
 def execute(*args, **kw):
- print(utils.multiline_message(
- """
- Please supply a password for the MySQL user 'roundcube'.
- This password will be used by the Roundcube webmail
- interface.
- """
- ), file=sys.stderr)
+ print >> sys.stderr, utils.multiline_message(
+ _("""
+ Please supply a password for the MySQL user 'roundcube'.
+ This password will be used by the Roundcube webmail
+ interface.
+ """)
+ )
 
 mysql_roundcube_password = utils.ask_question(
- "MySQL roundcube password",
- default=utils.generate_password(),
- password=True,
- confirm=True
- )
+ _("MySQL roundcube password"),
+ default=utils.generate_password(),
+ password=True,
+ confirm=True
+ )
 
 conf.mysql_roundcube_password = mysql_roundcube_password
 
 rc_settings = {
- 'des_key': re.sub(
- r'^a-zA-Z0-9',
- "",
- "%s%s" % (
- hashlib.md5("%s" % random.random()).digest().encode("base64"),
- hashlib.md5("%s" % random.random()).digest().encode("base64")
- )
- ):24,
-
- 'imap_admin_login': conf.get('cyrus-imap', 'admin_login'),
- 'imap_admin_password': conf.get('cyrus-imap', 'admin_password'),
- 'ldap_base_dn': conf.get('ldap', 'base_dn'),
- 'ldap_group_base_dn': conf.get('ldap', 'group_base_dn'),
- 'ldap_group_filter': conf.get('ldap', 'group_filter'),
- 'ldap_ldap_uri': conf.get('ldap', 'ldap_uri'),
- 'ldap_resource_base_dn': conf.get('ldap', 'resource_base_dn'),
- 'ldap_resource_filter': conf.get('ldap', 'resource_filter'),
- 'ldap_service_bind_dn': conf.get('ldap', 'service_bind_dn'),
- 'ldap_service_bind_pw': conf.get('ldap', 'service_bind_pw'),
- 'ldap_user_base_dn': conf.get('ldap', 'user_base_dn'),
- 'ldap_user_filter': conf.get('ldap', 'user_filter'),
- 'primary_domain': conf.get('kolab', 'primary_domain'),
- 'mysql_uri': 'mysqli://roundcube:%s@localhost/roundcube' % (mysql_roundcube_password),
- 'conf': conf
- }
+ 'des_key': re.sub(
+ r'^a-zA-Z0-9',
+ "",
+ "%s%s" % (
+ hashlib.md5("%s" % random.random()).digest().encode("base64"),
+ hashlib.md5("%s" % random.random()).digest().encode("base64")
+ )
+ ):24,
+
+ 'imap_admin_login': conf.get('cyrus-imap', 'admin_login'),
+ 'imap_admin_password': conf.get('cyrus-imap', 'admin_password'),
+ 'ldap_base_dn': conf.get('ldap', 'base_dn'),
+ 'ldap_group_base_dn': conf.get('ldap', 'group_base_dn'),
+ 'ldap_group_filter': conf.get('ldap', 'group_filter'),
+ 'ldap_ldap_uri': conf.get('ldap', 'ldap_uri'),
+ 'ldap_resource_base_dn': conf.get('ldap', 'resource_base_dn'),
+ 'ldap_resource_filter': conf.get('ldap', 'resource_filter'),
+ 'ldap_service_bind_dn': conf.get('ldap', 'service_bind_dn'),
+ 'ldap_service_bind_pw': conf.get('ldap', 'service_bind_pw'),
+ 'ldap_user_base_dn': conf.get('ldap', 'user_base_dn'),
+ 'ldap_user_filter': conf.get('ldap', 'user_filter'),
+ 'primary_domain': conf.get('kolab','primary_domain'),
+ 'mysql_uri': 'mysqli://roundcube:%s@localhost/roundcube' % (mysql_roundcube_password),
+ 'conf': conf
+ }
 
 rc_paths = 
- "/usr/share/roundcubemail/",
- "/usr/share/roundcube/",
- "/srv/www/roundcubemail/",
- "/var/www/roundcubemail/"
- 
+ "/usr/share/roundcubemail/",
+ "/usr/share/roundcube/",
+ "/srv/www/roundcubemail/",
+ "/var/www/roundcubemail/"
+ 
 
 rcpath = ''
 for rc_path in rc_paths:
@@ -111,12 +103,10 @@
 break
 
 if not os.path.isdir(rcpath):
- log.error("Roundcube installation path not found.")
+ log.error(_("Roundcube installation path not found."))
 return
 
- if os.access(rcpath + 'skins/kolab/', os.R_OK):
- rc_settings'skin' = 'kolab'
- elif os.access(rcpath + 'skins/enterprise/', os.R_OK):
+ if os.access(rcpath + 'skins/enterprise/', os.R_OK):
 rc_settings'skin' = 'enterprise'
 elif os.access(rcpath + 'skins/chameleon/', os.R_OK):
 rc_settings'skin' = 'chameleon'
@@ -124,21 +114,22 @@
 rc_settings'skin' = 'larry'
 
 want_files = 
- 'acl.inc.php',
- 'calendar.inc.php',
- 'config.inc.php',
- 'kolab_addressbook.inc.php',
- 'kolab_auth.inc.php',
- 'kolab_delegation.inc.php',
- 'kolab_files.inc.php',
- 'kolab_folders.inc.php',
- 'libkolab.inc.php',
- 'managesieve.inc.php',
- 'password.inc.php',
- 'recipient_to_contact.inc.php',
- 'terms.html',
- 'terms.inc.php'
- 
+ 'acl.inc.php',
+ 'calendar.inc.php',
+ 'config.inc.php',
+ 'kolab_addressbook.inc.php',
+ 'kolab_auth.inc.php',
+ 'kolab_delegation.inc.php',
+ 'kolab_files.inc.php',
+ 'kolab_folders.inc.php',
+ 'libkolab.inc.php',
+ 'managesieve.inc.php',
+ 'owncloud.inc.php',
+ 'password.inc.php',
+ 'recipient_to_contact.inc.php',
+ 'terms.html',
+ 'terms.inc.php'
+ 
 
 for want_file in want_files:
 template_file = None
@@ -146,77 +137,71 @@
 template_file = '/etc/kolab/templates/roundcubemail/%s.tpl' % (want_file)
 elif os.path.isfile('/usr/share/kolab/templates/roundcubemail/%s.tpl' % (want_file)):
 template_file = '/usr/share/kolab/templates/roundcubemail/%s.tpl' % (want_file)
+ elif os.path.isfile(os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'roundcubemail', '%s.tpl' % (want_file)))):
+ template_file = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'roundcubemail', '%s.tpl' % (want_file)))
 
- if template_file is not None:
- # pylint: disable=logging-not-lazy
- log.debug("Using template file %r" % (template_file), level=8)
- filep = codecs.open(template_file, 'r', encoding='utf-8')
- template_definition = filep.read()
- filep.close()
+ if not template_file == None:
+ log.debug(_("Using template file %r") % (template_file), level=8)
+ fp = open(template_file, 'r')
+ template_definition = fp.read()
+ fp.close()
 
 t = Template(template_definition, searchList=rc_settings)
- # pylint: disable=logging-not-lazy
 log.debug(
- "Successfully compiled template %r, writing out to %r" % (
- template_file,
- want_file
- ),
- level=8
- )
+ _("Successfully compiled template %r, writing out to %r") % (template_file, want_file),
+ level=8
+ )
 
- filep = None
+ fp = None
 if os.path.isdir('/etc/roundcubemail'):
- filep = codecs.open('/etc/roundcubemail/%s' % (want_file), 'w', encoding='utf-8')
+ fp = open('/etc/roundcubemail/%s' % (want_file), 'w')
 elif os.path.isdir('/etc/roundcube'):
- filep = codecs.open('/etc/roundcube/%s' % (want_file), 'w', encoding='utf-8')
+ fp = open('/etc/roundcube/%s' % (want_file), 'w')
 
- if filep is not None:
- filep.write(t.respond())
- filep.close()
+ if not fp == None:
+ fp.write(t.__str__())
+ fp.close()
 
 schema_files = 
-
- # pylint: disable=too-many-nested-blocks
 for root, directories, filenames in os.walk('/usr/share/doc/'):
 directories.sort()
 for directory in directories:
 if directory.startswith("roundcubemail"):
- for _root, _directories, _filenames in os.walk(os.path.join(root, directory)):
- for filename in _filenames:
+ for nested_root, nested_directories, nested_filenames in os.walk(os.path.join(root, directory)):
+ for filename in nested_filenames:
 if filename.startswith('mysql.initial') and filename.endswith('.sql'):
- schema_filepath = os.path.join(_root, filename)
- if schema_filepath not in schema_files:
+ schema_filepath = os.path.join(nested_root,filename)
+ if not schema_filepath in schema_files:
 schema_files.append(schema_filepath)
 
- if schema_files:
+ if len(schema_files) > 0:
 break
-
- if schema_files:
+ if len(schema_files) > 0:
 break
 
 for root, directories, filenames in os.walk(rcpath + 'plugins/calendar/drivers/kolab/'):
 for filename in filenames:
 if filename.startswith('mysql') and filename.endswith('.sql'):
- schema_filepath = os.path.join(root, filename)
- if schema_filepath not in schema_files:
+ schema_filepath = os.path.join(root,filename)
+ if not schema_filepath in schema_files:
 schema_files.append(schema_filepath)
 
 for root, directories, filenames in os.walk(rcpath + 'plugins/libkolab/'):
 for filename in filenames:
 if filename.startswith('mysql') and filename.endswith('.sql'):
- schema_filepath = os.path.join(root, filename)
- if schema_filepath not in schema_files:
+ schema_filepath = os.path.join(root,filename)
+ if not schema_filepath in schema_files:
 schema_files.append(schema_filepath)
 
 for root, directories, filenames in os.walk('/usr/share/doc/'):
 directories.sort()
 for directory in directories:
 if directory.startswith("chwala"):
- for _root, _directories, _filenames in os.walk(os.path.join(root, directory)):
- for filename in _filenames:
+ for nested_root, nested_directories, nested_filenames in os.walk(os.path.join(root, directory)):
+ for filename in nested_filenames:
 if filename.startswith('mysql.initial') and filename.endswith('.sql'):
- schema_filepath = os.path.join(_root, filename)
- if schema_filepath not in schema_files:
+ schema_filepath = os.path.join(nested_root,filename)
+ if not schema_filepath in schema_files:
 schema_files.append(schema_filepath)
 
 if len(schema_files) > 0:
@@ -225,43 +210,23 @@
 break
 
 if not os.path.isfile('/tmp/kolab-setup-my.cnf'):
- print(utils.multiline_message(
- """Please supply the MySQL root password (use 'unix_socket' for socket based authentication)"""
- ), file=sys.stderr)
+ utils.multiline_message(
+ """Please supply the MySQL root password"""
+ )
 
 mysql_root_password = utils.ask_question(
 _("MySQL root password"),
 password=True
 )
 
- socket_path = None
- socket_paths = 
- "/var/lib/mysql/mysql.sock",
- "/var/run/mysqld/mysqld.sock",
- "/var/run/mysql/mysql.sock"
- 
- for sp in socket_paths:
- if os.path.exists(sp):
- socket_path = sp
-
- if mysql_root_password == "unix_socket" and socket_path is not None:
- data = """
-mysql
-user=root
-password=
-host=localhost
-socket=%s
-""" % (socket_path)
- else:
- data = """
+ data = """
 mysql
 user=root
 password='%s'
-host=%s
-""" % (mysql_root_password, conf.mysqlhost)
+""" % (mysql_root_password)
 
 fp = open('/tmp/kolab-setup-my.cnf', 'w')
- os.chmod('/tmp/kolab-setup-my.cnf', 0o600)
+ os.chmod('/tmp/kolab-setup-my.cnf', 0600)
 fp.write(data)
 fp.close()
 
@@ -270,30 +235,14 @@
 p1.stdout.close()
 p2.communicate()
 
- p1 = subprocess.Popen(
- 
- 'echo',
- 'GRANT ALL PRIVILEGES ON roundcube.* TO \'roundcube\'@\'localhost\' IDENTIFIED BY \'%s\';' % (
- mysql_roundcube_password
- )
- ,
- stdout=subprocess.PIPE
- )
+ p1 = subprocess.Popen('echo', 'GRANT ALL PRIVILEGES ON roundcube.* TO \'roundcube\'@\'localhost\' IDENTIFIED BY \'%s\';' % (mysql_roundcube_password), stdout=subprocess.PIPE)
 p2 = subprocess.Popen('mysql', '--defaults-file=/tmp/kolab-setup-my.cnf', stdin=p1.stdout)
 p1.stdout.close()
 p2.communicate()
 
 for schema_file in schema_files:
 p1 = subprocess.Popen('cat', schema_file, stdout=subprocess.PIPE)
- p2 = subprocess.Popen(
- 
- 'mysql',
- '--defaults-file=/tmp/kolab-setup-my.cnf',
- 'roundcube'
- ,
- stdin=p1.stdout
- )
-
+ p2 = subprocess.Popen('mysql', '--defaults-file=/tmp/kolab-setup-my.cnf', 'roundcube', stdin=p1.stdout)
 p1.stdout.close()
 p2.communicate()
 
@@ -311,21 +260,18 @@
 elif os.path.isdir('/etc/roundcube/'):
 rccpath = "/etc/roundcube"
 else:
- log.warning("Cannot find the configuration directory for roundcube.")
+ log.warning(_("Cannot find the configuration directory for roundcube."))
 rccpath = None
 
 root_uid = 0
 
 webserver_gid = None
 
- for webserver_group in 'apache', 'www-data', 'www':
+ for webserver_group in 'apache', 'www-data', 'www' :
 try:
- # pylint: disable=unused-variable
- (a, b, webserver_gid, d) = grp.getgrnam(webserver_group)
+ (a,b,webserver_gid,c) = grp.getgrnam(webserver_group)
 break
-
- # pylint: disable=broad-except
- except Exception:
+ except Exception, errmsg:
 pass
 
 if webserver_gid is not None:
@@ -334,34 +280,25 @@
 for filename in filenames:
 try:
 os.chown(
- os.path.join(root, filename),
- root_uid,
- webserver_gid
- )
-
- # pylint: disable=broad-except
- except Exception:
+ os.path.join(root, filename),
+ root_uid,
+ webserver_gid
+ )
+ except Exception, errmsg:
 pass
 
 httpservice = 'httpd.service'
-
 if os.path.isfile('/usr/lib/systemd/system/apache2.service'):
 httpservice = 'apache2.service'
 
- if os.path.isfile('/lib/systemd/system/apache2.service'): # Debian 9
- httpservice = 'apache2.service'
-
- if os.path.isdir('/lib/systemd/system/apache2.service.d'):
- httpservice = 'apache2.service'
-
 if os.path.isfile('/bin/systemctl'):
 subprocess.call('/bin/systemctl', 'restart', httpservice)
 elif os.path.isfile('/sbin/service'):
 subprocess.call('/sbin/service', 'httpd', 'restart')
 elif os.path.isfile('/usr/sbin/service'):
- subprocess.call('/usr/sbin/service', 'apache2', 'restart')
+ subprocess.call('/usr/sbin/service','apache2','restart')
 else:
- log.error("Could not start the webserver server service.")
+ log.error(_("Could not start the webserver server service."))
 
 if os.path.isfile('/bin/systemctl'):
 subprocess.call('/bin/systemctl', 'enable', httpservice)
@@ -370,6 +307,6 @@
 elif os.path.isfile('/usr/sbin/update-rc.d'):
 subprocess.call('/usr/sbin/update-rc.d', 'apache2', 'defaults')
 else:
- log.error(
- "Could not configure to start on boot, the webserver server service."
- )
+ log.error(_("Could not configure to start on boot, the " + \
+ "webserver server service."))
+

pykolab-0.8.23.tar.gz/pykolab/setup/setup_syncroton.py -> pykolab-0.8.4.tar.gz/pykolab/setup/setup_syncroton.py Changed

@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import os
 import subprocess
 import sys
@@ -35,20 +33,12 @@
 log = pykolab.getLogger('pykolab.setup')
 conf = pykolab.getConf()
 
-
 def __init__():
- components.register(
- 'syncroton',
- execute,
- description=description(),
- after='mysql','ldap','roundcube'
- )
-
+ components.register('syncroton', execute, description=description(), after='mysql','ldap','roundcube')
 
 def description():
 return _("Setup Syncroton.")
 
-
 def execute(*args, **kw):
 schema_files = 
 for root, directories, filenames in os.walk('/usr/share/doc/'):
@@ -68,50 +58,23 @@
 break
 
 if not os.path.isfile('/tmp/kolab-setup-my.cnf'):
- print(utils.multiline_message(
- """Please supply the MySQL root password (use 'unix_socket' for socket based authentication)"""
- ), file=sys.stderr)
+ utils.multiline_message(
+ """Please supply the MySQL root password"""
+ )
 
 mysql_root_password = utils.ask_question(
 _("MySQL root password"),
 password=True
 )
 
- socket_path = None
- socket_paths = 
- "/var/lib/mysql/mysql.sock",
- "/var/run/mysqld/mysqld.sock",
- "/var/run/mysql/mysql.sock"
- 
- for sp in socket_paths:
- if os.path.exists(sp):
- socket_path = sp
-
- if mysql_root_password == "unix_socket" and socket_path is not None:
- data = """
-mysql
-user=root
-password=
-host=localhost
-socket=%s
-""" % (socket_path)
- else:
- data = """
-mysql
-user=root
-password='%s'
-host=%s
-""" % (mysql_root_password, conf.mysqlhost)
-
 data = """
 mysql
 user=root
 password='%s'
-host=%s
-""" % (mysql_root_password, conf.mysqlhost)
+""" % (mysql_root_password)
 
 fp = open('/tmp/kolab-setup-my.cnf', 'w')
- os.chmod('/tmp/kolab-setup-my.cnf', 0o600)
+ os.chmod('/tmp/kolab-setup-my.cnf', 0600)
 fp.write(data)
 fp.close()
 
@@ -124,16 +87,9 @@
 time.sleep(2)
 
 httpservice = 'httpd.service'
-
 if os.path.isfile('/usr/lib/systemd/system/apache2.service'):
 httpservice = 'apache2.service'
 
- if os.path.isfile('/lib/systemd/system/apache2.service'): # Debian 9
- httpservice = 'apache2.service'
-
- if os.path.isdir('/lib/systemd/system/apache2.service.d'):
- httpservice = 'apache2.service'
-
 if os.path.isfile('/bin/systemctl'):
 subprocess.call('/bin/systemctl', 'restart', httpservice)
 elif os.path.isfile('/sbin/service'):

pykolab-0.8.23.tar.gz/pykolab/telemetry.py -> pykolab-0.8.4.tar.gz/pykolab/telemetry.py Changed

pykolab-0.8.23.tar.gz/pykolab/translate.py -> pykolab-0.8.4.tar.gz/pykolab/translate.py Changed

@@ -25,24 +25,19 @@
 import gettext
 import os
 
-N_ = lambda x: x  # noqa: E731
+N_ = lambda x: x
 
 # This function as such may, at times, cause tracebacks.
-# _ = lambda x: current.lgettext(x)
+#_ = lambda x: current.lgettext(x)
 
-# pylint: disable=invalid-name
 current = gettext.translation(domain, fallback=True)
 
-
 def _(x):
     try:
         return current.lgettext(x)
-
-    # pylint: disable=broad-except
-    except Exception:
+    except Exception, errmsg:
         return x
 
-
 def getDefaultLangs():
     languages = 
     for envar in ('LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG'):
@@ -56,32 +51,24 @@
     # now normalize and expand the languages
     nelangs = 
     for lang in languages:
-
-        # pylint: disable=protected-access
         for nelang in gettext._expand_lang(lang):
             if nelang not in nelangs:
                 nelangs.append(nelang)
 
     return nelangs
 
-
 def setUserLanguage(lang):
-    # pylint: disable=global-statement
     global current
 
     if not len(lang.split('.')) > 1 and not lang.endswith('.UTF-8'):
         lang = "%s.UTF-8" % (lang)
 
     langs = 
-
-    # pylint: disable=protected-access
     for l in gettext._expand_lang(lang):
         if l not in langs:
             langs.append(l)
 
     try:
         current = gettext.translation(domain, languages=langs, fallback=True)
-
-    # pylint: disable=broad-except
-    except Exception:
+    except:
         pass

pykolab-0.8.23.tar.gz/pykolab/translit.py -> pykolab-0.8.4.tar.gz/pykolab/translit.py Changed

@@ -98,7 +98,7 @@
     }
 
 def transliterate(_input, lang, _output_expected=None):
-    if lang in locale_translit_map:
+    if locale_translit_map.has_key(lang):
         _translit_name = locale_translit_maplang
     else:
         _translit_name = lang
@@ -107,22 +107,22 @@
 
     if not isinstance(_input, unicode):
         for char in _input.decode('utf-8'):
-            if _translit_name in translit_map:
-                if char in translit_map_translit_name:
+            if translit_map.has_key(_translit_name):
+                if translit_map_translit_name.has_key(char):
                     _output += translit_map_translit_namechar
-                elif char in repr(x) for x in translit_map_translit_name:
-                    _output += translit_map_translit_namechar in raw(x) for x in translit_map_translit_name0
+                elif char in repr(x) for x in translit_map_translit_name.keys():
+                    _output += translit_map_translit_namechar in raw(x) for x in translit_map_translit_name.keys()0
                 else:
                     _output += char
             else:
                 _output += char
     else:
         for char in _input:
-            if _translit_name in translit_map:
-                if char in translit_map_translit_name:
+            if translit_map.has_key(_translit_name):
+                if translit_map_translit_name.has_key(char):
                     _output += translit_map_translit_namechar
-                elif char in repr(x) for x in translit_map_translit_name:
-                    _output += translit_map_translit_namechar in raw(x) for x in translit_map_translit_name0
+                elif char in repr(x) for x in translit_map_translit_name.keys():
+                    _output += translit_map_translit_namechar in raw(x) for x in translit_map_translit_name.keys()0
                 else:
                     _output += char
             else:

pykolab-0.8.23.tar.gz/pykolab/utils.py -> pykolab-0.8.4.tar.gz/pykolab/utils.py Changed

@@ -17,38 +17,21 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import base64
 import getpass
 import grp
 import os
 import pwd
-from six import string_types
 import struct
 import sys
 
 import pykolab
 from pykolab import constants
-from pykolab.translate import _ as _l
+from pykolab.translate import _
 
-# pylint: disable=invalid-name
 log = pykolab.getLogger('pykolab.utils')
 conf = pykolab.getConf()
 
-try:
- # pylint: disable=redefined-builtin
- input = raw_input
-except NameError:
- pass
-
-try:
- unicode('')
-except NameError:
- unicode = str
-
-
-# pylint: disable=too-many-branches
 def ask_question(question, default="", password=False, confirm=False):
 """
 Ask a question on stderr.
@@ -60,57 +43,56 @@
 
 Usage: pykolab.utils.ask_question("What is the server?", default="localhost")
 """
- if default != "" and default is not None and conf.cli_keywords.answer_default:
+ 
+ if not default == "" and not default == None and conf.cli_keywords.answer_default:
 if not conf.cli_keywords.quiet:
- print("%s %s: " % (question, default))
+ print ("%s %s: " % (question, default))
 return default
 
 if password:
- if default == "" or default is None:
+ if default == "" or default == None:
 answer = getpass.getpass("%s: " % (question))
 else:
 answer = getpass.getpass("%s %s: " % (question, default))
 else:
- if default == "" or default is None:
- answer = input("%s: " % (question))
+ if default == "" or default == None:
+ answer = raw_input("%s: " % (question))
 else:
- answer = input("%s %s: " % (question, default))
+ answer = raw_input("%s %s: " % (question, default))
 
- # pylint: disable=too-many-nested-blocks
 if not answer == "":
 if confirm:
 answer_confirm = None
 answer_confirmed = False
 while not answer_confirmed:
 if password:
- answer_confirm = getpass.getpass(_l("Confirm %s: ") % (question))
+ answer_confirm = getpass.getpass(_("Confirm %s: ") % (question))
 else:
- answer_confirm = input(_l("Confirm %s: ") % (question))
+ answer_confirm = raw_input(_("Confirm %s: ") % (question))
 
 if not answer_confirm == answer:
- print(_l("Incorrect confirmation. Please try again."), file=sys.stderr)
+ print >> sys.stderr, _("Incorrect confirmation. " + \
+ "Please try again.")
 
 if password:
- if default == "" or default is None:
- answer = getpass.getpass(_l("%s: ") % (question))
+ if default == "" or default == None:
+ answer = getpass.getpass(_("%s: ") % (question))
 else:
- answer = getpass.getpass(_l("%s %s: ") % (question, default))
+ answer = getpass.getpass(_("%s %s: ") % (question, default))
 else:
- if default == "" or default is None:
- answer = input(_l("%s: ") % (question))
+ if default == "" or default == None:
+ answer = raw_input(_("%s: ") % (question))
 else:
- answer = input(_l("%s %s: ") % (question, default))
+ answer = raw_input(_("%s %s: ") % (question, default))
 
 else:
 answer_confirmed = True
 
 if answer == "":
 return default
+ else:
+ return answer
 
- return answer
-
-
-# pylint: disable=too-many-return-statements
 def ask_confirmation(question, default="y", all_inclusive_no=True):
 """
 Create a confirmation dialog, including a default option (capitalized),
@@ -119,11 +101,11 @@
 """
 default_answer = None
 
- if default in "y", "Y":
+ if default in "y", "Y" :
 default_answer = True
 default_no = "n"
 default_yes = "Y"
- elif default in "n", "N":
+ elif default in "n", "N" :
 default_answer = False
 default_no = "N"
 default_yes = "y"
@@ -133,50 +115,44 @@
 default_no = "'no'"
 default_yes = "Please type 'yes'"
 
- if conf.cli_keywords.answer_yes \
- or (conf.cli_keywords.answer_default and default_answer is not None):
-
+ if conf.cli_keywords.answer_yes or (conf.cli_keywords.answer_default and default_answer is not None):
 if not conf.cli_keywords.quiet:
- print("%s %s/%s: " % (question, default_yes, default_no))
+ print ("%s %s/%s: " % (question,default_yes,default_no))
 if conf.cli_keywords.answer_yes:
 return True
 if conf.cli_keywords.answer_default:
 return default_answer
 
 answer = False
- while not answer:
- answer = input("%s %s/%s: " % (question, default_yes, default_no))
+ while answer == False:
+ answer = raw_input("%s %s/%s: " % (question,default_yes,default_no))
 # Parse answer and set back to False if not appropriate
 if all_inclusive_no:
- if answer == "" and default_answer is not None:
+ if answer == "" and not default_answer == None:
 return default_answer
-
- if answer in "y", "Y", "yes":
+ elif answer in "y", "Y", "yes" :
 return True
-
- if answer in "n", "N", "no":
+ elif answer in "n", "N", "no" :
 return False
+ else:
+ answer = False
+ print >> sys.stderr, _("Please answer 'yes' or 'no'.")
+ else:
+ if not answer in "y", "Y", "yes" :
+ return False
+ else:
+ return True
 
- answer = False
- print(_l("Please answer 'yes' or 'no'."), file=sys.stderr)
-
- if answer not in "y", "Y", "yes":
- return False
-
- return True
-
-
-# pylint: disable=dangerous-default-value
 def ask_menu(question, options={}, default=''):
- if default != '' and conf.cli_keywords.answer_default:
+ if not default == '' and conf.cli_keywords.answer_default:
 if not conf.cli_keywords.quiet:
- print(question + " " + default + ":")
+ print question + " " + default + ":"
 return default
 
- if default != '':
- print(question + " " + default + ":")
+ if not default == '':
+ print question + " " + default + ":"
 else:
- print(question)
+ print question
 
 answer_correct = False
 max_key_length = 0
@@ -186,7 +162,7 @@
 options = {}
 for key in _options:
 optionskey = key
-
+ 
 keys = options.keys()
 keys.sort()
 
@@ -198,38 +174,37 @@
 
 str_format = "%%%ds" % max_key_length
 
- if default == '' or default not in options:
+ if default == '' or not default in options.keys():
 for key in keys:
 if optionskey == key:
- print(" - " + key)
+ print " - " + key
 else:
- print(" - " + str_format % key + ": " + optionskey)
+ print " - " + eval("str_format % key") + ": " + optionskey
 
- answer = input(_l("Choice") + ": ")
+ answer = raw_input(_("Choice") + ": ")
 
 else:
- answer = input(_l("Choice (type '?' for options)") + ": ")
+ answer = raw_input(_("Choice (type '?' for options)") + ": ")
 
 if answer == '?':
 for key in keys:
 if optionskey == key:
- print(" - " + key)
+ print " - " + key
 else:
- print(" - " + str_format % key + ": " + optionskey)
+ print " - " + eval("str_format % key") + ": " + optionskey
 
 continue
 
- if answer == '' and default in options:
+ if answer == '' and default in options.keys():
 answer = default
 
- if answer in str(x) for x in options:
+ if answer in str(x) for x in options.keys():
 answer_correct = True
 
 return answer
 
-
 def decode(key, enc):
- if key is None:
+ if key == None:
 return enc
 
 dec = 
@@ -240,9 +215,8 @@
 dec.append(dec_c)
 return "".join(dec)
 
-
 def encode(key, clear):
- if key is None:
+ if key == None:
 return clear
 
 enc = 
@@ -252,16 +226,15 @@
 enc.append(enc_c)
 return base64.urlsafe_b64encode("".join(enc))
 
-
 def ensure_directory(_dir, _user='root', _group='root'):
 if not os.path.isdir(_dir):
 os.makedirs(_dir)
 
 try:
 try:
- (ruid, _, _) = os.getresuid()
- (rgid, _, _) = os.getresgid()
- except AttributeError:
+ (ruid, euid, suid) = os.getresuid()
+ (rgid, egid, sgid) = os.getresgid()
+ except AttributeError, errmsg:
 ruid = os.getuid()
 rgid = os.getgid()
 
@@ -270,10 +243,18 @@
 if rgid == 0:
 # Get group entry details
 try:
- (_, _, group_gid, _) = grp.getgrnam(_group)
+ (
+ group_name,
+ group_password,
+ group_gid,
+ group_members
+ ) = grp.getgrnam(_group)
 
 except KeyError:
- print(_l("Group %s does not exist") % (_group), file=sys.stderr)
+ print >> sys.stderr, _("Group %s does not exist") % (
+ _group
+ )
+
 sys.exit(1)
 
 # Set real and effective group if not the same as current.
@@ -283,20 +264,28 @@
 if ruid == 0:
 # Means we haven't switched yet.
 try:
- (_, _, user_uid, _, _, _, _) = pwd.getpwnam(_user)
+ (
+ user_name,
+ user_password,
+ user_uid,
+ user_gid,
+ user_gecos,
+ user_homedir,
+ user_shell
+ ) = pwd.getpwnam(_user)
 
 except KeyError:
- print(_l("User %s does not exist") % (_user), file=sys.stderr)
+ print >> sys.stderr, _("User %s does not exist") % (_user)
 
 sys.exit(1)
 
+
 # Set real and effective user if not the same as current.
 if not user_uid == ruid:
 os.chown(_dir, user_uid, -1)
 
- except Exception:
- print(_l("Could not change the permissions on %s") % (_dir), file=sys.stderr)
-
+ except:
+ print >> sys.stderr, _("Could not change the permissions on %s") % (_dir)
 
 def generate_password():
 import subprocess
@@ -310,7 +299,6 @@
 
 return output
 
-
 def multiline_message(message):
 if hasattr(conf, 'cli_keywords') and hasattr(conf.cli_keywords, 'quiet'):
 if conf.cli_keywords.quiet:
@@ -338,53 +326,45 @@
 
 return "\n%s\n" % ("\n".join(lines))
 
-
 def stripped_message(message):
 return "\n" + message.strip() + "\n"
 
-
 def str2unicode(s, encoding='utf-8'):
 if isinstance(s, unicode):
 return s
 try:
 return unicode(s, encoding)
- except Exception:
+ except:
 pass
 return s
 
-
 def normalize(_object):
- if isinstance(_object, list):
+ if type(_object) == list:
 result = 
- elif isinstance(_object, dict):
+ elif type(_object) == dict:
 result = {}
 else:
 return _object
 
- if isinstance(_object, list):
+ if type(_object) == list:
 for item in _object:
 result.append(item.lower())
 result = list(set(result))
 return result
 
- if isinstance(_object, dict):
+ elif type(_object) == dict:
 def _strip(value):
 try:
 return value.strip()
- except Exception:
+ except:
 return value
 
 for key in _object:
- if isinstance(_objectkey, list):
+ if type(_objectkey) == list:
 if _objectkey is None:
 continue
 
- # Dont run strip anything from attributes which
- # hold byte strings
- if key.lower() in constants.BINARY_ATTRS:
- val = _objectkey
- else:
- val = map(_strip, _objectkey)
+ val = map(_strip, _objectkey)
 
 if len(val) == 1:
 resultkey.lower() = ''.join(val)
@@ -397,21 +377,21 @@
 
 resultkey.lower() = _strip(_objectkey)
 
- if 'objectsid' in result and not result'objectsid'0 == "S":
+ if result.has_key('objectsid') and not result'objectsid'0 == "S":
 result'objectsid' = sid_to_string(result'objectsid')
 
- if 'sn' in result:
+ if result.has_key('sn'):
 result'surname' = result'sn'.replace(' ', '')
 
- if 'mail' in result:
+ if result.has_key('mail'):
 if isinstance(result'mail', list):
 result'mail' = result'mail'0
 
- if result'mail':
+ if len(result'mail') > 0:
 if len(result'mail'.split('@')) > 1:
 result'domain' = result'mail'.split('@')1
 
- if 'domain' not in result and 'standard_domain' in result:
+ if not result.has_key('domain') and result.has_key('standard_domain'):
 result'domain' = result'standard_domain'
 
 if 'objectclass' not in result:
@@ -427,8 +407,7 @@
 
 return result
 
-
-def parse_input(_input, splitchars=' '):
+def parse_input(_input, splitchars= ' ' ):
 """
 Split the input string using the split characters defined
 in splitchars, and remove the empty list items, then unique the
@@ -454,7 +433,6 @@
 
 return _output_list
 
-
 def parse_ldap_uri(uri):
 """
 Parse an LDAP URI and return it's components.
@@ -479,7 +457,7 @@
 _server = _ldap_uri.split('//')1.split('/')0
 _base_dn = _ldap_uri.split('//')1.split('/')1
 
- except Exception:
+ except:
 _server = uri.split('//')1.split('/')0
 _attr = None
 _scope = None
@@ -500,7 +478,7 @@
 if _attr == '':
 _attrs = 
 else:
- _attrs = _attr
+ _attrs = _attr 
 
 if _scope == '':
 _scope = 'sub'
@@ -508,12 +486,11 @@
 if _filter == '':
 _filter = "(objectclass=*)"
 
- return (_protocol, _server, _port, _base_dn, _attrs, _scope, _filter)
+ return (_protocol, _server, _port, _base_dn, _attr, _scope, _filter)
 
- except Exception:
+ except:
 return None
 
-
 def pop_empty_from_list(_input_list):
 _output_list = 
 
@@ -521,7 +498,6 @@
 if not item == '':
 _output_list.append(item)
 
-
 def sid_to_string(sid):
 srl = ord(sid0)
 number_sub_id = ord(sid1)
@@ -530,77 +506,70 @@
 sub_ids = 
 
 for i in range(number_sub_id):
- sub_ids.append(struct.unpack('<I', sid8 + 4 * i:12 + 4 * i)0)
+ sub_ids.append(struct.unpack('<I',sid8+4*i:12+4*i)0)
 
 result = 'S-%d-%d-%s' % (
- srl,
- iav,
- '-'.join(str(s) for s in sub_ids),
- )
+ srl,
+ iav,
+ '-'.join(str(s) for s in sub_ids),
+ )
 
 return result
 
-
 def standard_root_dn(domain):
 return 'dc=%s' % (',dc='.join(domain.split('.')))
 
-
 def translate(mystring, locale_name='en_US'):
 import locale
 import subprocess
 
- log.debug(_l("Transliterating string %r with locale %r") % (mystring, locale_name), level=8)
+ log.debug(_("Transliterating string %r with locale %r") % (mystring, locale_name), level=8)
 
 if len(locale.normalize(locale_name).split('.')) > 1:
- (locale_name, locale_charset) = locale.normalize(locale_name).split('.')
+ (locale_name,locale_charset) = locale.normalize(locale_name).split('.')
 else:
 locale_charset = 'utf-8'
 
 try:
- log.debug(_l("Attempting to set locale"), level=8)
- locale.setlocale(locale.LC_ALL, (locale_name, locale_charset))
- log.debug(_l("Success setting locale"), level=8)
- except Exception:
- log.debug(_l("Failure to set locale"), level=8)
-
- command = '/usr/bin/iconv', '-f', 'UTF-8', '-t', 'ASCII//TRANSLIT', '-s'
+ log.debug(_("Attempting to set locale"), level=8)
+ locale.setlocale(locale.LC_ALL, (locale_name,locale_charset))
+ log.debug(_("Success setting locale"), level=8)
+ except:
+ log.debug(_("Failure to set locale"), level=8)
+ pass
 
- log.debug(_l("Executing '%s | %s'") % (r"%s" % (mystring), ' '.join(command)), level=8)
+ command = '/usr/bin/iconv',
+ '-f', 'UTF-8',
+ '-t', 'ASCII//TRANSLIT',
+ '-s' 
 
- process = subprocess.Popen(
- command,
- stdout=subprocess.PIPE,
- stdin=subprocess.PIPE,
- stderr=subprocess.PIPE,
- env={'LANG': locale.normalize(locale_name)}
- )
+ log.debug(_("Executing '%s | %s'") % (r"%s" % (mystring), ' '.join(command)), level=8)
+ process = subprocess.Popen(command, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE, env={'LANG': locale.normalize(locale_name)})
 
 try:
- print(r"%s" % (mystring), file=process.stdin)
- except UnicodeEncodeError:
+ print >> process.stdin, r"%s" % mystring
+ except UnicodeEncodeError, errmsg:
 pass
 
 result = process.communicate()0.strip()
 
 if '?' in result or (result == '' and not mystring == ''):
- log.warning(_l("Could not translate %s using locale %s") % (mystring, locale_name))
+ log.warning(_("Could not translate %s using locale %s") % (mystring, locale_name))
 from pykolab import translit
 result = translit.transliterate(mystring, locale_name)
 
 return result
 
-
 def true_or_false(val):
- if val is None:
+ if val == None:
 return False
 
 if isinstance(val, bool):
 return val
 
- if isinstance(val, string_types):
+ if isinstance(val, basestring) or isinstance(val, str):
 val = val.lower()
-
- if val in "true", "yes", "y", "1":
+ if val in "true", "yes", "y", "1" :
 return True
 else:
 return False
@@ -611,7 +580,6 @@
 else:
 return False
 
-
 def is_service(services):
 """
 Checks each item in list services to see if it has a RC script in
@@ -632,4 +600,4 @@
 else:
 _other_services.append(service)
 
- return (_service, _other_services)
+ return (_service,_other_services)

pykolab-0.8.23.tar.gz/pykolab/wap_client/__init__.py -> pykolab-0.8.4.tar.gz/pykolab/wap_client/__init__.py Changed

@@ -70,7 +70,7 @@
     if not response:
         return False
 
-    if 'session_token' in response:
+    if response.has_key('session_token'):
         session_id = response'session_token'
         return True
 
@@ -188,35 +188,35 @@
 def get_group_input():
     group_types = group_types_list()
 
-    if len(group_types) > 1:
-        for key in group_types:
+    if len(group_types.keys()) > 1:
+        for key in group_types.keys():
             if not key == "status":
-                print("%s) %s" % (key,group_typeskey'name'))
+                print "%s) %s" % (key,group_typeskey'name')
 
         group_type_id = utils.ask_question("Please select the group type")
 
-    elif len(group_types) > 0:
-        print("Automatically selected the only group type available")
+    elif len(group_types.keys()) > 0:
+        print "Automatically selected the only group type available"
         group_type_id = group_types.keys()0
 
     else:
-        print("No group types available")
+        print "No group types available"
         sys.exit(1)
 
-    if group_type_id in group_types:
+    if group_types.has_key(group_type_id):
         group_type_info = group_typesgroup_type_id'attributes'
     else:
-        print("No such group type")
+        print "No such group type"
         sys.exit(1)
 
     params = {
             'group_type_id': group_type_id
         }
 
-    for attribute in group_type_info'form_fields':
+    for attribute in group_type_info'form_fields'.keys():
         paramsattribute = utils.ask_question(attribute)
 
-    for attribute in group_type_info'auto_form_fields':
+    for attribute in group_type_info'auto_form_fields'.keys():
         exec("retval = group_form_value_generate_%s(params)" % (attribute))
         paramsattribute = retvalattribute
 
@@ -226,26 +226,26 @@
     user_types = user_types_list()
 
     if user_types'count' > 1:
-        print("")
-        for key in user_types'list':
+        print ""
+        for key in user_types'list'.keys():
             if not key == "status":
-                print("%s) %s" % (key,user_types'list'key'name'))
+                print "%s) %s" % (key,user_types'list'key'name')
 
-        print("")
+        print ""
         user_type_id = utils.ask_question("Please select the user type")
 
     elif user_types'count' > 0:
-        print("Automatically selected the only user type available")
+        print "Automatically selected the only user type available"
         user_type_id = user_types'list'.keys()0
 
     else:
-        print("No user types available")
+        print "No user types available"
         sys.exit(1)
 
-    if user_type_id in user_types'list':
+    if user_types'list'.has_key(user_type_id):
         user_type_info = user_types'list'user_type_id'attributes'
     else:
-        print("No such user type")
+        print "No such user type"
         sys.exit(1)
 
     params = {
@@ -256,9 +256,9 @@
     must_attrs = 
     may_attrs = 
 
-    for attribute in user_type_info'form_fields':
+    for attribute in user_type_info'form_fields'.keys():
         if isinstance(user_type_info'form_fields'attribute, dict):
-            if 'optional' in user_type_info'form_fields'attribute and user_type_info'form_fields'attribute'optional':
+            if user_type_info'form_fields'attribute.has_key('optional') and user_type_info'form_fields'attribute'optional':
                 may_attrs.append(attribute)
             else:
                 must_attrs.append(attribute)
@@ -267,14 +267,14 @@
 
     for attribute in must_attrs:
         if isinstance(user_type_info'form_fields'attribute, dict) and \
-                'type' in user_type_info'form_fields'attribute:
+                user_type_info'form_fields'attribute.has_key('type'):
 
             if user_type_info'form_fields'attribute'type' == 'select':
-                if 'values' not in user_type_info'form_fields'attribute:
+                if not user_type_info'form_fields'attribute.has_key('values'):
                     attribute_values = form_value_select_options('user', user_type_id, attribute)
 
                     default = ''
-                    if 'default' in attribute_valuesattribute:
+                    if attribute_valuesattribute.has_key('default'):
                         default = attribute_valuesattribute'default'
 
                     paramsattribute = utils.ask_menu(
@@ -285,7 +285,7 @@
 
                 else:
                     default = ''
-                    if 'default' in user_type_info'form_fields'attribute:
+                    if user_type_info'form_fields'attribute.has_key('default'):
                         default = user_type_info'form_fields'attribute'default'
 
                     paramsattribute = utils.ask_menu(
@@ -300,11 +300,11 @@
         else:
             paramsattribute = utils.ask_question(attribute)
 
-    for attribute in user_type_info'fields':
+    for attribute in user_type_info'fields'.keys():
         paramsattribute = user_type_info'fields'attribute
 
     exec("retval = user_form_value_generate(params)")
-    print(retval)
+    print retval
 
     return params
 
@@ -337,7 +337,7 @@
 def group_find(params=None):
     post = { 'search': { 'params': {} } }
 
-    for (k,v) in params.items():
+    for (k,v) in params.iteritems():
         post'search''params'k = { 'value': v, 'type': 'exact' }
 
     return request('POST', 'group.find', post=json.dumps(post))
@@ -371,7 +371,7 @@
 def ou_find(params=None):
     post = { 'search': { 'params': {} } }
 
-    for (k,v) in params.items():
+    for (k,v) in params.iteritems():
         post'search''params'k = { 'value': v, 'type': 'exact' }
 
     return request('POST', 'ou.find', post=json.dumps(post))
@@ -436,7 +436,7 @@
 
     try:
         response_data = json.loads(data)
-    except ValueError:
+    except ValueError, e:
         # Some data is not JSON
         log.error(_("Response data is not JSON"))
 
@@ -459,7 +459,7 @@
 def resource_find(params=None):
     post = { 'search': { 'params': {} } }
 
-    for (k,v) in params.items():
+    for (k,v) in params.iteritems():
         post'search''params'k = { 'value': v, 'type': 'exact' }
 
     return request('POST', 'resource.find', post=json.dumps(post))
@@ -497,7 +497,7 @@
                 'role': role.keys()0
             }
 
-    if 'role' not in params:
+    if not params.has_key('role'):
         role = role_find_by_attribute(params)
         params = {
                 'role': role.keys()0
@@ -591,7 +591,7 @@
 
     user_info = request('GET', 'user.info', get=get)
 
-    for attribute in attributes:
+    for attribute in attributes.keys():
         user_infoattribute = attributesattribute
 
     post = json.dumps(user_info)
@@ -615,7 +615,7 @@
     else:
         post = { 'search': { 'params': {} } }
 
-        for (k,v) in attribs.items():
+        for (k,v) in attribs.iteritems():
             post'search''params'k = { 'value': v, 'type': 'exact' }
 
     post = json.dumps(post)

pykolab-0.8.23.tar.gz/pykolab/xml/attendee.py -> pykolab-0.8.4.tar.gz/pykolab/xml/attendee.py Changed

@@ -25,7 +25,7 @@
     }
 
 def participant_status_label(status):
-    return _(participant_status_labelsstatus) if status in participant_status_labels else _(status)
+    return _(participant_status_labelsstatus) if participant_status_labels.has_key(status) else _(status)
 
 
 class Attendee(kolabformat.Attendee):
@@ -33,8 +33,6 @@
             "INDIVIDUAL": kolabformat.CutypeIndividual,
             "RESOURCE": kolabformat.CutypeResource,
             "GROUP": kolabformat.CutypeGroup,
-            "ROOM": kolabformat.CutypeRoom,
-            "UNKNOWN": kolabformat.CutypeUnknown,
         }
 
     participant_status_map = {
@@ -92,7 +90,7 @@
         if isinstance(rsvp, bool):
             self.setRSVP(rsvp)
         else:
-            if rsvp in self.rsvp_map:
+            if self.rsvp_map.has_key(rsvp):
                 self.setRSVP(self.rsvp_maprsvp)
 
         if not role == None:
@@ -101,10 +99,10 @@
         if not cutype == None:
             self.set_cutype(cutype)
 
-        if ical_params and 'DELEGATED-FROM' in ical_params:
+        if ical_params and ical_params.has_key('DELEGATED-FROM'):
             self.delegate_from(Attendee(str(ical_params'DELEGATED-FROM'), role=self.get_role(), cutype=self.get_cutype()))
 
-        if ical_params and 'DELEGATED-TO' in ical_params:
+        if ical_params and ical_params.has_key('DELEGATED-TO'):
             self.delegate_to(Attendee(str(ical_params'DELEGATED-TO')))
 
         if not participant_status == None:
@@ -132,14 +130,14 @@
 
         for delegator in delegators:
             if not isinstance(delegator, Attendee):
-                raise ValueError(_("Not a valid attendee"))
+                raise ValueError, _("Not a valid attendee")
             else:
                 self.set_role(delegator.get_role())
                 self.set_cutype(delegator.get_cutype())
                 crefs.append(delegator.contactreference)
 
         if len(crefs) == 0:
-            raise ValueError(_("No valid delegator references found"))
+            raise ValueError, _("No valid delegator references found")
         else:
             crefs += self.get_delegated_from()
 
@@ -154,12 +152,12 @@
 
         for delegatee in delegatees:
             if not isinstance(delegatee, Attendee):
-                raise ValueError(_("Not a valid attendee"))
+                raise ValueError, _("Not a valid attendee")
             else:
                 crefs.append(delegatee.contactreference)
 
         if len(crefs) == 0:
-            raise ValueError(_("No valid delegatee references found"))
+            raise ValueError, _("No valid delegatee references found")
         else:
             crefs += self.get_delegated_to()
 
@@ -210,36 +208,36 @@
         return self.rsvp()
 
     def _translate_value(self, val, map):
-        name_map = dict((v, k) for (k, v) in map.items())
-        return name_mapval if val in name_map else 'UNKNOWN'
+        name_map = dict((v, k) for (k, v) in map.iteritems())
+        return name_mapval if name_map.has_key(val) else 'UNKNOWN'
 
     def set_cutype(self, cutype):
-        if cutype in self.cutype_map:
+        if cutype in self.cutype_map.keys():
             self.setCutype(self.cutype_mapcutype)
         elif cutype in self.cutype_map.values():
             self.setCutype(cutype)
         else:
-            raise InvalidAttendeeCutypeError(_("Invalid cutype %r") % (cutype))
+            raise InvalidAttendeeCutypeError, _("Invalid cutype %r") % (cutype)
 
     def set_name(self, name):
         self.contactreference.set_name(name)
         self.setContact(self.contactreference)
 
     def set_participant_status(self, participant_status):
-        if participant_status in self.participant_status_map:
+        if participant_status in self.participant_status_map.keys():
             self.setPartStat(self.participant_status_mapparticipant_status)
         elif participant_status in self.participant_status_map.values():
             self.setPartStat(participant_status)
         else:
-            raise InvalidAttendeeParticipantStatusError(_("Invalid participant status %r") % (participant_status))
+            raise InvalidAttendeeParticipantStatusError, _("Invalid participant status %r") % (participant_status)
 
     def set_role(self, role):
-        if role in self.role_map:
+        if role in self.role_map.keys():
             self.setRole(self.role_maprole)
         elif role in self.role_map.values():
             self.setRole(role)
         else:
-            raise InvalidAttendeeRoleError(_("Invalid role %r") % (role))
+            raise InvalidAttendeeRoleError, _("Invalid role %r") % (role)
 
     def set_rsvp(self, rsvp):
         self.setRSVP(rsvp)
@@ -248,7 +246,7 @@
         data = self.contactreference.to_dict()
         data.pop('type', None)
 
-        for p, getter in self.properties_map.items():
+        for p, getter in self.properties_map.iteritems():
             val = None
             args = {}
             if hasattr(self, getter):

pykolab-0.8.23.tar.gz/pykolab/xml/contact.py -> pykolab-0.8.4.tar.gz/pykolab/xml/contact.py Changed

@@ -23,7 +23,7 @@
                 contact = contact_from_string(payload)
 
             # append attachment parts to Contact object
-            elif contact and 'Content-ID' in part:
+            elif contact and part.has_key('Content-ID'):
                 contact._attachment_parts.append(part)
 
     return contact
@@ -160,8 +160,8 @@
         return _gender
 
     def _translate_value(self, val, map):
-        name_map = dict((v, k) for (k, v) in map.items())
-        return name_mapval if val in name_map else 'UNKNOWN'
+        name_map = dict((v, k) for (k, v) in map.iteritems())
+        return name_mapval if name_map.has_key(val) else 'UNKNOWN'
 
     def to_dict(self):
         if not self.isValid():
@@ -169,7 +169,7 @@
 
         data = self._names2dict(self.nameComponents())
 
-        for p, getter in self.properties_map.items():
+        for p, getter in self.properties_map.iteritems():
             val = None
             if hasattr(self, getter):
                 val = getattr(self, getter)()
@@ -198,7 +198,7 @@
         affiliations = self.affiliations()
         if len(affiliations) > 0:
             _affiliation = self._affiliation2dict(affiliations0)
-            if 'address' in _affiliation:
+            if _affiliation.has_key('address'):
                 data'address'.extend(_affiliation'address')
                 _affiliation.pop('address', None)
             data.update(_affiliation)
@@ -223,7 +223,7 @@
 
         data = dict()
 
-        for p, getter in names_map.items():
+        for p, getter in names_map.iteritems():
             val = None
             if hasattr(namecomp, getter):
                 val = getattr(namecomp, getter)()
@@ -243,7 +243,7 @@
 
         data = dict()
 
-        for p, getter in props_map.items():
+        for p, getter in props_map.iteritems():
             val = None
             if hasattr(affiliation, getter):
                 val = getattr(affiliation, getter)()
@@ -269,7 +269,7 @@
             'code':     'code',
             'country':  'country',
         }
-        addresstype_map = dict((v, k) for (k, v) in self.addresstype_map.items())
+        addresstype_map = dict((v, k) for (k, v) in self.addresstype_map.iteritems())
 
         data = dict()
 
@@ -279,7 +279,7 @@
         if adrtype is not None:
             data'type' = adrtype
 
-        for p, getter in props_map.items():
+        for p, getter in props_map.iteritems():
             val = None
             if hasattr(adr, getter):
                 val = getattr(adr, getter)()
@@ -293,13 +293,13 @@
     def _relateds2dict(self, relateds, aslist=True):
         data = dict()
 
-        related_map = dict((v, k) for (k, v) in self.related_map.items())
+        related_map = dict((v, k) for (k, v) in self.related_map.iteritems())
         for rel in relateds:
             reltype = related_map.get(rel.relationTypes(), None)
             val = rel.uri() if rel.type() == kolabformat.Related.Uid else rel.text()
             if reltype and val is not None:
                 if aslist:
-                    if reltype not in data:
+                    if not data.has_key(reltype):
                         datareltype = 
                     datareltype.append(val)
                 else:
@@ -308,7 +308,7 @@
         return data
 
     def _struct2dict(self, struct, propname, map):
-        type_map = dict((v, k) for (k, v) in map.items())
+        type_map = dict((v, k) for (k, v) in map.iteritems())
         result = dict()
 
         if hasattr(struct, 'types'):
@@ -328,7 +328,7 @@
         if error == None or not error:
             return xml
         else:
-            raise ContactIntegrityError(kolabformat.errorMessage())
+            raise ContactIntegrityError, kolabformat.errorMessage()
 
 
 class ContactIntegrityError(Exception):

pykolab-0.8.23.tar.gz/pykolab/xml/contact_reference.py -> pykolab-0.8.4.tar.gz/pykolab/xml/contact_reference.py Changed

pykolab-0.8.23.tar.gz/pykolab/xml/event.py -> pykolab-0.8.4.tar.gz/pykolab/xml/event.py Changed

@@ -19,7 +19,6 @@
 from attendee import Attendee
 from contact_reference import ContactReference
 from recurrence_rule import RecurrenceRule
-from collections import OrderedDict
 
 log = pykolab.getLogger('pykolab.xml_event')
 
@@ -39,7 +38,7 @@
                 event = event_from_string(payload)
 
             # append attachment parts to Event object
-            elif event and 'Content-ID' in part:
+            elif event and part.has_key('Content-ID'):
                 event._attachment_parts.append(part)
 
     return event
@@ -166,7 +165,7 @@
             valid_datetime = True
 
         if not valid_datetime:
-            raise InvalidEventDateError(_("Rdate needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime)))
+            raise InvalidEventDateError, _("Rdate needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime))
 
         self.event.addRecurrenceDate(xmlutils.to_cdatetime(_datetime, True))
 
@@ -183,14 +182,14 @@
             valid_datetime = True
 
         if not valid_datetime:
-            raise InvalidEventDateError(_("Exdate needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime)))
+            raise InvalidEventDateError, _("Exdate needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime))
 
         self.event.addExceptionDate(xmlutils.to_cdatetime(_datetime, True))
 
     def add_exception(self, exception):
         recurrence_id = exception.get_recurrence_id()
         if recurrence_id is None:
-            raise EventIntegrityError("Recurrence exceptions require a Recurrence-ID property")
+            raise EventIntegrityError, "Recurrence exceptions require a Recurrence-ID property"
 
         # check if an exception with the given recurrence-id already exists
         append = True
@@ -218,7 +217,7 @@
     def del_exception(self, exception):
         recurrence_id = exception.get_recurrence_id()
         if recurrence_id is None:
-            raise EventIntegrityError("Recurrence exceptions require a Recurrence-ID property")
+            raise EventIntegrityError, "Recurrence exceptions require a Recurrence-ID property"
 
         updated = False
         vexceptions = self.event.exceptions()
@@ -353,7 +352,7 @@
                     break
 
         # use the libkolab calendaring bindings to load the full iCal data
-        if 'RRULE' in ical_event or 'ATTACH' in ical_event \
+        if ical_event.has_key('RRULE') or ical_event.has_key('ATTACH') \
              or part for part in ical_event.walk() if part.name == 'VALARM':
             if raw is None or raw == "":
                 raw = ical if isinstance(ical, str) else ical.to_ical()
@@ -364,20 +363,19 @@
         # TODO: Clause the timestamps for zulu suffix causing datetime.datetime
         # to fail substitution.
         for attr in list(set(ical_event.required)):
-            if attr in ical_event:
+            if ical_event.has_key(attr):
                 self.set_from_ical(attr.lower(), ical_eventattr)
 
         # NOTE: Make sure to list(set()) or duplicates may arise
-        # NOTE: Keep the original order e.g. to read DTSTART before RECURRENCE-ID
-        for attr in list(OrderedDict.fromkeys(ical_event.singletons)):
-            if attr in ical_event:
+        for attr in list(set(ical_event.singletons)):
+            if ical_event.has_key(attr):
                 if isinstance(ical_eventattr, list):
                     ical_eventattr = ical_eventattr0;
                 self.set_from_ical(attr.lower(), ical_eventattr)
 
         # NOTE: Make sure to list(set()) or duplicates may arise
         for attr in list(set(ical_event.multiple)):
-            if attr in ical_event:
+            if ical_event.has_key(attr):
                 self.set_from_ical(attr.lower(), ical_eventattr)
 
     def _xml_from_ical(self, ical):
@@ -402,7 +400,7 @@
                 attendee = self.get_attendee_by_name(attendee)
 
             else:
-                raise ValueError(_("No attendee with email or name %r") %(attendee))
+                raise ValueError, _("No attendee with email or name %r") %(attendee)
 
             return attendee
 
@@ -410,7 +408,7 @@
             return attendee
 
         else:
-            raise ValueError(_("Invalid argument value attendee %r, must be basestring or Attendee") % (attendee))
+            raise ValueError, _("Invalid argument value attendee %r, must be basestring or Attendee") % (attendee)
 
     def find_attendee(self, attendee):
         try:
@@ -422,13 +420,13 @@
         if email in x.get_email() for x in self.get_attendees():
             return x for x in self.get_attendees() if x.get_email() == email0
 
-        raise ValueError(_("No attendee with email %r") %(email))
+        raise ValueError, _("No attendee with email %r") %(email)
 
     def get_attendee_by_name(self, name):
         if name in x.get_name() for x in self.get_attendees():
             return x for x in self.get_attendees() if x.get_name() == name0
 
-        raise ValueError(_("No attendee with name %r") %(name))
+        raise ValueError, _("No attendee with name %r") %(name)
 
     def get_attendees(self):
         return self._attendees
@@ -551,31 +549,31 @@
             delegators = attendee.get_delegated_from()
             delegatees = attendee.get_delegated_to()
 
-            if rsvp in attendee.rsvp_map:
+            if rsvp in attendee.rsvp_map.keys():
                 _rsvp = rsvp
             elif rsvp in attendee.rsvp_map.values():
-                _rsvp = k for k, v in attendee.rsvp_map.items() if v == rsvp0
+                _rsvp = k for k, v in attendee.rsvp_map.iteritems() if v == rsvp0
             else:
                 _rsvp = None
 
-            if role in attendee.role_map:
+            if role in attendee.role_map.keys():
                 _role = role
             elif role in attendee.role_map.values():
-                _role = k for k, v in attendee.role_map.items() if v == role0
+                _role = k for k, v in attendee.role_map.iteritems() if v == role0
             else:
                 _role = None
 
-            if partstat in attendee.participant_status_map:
+            if partstat in attendee.participant_status_map.keys():
                 _partstat = partstat
             elif partstat in attendee.participant_status_map.values():
-                _partstat = k for k, v in attendee.participant_status_map.items() if v == partstat0
+                _partstat = k for k, v in attendee.participant_status_map.iteritems() if v == partstat0
             else:
                 _partstat = None
 
-            if cutype in attendee.cutype_map:
+            if cutype in attendee.cutype_map.keys():
                 _cutype = cutype
             elif cutype in attendee.cutype_map.values():
-                _cutype = k for k, v in attendee.cutype_map.items() if v == cutype0
+                _cutype = k for k, v in attendee.cutype_map.iteritems() if v == cutype0
             else:
                 _cutype = None
 
@@ -608,12 +606,12 @@
     def get_ical_attendee_participant_status(self, attendee):
         attendee = self.get_attendee(attendee)
 
-        if attendee.get_participant_status() in attendee.participant_status_map:
+        if attendee.get_participant_status() in attendee.participant_status_map.keys():
             return attendee.get_participant_status()
         elif attendee.get_participant_status() in attendee.participant_status_map.values():
-            return k for k, v in attendee.participant_status_map.items() if v == attendee.get_participant_status()0
+            return k for k, v in attendee.participant_status_map.iteritems() if v == attendee.get_participant_status()0
         else:
-            raise ValueError(_("Invalid participant status"))
+            raise ValueError, _("Invalid participant status")
 
     def get_ical_created(self):
         return self.get_created()
@@ -652,7 +650,7 @@
     def get_ical_status(self):
         status = self.event.status()
 
-        if status in self.status_map:
+        if status in self.status_map.keys():
             return status
 
         return self._translate_value(status, self.status_map) if status else None
@@ -814,15 +812,15 @@
         self.event.setAttendees(self._attendees)
 
     def set_classification(self, classification):
-        if classification in self.classification_map:
+        if classification in self.classification_map.keys():
             self.event.setClassification(self.classification_mapclassification)
         elif classification in self.classification_map.values():
-            self.event.setClassification(classification)
+            self.event.setClassification(status)
         else:
-            raise ValueError(_("Invalid classification %r") % (classification))
+            raise ValueError, _("Invalid classification %r") % (classification)
 
     def set_created(self, _datetime=None):
-        if _datetime is None or isinstance(_datetime, datetime.time):
+        if _datetime == None:
             _datetime = datetime.datetime.utcnow()
 
         self.event.setCreated(xmlutils.to_cdatetime(_datetime, False, True))
@@ -850,7 +848,7 @@
             valid_datetime = True
 
         if not valid_datetime:
-            raise InvalidEventDateError(_("Event end needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime)))
+            raise InvalidEventDateError, _("Event end needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime))
 
         self.event.setEnd(xmlutils.to_cdatetime(_datetime, True))
 
@@ -864,7 +862,7 @@
 
     def add_custom_property(self, name, value):
         if not name.upper().startswith('X-'):
-            raise ValueError(_("Invalid custom property name %r") % (name))
+            raise ValueError, _("Invalid custom property name %r") % (name)
 
         props = self.event.customProperties()
         props.append(kolabformat.CustomProperty(name.upper(), value))
@@ -882,8 +880,7 @@
         if attr == "categories":
             self.add_category(value)
         elif attr == "class":
-            if (value and value:2 not in 'X-', 'x-'):
-                self.set_classification(value)
+            self.set_classification(value)
         elif attr == "recurrenceid":
             self.set_ical_recurrenceid(value, params)
         elif hasattr(self, ical_setter):
@@ -904,27 +901,27 @@
                 else:
                     params = {}
 
-                if 'CN' in params:
+                if params.has_key('CN'):
                     name = ustr(params'CN')
                 else:
                     name = None
 
-                if 'ROLE' in params:
+                if params.has_key('ROLE'):
                     role = params'ROLE'
                 else:
                     role = None
 
-                if 'PARTSTAT' in params:
+                if params.has_key('PARTSTAT'):
                     partstat = params'PARTSTAT'
                 else:
                     partstat = None
 
-                if 'RSVP' in params:
+                if params.has_key('RSVP'):
                     rsvp = params'RSVP'
                 else:
                     rsvp = None
 
-                if 'CUTYPE' in params:
+                if params.has_key('CUTYPE'):
                     cutype = params'CUTYPE'
                 else:
                     cutype = kolabformat.CutypeIndividual
@@ -963,7 +960,7 @@
         else:
             params = {}
 
-        if 'CN' in params:
+        if params.has_key('CN'):
             cn = ustr(params'CN')
 
         self.set_organizer(str(address), name=cn)
@@ -1001,7 +998,7 @@
         try:
             self.thisandfuture = params.get('RANGE', '') == 'THISANDFUTURE'
             self.set_recurrence_id(value, self.thisandfuture)
-        except InvalidEventDateError:
+        except InvalidEventDateError, e:
             pass
 
     def set_lastmodified(self, _datetime=None):
@@ -1012,12 +1009,12 @@
         if isinstance(_datetime, datetime.datetime):
             valid_datetime = True
 
-        if _datetime is None or isinstance(_datetime, datetime.time):
+        if _datetime == None:
             valid_datetime = True
             _datetime = datetime.datetime.utcnow()
 
         if not valid_datetime:
-            raise InvalidEventDateError(_("Event last-modified needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime)))
+            raise InvalidEventDateError, _("Event last-modified needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime))
 
         self.event.setLastModified(xmlutils.to_cdatetime(_datetime, False, True))
 
@@ -1038,7 +1035,7 @@
         self.event.setSequence(int(sequence))
 
     def set_url(self, url):
-        self.event.setUrl(ustr(url))
+        self.event.setUrl(str(url))
 
     def set_recurrence(self, recurrence):
         self.event.setRecurrenceRule(recurrence)
@@ -1060,17 +1057,17 @@
             valid_datetime = True
 
         if not valid_datetime:
-            raise InvalidEventDateError(_("Event start needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime)))
+            raise InvalidEventDateError, _("Event start needs datetime.date or datetime.datetime instance, got %r") % (type(_datetime))
 
         self.event.setStart(xmlutils.to_cdatetime(_datetime, True))
 
     def set_status(self, status):
-        if status in self.status_map:
+        if status in self.status_map.keys():
             self.event.setStatus(self.status_mapstatus)
         elif status in self.status_map.values():
             self.event.setStatus(status)
         elif not status == kolabformat.StatusUndefined:
-            raise InvalidEventStatusError(_("Invalid status set: %r") % (status))
+            raise InvalidEventStatusError, _("Invalid status set: %r") % (status)
 
     def set_summary(self, summary):
         self.event.setSummary(summary)
@@ -1093,7 +1090,7 @@
             valid_datetime = True
 
         if not valid_datetime:
-            raise InvalidEventDateError(_("Event recurrence-id needs datetime.datetime instance"))
+            raise InvalidEventDateError, _("Event recurrence-id needs datetime.datetime instance")
 
         if _thisandfuture is None:
             _thisandfuture = self.thisandfuture
@@ -1111,12 +1108,12 @@
         if error == None or not error:
             return event_xml
         else:
-            raise EventIntegrityError(kolabformat.errorMessage())
+            raise EventIntegrityError, kolabformat.errorMessage()
 
     def to_dict(self):
         data = dict()
 
-        for p, getter in self.properties_map.items():
+        for p, getter in self.properties_map.iteritems():
             val = None
             if hasattr(self, getter):
                 val = getattr(self, getter)()
@@ -1176,8 +1173,8 @@
         return ret
 
     def _translate_value(self, val, map):
-        name_map = dict((v, k) for (k, v) in map.items())
-        return name_mapval if val in name_map else 'UNKNOWN'
+        name_map = dict((v, k) for (k, v) in map.iteritems())
+        return name_mapval if name_map.has_key(val) else 'UNKNOWN'
 
     def to_message(self, creator=None):
         from email.MIMEMultipart import MIMEMultipart
@@ -1273,7 +1270,7 @@
         from email import charset
         charset.add_charset('utf-8', charset.SHORTEST, charset.QP)
 
-        msg = MIMEMultipart("alternative")
+        msg = MIMEMultipart()
 
         msg_from = None
         attendees = None
@@ -1353,6 +1350,7 @@
 
         part.set_payload(self.as_string_itip(method=method))
 
+        part.add_header('Content-Disposition', 'attachment; filename="event.ics"')
         part.add_header('Content-Transfer-Encoding', '8bit')
 
         msg.attach(part)

pykolab-0.8.23.tar.gz/pykolab/xml/note.py -> pykolab-0.8.4.tar.gz/pykolab/xml/note.py Changed

@@ -19,7 +19,7 @@
                 note = note_from_string(payload)
 
             # append attachment parts to Note object
-            elif note and 'Content-ID' in part:
+            elif note and part.has_key('Content-ID'):
                 note._attachment_parts.append(part)
 
     return note
@@ -86,12 +86,12 @@
         return _class
 
     def set_classification(self, classification):
-        if classification in self.classification_map:
+        if classification in self.classification_map.keys():
             self.setClassification(self.classification_mapclassification)
         elif classification in self.classification_map.values():
             self.setClassification(status)
         else:
-            raise ValueError(_("Invalid classification %r") % (classification))
+            raise ValueError, _("Invalid classification %r") % (classification)
 
     def add_category(self, category):
         _categories = self.categories()
@@ -99,8 +99,8 @@
         self.setCategories(_categories)
 
     def _translate_value(self, val, map):
-        name_map = dict((v, k) for (k, v) in map.items())
-        return name_mapval if val in name_map else 'UNKNOWN'
+        name_map = dict((v, k) for (k, v) in map.iteritems())
+        return name_mapval if name_map.has_key(val) else 'UNKNOWN'
 
     def to_dict(self):
         if not self.isValid():
@@ -108,7 +108,7 @@
 
         data = dict()
 
-        for p, getter in self.properties_map.items():
+        for p, getter in self.properties_map.iteritems():
             val = None
             if hasattr(self, getter):
                 val = getattr(self, getter)()
@@ -131,7 +131,7 @@
         if error == None or not error:
             return xml
         else:
-            raise NoteIntegrityError(kolabformat.errorMessage())
+            raise NoteIntegrityError, kolabformat.errorMessage()
 
 class NoteIntegrityError(Exception):
     def __init__(self, message):

pykolab-0.8.23.tar.gz/pykolab/xml/recurrence_rule.py -> pykolab-0.8.4.tar.gz/pykolab/xml/recurrence_rule.py Changed

@@ -48,7 +48,7 @@
 }
 
 def frequency_label(freq):
-    return _(frequency_labelsfreq) if freq in frequency_labels else _(freq)
+    return _(frequency_labelsfreq) if frequency_labels.has_key(freq) else _(freq)
 
 
 class RecurrenceRule(kolabformat.RecurrenceRule):
@@ -114,11 +114,11 @@
         }
 
         for prop,setter in vectorimap.items():
-            if prop in vrecur:
+            if vrecur.has_key(prop):
                 getattr(self, setter)(int(v) for v in vrecurprop)
 
         for prop,setter in settermap.items():
-            if prop in vrecur:
+            if vrecur.has_key(prop):
                 getattr(self, setter)(vrecurprop)
 
     def set_count(self, count):
@@ -150,7 +150,7 @@
             occurrence = int(wday.relative)
             if str(wday)0 == '-':
                 occurrence = occurrence * -1
-            if weekday in self.weekday_map:
+            if self.weekday_map.has_key(weekday):
                 daypos.append(kolabformat.DayPos(occurrence, self.weekday_mapweekday))
         self.setByday(daypos)
 
@@ -175,14 +175,14 @@
     def _set_map_value(self, val, pmap, setter):
         if isinstance(val, list):
             val = val0
-        if val in pmap:
+        if val in pmap.keys():
             getattr(self, setter)(pmapval)
         elif val in pmap.values():
             getattr(self, setter)(val)
 
     def _translate_value(self, val, map):
-        name_map = dict((v, k) for (k, v) in map.items())
-        return name_mapval if val in name_map else 'UNKNOWN'
+        name_map = dict((v, k) for (k, v) in map.iteritems())
+        return name_mapval if name_map.has_key(val) else 'UNKNOWN'
 
     def to_ical(self):
         rrule = icalendar.vRecur(dict((k,v) for k,v in self.to_dict(True).items() if not (type(v) == str and v == '' or type(v) == list and len(v) == 0)))
@@ -194,7 +194,7 @@
 
         data = dict()
 
-        for p, getter in self.properties_map.items():
+        for p, getter in self.properties_map.iteritems():
             val = None
             args = {}
             if hasattr(self, getter):

pykolab-0.8.23.tar.gz/pykolab/xml/todo.py -> pykolab-0.8.4.tar.gz/pykolab/xml/todo.py Changed

@@ -29,7 +29,7 @@
                 todo = todo_from_string(payload)
 
             # append attachment parts to Todo object
-            elif todo and 'Content-ID' in part:
+            elif todo and part.has_key('Content-ID'):
                 todo._attachment_parts.append(part)
 
     return todo
@@ -38,9 +38,6 @@
 class Todo(Event):
     type = 'task'
 
-    # This have to be a copy (see T1221)
-    properties_map = Event.properties_map.copy()
-
     def __init__(self, from_ical="", from_string=""):
         self._attendees = 
         self._categories = 
@@ -82,11 +79,11 @@
                     ical_todo = c
                     break
 
-        log.debug("Todo.from_ical(); %r, %r, %r" % (type(ical_todo), 'ATTACH' in ical_todo, 'ATTENDEE' in ical_todo), level=8)
+        log.debug("Todo.from_ical(); %r, %r, %r" % (type(ical_todo), ical_todo.has_key('ATTACH'), ical_todo.has_key('ATTENDEE')), level=8)
 
         # DISABLED: use the libkolab calendaring bindings to load the full iCal data
         # TODO: this requires support for iCal parsing in the kolab.calendaring bindings
-        if False and 'ATTACH' in ical_todo or part for part in ical_todo.walk() if part.name == 'VALARM':
+        if False and ical_todo.has_key('ATTACH') or part for part in ical_todo.walk() if part.name == 'VALARM':
             if raw is None or raw == "":
                 raw = ical if isinstance(ical, str) else ical.to_ical()
             self._xml_from_ical(raw)
@@ -94,21 +91,21 @@
             self.event = kolabformat.Todo()
 
         for attr in list(set(ical_todo.required)):
-            if attr in ical_todo:
+            if ical_todo.has_key(attr):
                 self.set_from_ical(attr.lower(), ical_todoattr)
 
         for attr in list(set(ical_todo.singletons)):
-            if attr in ical_todo:
+            if ical_todo.has_key(attr):
                 if isinstance(ical_todoattr, list):
                     ical_todoattr = ical_todoattr0;
                 self.set_from_ical(attr.lower(), ical_todoattr)
 
         for attr in list(set(ical_todo.multiple)):
-            if attr in ical_todo:
+            if ical_todo.has_key(attr):
                 self.set_from_ical(attr.lower(), ical_todoattr)
 
         # although specified by RFC 2445/5545, icalendar doesn't have this property listed
-        if 'PERCENT-COMPLETE' in ical_todo:
+        if ical_todo.has_key('PERCENT-COMPLETE'):
             self.set_from_ical('percentcomplete', ical_todo'PERCENT-COMPLETE')
 
     def _xml_from_ical(self, ical):
@@ -122,16 +119,16 @@
             params = {}
 
         _attachment = kolabformat.Attachment()
-        if 'FMTTYPE' in params:
+        if params.has_key('FMTTYPE'):
             mimetype = str(params'FMTTYPE')
         else:
             mimetype = 'application/octet-stream'
 
-        if 'X-LABEL' in params:
+        if params.has_key('X-LABEL'):
             _attachment.setLabel(str(params'X-LABEL'))
 
         decode = False
-        if 'ENCODING' in params:
+        if params.has_key('ENCODING'):
             if params'ENCODING' == "BASE64" or params'ENCODING' == "B":
                 decode = True
 
@@ -162,7 +159,7 @@
             valid_datetime = True
 
         if not valid_datetime:
-            raise InvalidEventDateError(_("Todo due needs datetime.date or datetime.datetime instance"))
+            raise InvalidEventDateError, _("Todo due needs datetime.date or datetime.datetime instance")
 
         self.event.setDue(xmlutils.to_cdatetime(_datetime, True))
 
@@ -259,7 +256,7 @@
         if error == None or not error:
             return xml
         else:
-            raise TodoIntegrityError(kolabformat.errorMessage())
+            raise TodoIntegrityError, kolabformat.errorMessage()
 
 
 class TodoIntegrityError(Exception):

pykolab-0.8.23.tar.gz/pykolab/xml/utils.py -> pykolab-0.8.4.tar.gz/pykolab/xml/utils.py Changed

@@ -85,16 +85,28 @@
             datetime = _datetime.replace(tzinfo=pytz.utc)
         with_timezone = False
 
-    # Sometimes we deal with dummy 00000000T000000 values from iCalendar
-    # in such cases we end up with datetime.time objects
-    if not hasattr(_datetime, 'year'):
-        (year, month, day) = (1970, 1, 1)
-    else:
-        (year, month, day) = (_datetime.year, _datetime.month, _datetime.day)
+    (
+        year,
+        month,
+        day,
+    ) = (
+        _datetime.year,
+        _datetime.month,
+        _datetime.day,
+    )
 
     if hasattr(_datetime, 'hour'):
-        (hour, minute, second) = (_datetime.hour, _datetime.minute, _datetime.second)
+        (
+            hour,
+            minute,
+            second
+        ) = (
+            _datetime.hour,
+            _datetime.minute,
+            _datetime.second
+        )
         _cdatetime = kolabformat.cDateTime(year, month, day, hour, minute, second)
+
     else:
         _cdatetime = kolabformat.cDateTime(year, month, day)
 
@@ -158,7 +170,7 @@
     """
         Return a localized name for the given object property
     """
-    return _(property_labelspropname) if propname in property_labels else _(propname)
+    return _(property_labelspropname) if property_labels.has_key(propname) else _(propname)
 
 
 def property_to_string(propname, value):
@@ -186,18 +198,18 @@
     if isinstance(value, dict):
         if propname == 'attendee':
             from . import attendee
-            name = value'name' if 'name' in value and not value'name' == '' else value'email'
+            name = value'name' if value.has_key('name') and not value'name' == '' else value'email'
             return "%s, %s" % (name, attendee.participant_status_label(value'partstat'))
 
         elif propname == 'organizer':
-            return value'name' if 'name' in value and not value'name' == '' else value'email'
+            return value'name' if value.has_key('name') and not value'name' == '' else value'email'
 
         elif propname == 'rrule':
             from . import recurrence_rule
             rrule = recurrence_rule.frequency_label(value'freq') % (value'interval')
-            if 'count' in value and value'count' > 0:
+            if value.has_key('count') and value'count' > 0:
                 rrule += " " + _("for %d times") % (value'count')
-            elif 'until' in value and (isinstance(value'until', datetime.datetime) or isinstance(value'until', datetime.date)):
+            elif value.has_key('until') and (isinstance(value'until', datetime.datetime) or isinstance(value'until', datetime.date)):
                 rrule += " " + _("until %s") % (value'until'.strftime(date_format))
             return rrule
 
@@ -235,7 +247,7 @@
             return alarm
 
         elif propname == 'attach':
-            return value'label' if 'label' in value else value'fmttype'
+            return value'label' if value.has_key('label') else value'fmttype'
 
     return None
 
@@ -247,11 +259,11 @@
     diff = 
 
     properties = a.keys()
-    properties.extend(x for x in b if x not in properties)
+    properties.extend(x for x in b.keys() if x not in properties)
 
     for prop in properties:
-        aa = aprop if prop in a else None
-        bb = bprop if prop in b else None
+        aa = aprop if a.has_key(prop) else None
+        bb = bprop if b.has_key(prop) else None
 
         # compare two lists
         if isinstance(aa, list) or isinstance(bb, list):
@@ -338,8 +350,8 @@
 
         # accept partial match
         if partial:
-            for k,v in aa.items():
-                if k in bb and bbk == v:
+            for k,v in aa.iteritems():
+                if bb.has_key(k) and bbk == v:
                     return True
 
             return False
@@ -355,10 +367,10 @@
         return (aa, bb)
 
     properties = aa.keys()
-    properties.extend(x for x in bb if x not in properties)
+    properties.extend(x for x in bb.keys() if x not in properties)
 
     for prop in properties:
-        if prop not in aa or prop not in bb:
+        if not aa.has_key(prop) or not bb.has_key(prop):
             continue
         if isinstance(aaprop, dict) and isinstance(bbprop, dict):
             (aaprop, bbprop) = reduce_properties(aaprop, bbprop)

pykolab-0.8.23.tar.gz/saslauthd.py -> pykolab-0.8.4.tar.gz/saslauthd.py Changed

pykolab-0.8.23.tar.gz/saslauthd/__init__.py -> pykolab-0.8.4.tar.gz/saslauthd/__init__.py Changed

@@ -25,7 +25,6 @@
     backend.
 """
 
-from __future__ import print_function
 from optparse import OptionParser
 from ConfigParser import SafeConfigParser
 
@@ -106,7 +105,7 @@
                     conf.process_username,
                     conf.process_groupname
                 )
-        except Exception as errmsg:
+        except Exception, errmsg:
             log.error(_("Could not create %r: %r") % (os.path.dirname(conf.pidfile), errmsg))
             sys.exit(1)
 
@@ -139,7 +138,7 @@
                 # Give up the session, all control,
                 # all open file descriptors, see #5151
                 os.chdir("/")
-                old_umask = os.umask(0)
+                os.umask(0)
                 os.setsid()
 
                 pid = os.fork()
@@ -154,35 +153,31 @@
                 os.close(1)
                 os.close(2)
 
-                os.umask(old_umask)
-
                 self.thread_count += 1
                 log.remove_stdout_handler()
                 self.set_signal_handlers()
                 self.write_pid()
                 self.do_saslauthd()
 
-        except SystemExit as e:
+        except SystemExit, e:
             exitcode = e
         except KeyboardInterrupt:
             exitcode = 1
             log.info(_("Interrupted by user"))
-        except AttributeError:
+        except AttributeError, e:
             exitcode = 1
             traceback.print_exc()
-            print(_("Traceback occurred, please report a " +
-                                   "bug at https://issues.kolab.org"),
-                  file=sys.stderr)
-        except TypeError as e:
+            print >> sys.stderr, _("Traceback occurred, please report a " +
+                                   "bug at https://issues.kolab.org")
+        except TypeError, e:
             exitcode = 1
             traceback.print_exc()
             log.error(_("Type Error: %s") % e)
         except:
             exitcode = 2
             traceback.print_exc()
-            print(_("Traceback occurred, please report a " +
-                                   "bug at https://issues.kolab.org"),
-                  file=sys.stderr)
+            print >> sys.stderr, _("Traceback occurred, please report a " +
+                                   "bug at https://issues.kolab.org")
 
         sys.exit(exitcode)
 
@@ -207,7 +202,7 @@
             pass
 
         s.bind(conf.socketfile)
-        os.chmod(conf.socketfile, 0o777)
+        os.chmod(conf.socketfile, 0777)
 
         s.listen(5)
 
@@ -220,7 +215,7 @@
                 try:
                     (clientsocket, address) = s.accept()
                     bound = True
-                except Exception as errmsg:
+                except Exception, errmsg:
                     log.error(
                             _("kolab-saslauthd could not accept " +
                               "connections on socket: %r") % (errmsg)
@@ -312,7 +307,7 @@
             try:
                 (ruid, euid, suid) = os.getresuid()
                 (rgid, egid, sgid) = os.getresgid()
-            except AttributeError:
+            except AttributeError, errmsg:
                 ruid = os.getuid()
                 rgid = os.getgid()
 
@@ -329,9 +324,9 @@
                             ) = grp.getgrnam(conf.process_groupname)
 
                     except KeyError:
-                        print(_("Group %s does not exist") % (
+                        print >> sys.stderr, _("Group %s does not exist") % (
                                 conf.process_groupname
-                            ), file=sys.stderr)
+                            )
 
                         sys.exit(1)
 
@@ -360,9 +355,9 @@
                             ) = pwd.getpwnam(conf.process_username)
 
                     except KeyError:
-                        print(_("User %s does not exist") % (
+                        print >> sys.stderr, _("User %s does not exist") % (
                                 conf.process_username
-                            ), file=sys.stderr)
+                            )
 
                         sys.exit(1)

pykolab-0.8.23.tar.gz/setup-kolab.py -> pykolab-0.8.4.tar.gz/setup-kolab.py Changed

pykolab-0.8.23.tar.gz/share/templates/cyrus.conf.tpl -> pykolab-0.8.4.tar.gz/share/templates/cyrus.conf.tpl Changed

pykolab-0.8.23.tar.gz/share/templates/freshclam.conf.tpl -> pykolab-0.8.4.tar.gz/share/templates/freshclam.conf.tpl Changed

pykolab-0.8.23.tar.gz/share/templates/header_checks.submission -> pykolab-0.8.4.tar.gz/share/templates/header_checks.submission Changed

pykolab-0.8.23.tar.gz/share/templates/imapd.conf.tpl -> pykolab-0.8.4.tar.gz/share/templates/imapd.conf.tpl Changed

pykolab-0.8.23.tar.gz/share/templates/master.cf.tpl -> pykolab-0.8.4.tar.gz/share/templates/master.cf.tpl Changed

pykolab-0.8.23.tar.gz/share/templates/roundcubemail/calendar.inc.php.tpl -> pykolab-0.8.4.tar.gz/share/templates/roundcubemail/calendar.inc.php.tpl Changed

pykolab-0.8.23.tar.gz/share/templates/roundcubemail/config.inc.php.tpl -> pykolab-0.8.4.tar.gz/share/templates/roundcubemail/config.inc.php.tpl Changed

@@ -19,7 +19,6 @@
     \$config'imap_force_lsub' = true;
 
     // IMAP Connection TLS settings, adjust for Production
-    // Required for PHP >= 5.6
     \$config'imap_conn_options' = Array(
             'ssl' => Array(
                     'verify_peer_name' => false,
@@ -43,7 +42,6 @@
     \$config'smtp_helo_host' = \$_SERVER"HTTP_HOST";
 
     // SMTP Connection TLS settings, adjust for Production
-    // Required for PHP >= 5.6
     \$config'smtp_conn_options' = Array(
             'ssl' => Array(
                     'verify_peer_name' => false,
@@ -105,23 +103,10 @@
 
     \$config'message_sort_col' = 'date';
 
-    \$config'spellcheck_engine' = 'pspell';
     \$config'spellcheck_dictionary' = true;
     \$config'spellcheck_ignore_caps' = true;
     \$config'spellcheck_ignore_nums' = true;
     \$config'spellcheck_ignore_syms' = true;
-    \$config'spellcheck_languages' = array(
-            'da' => 'Dansk',
-            'de' => 'Deutsch',
-            'en' => 'English',
-            'es' => 'Español',
-            'fr' => 'Français',
-            'it' => 'Italiano',
-            'nl' => 'Nederlands',
-            'pt' => 'Português',
-            'ru' => 'Русский',
-            'sv' => 'Svenska'
-        );
 
     \$config'undo_timeout' = 10;
     \$config'upload_progress' = 2;
@@ -244,6 +229,23 @@
             'ssl_verify_peer' => false,
         );
 
-    @include('/etc/roundcubemail/kolab_syncroton.inc.php');
+    # Required for PHP 5.6
+    \$config'imap_conn_options' = Array(
+            'ssl' => Array(
+                    'verify_peer_name'  => false,
+                    'verify_peer'       => false,
+                    'allow_self_signed' => true
+                )
+        );
+
+    \$config'smtp_conn_options' = Array(
+            'ssl' => Array(
+                    'verify_peer_name'  => false,
+                    'verify_peer'       => false,
+                    'allow_self_signed' => true
+                )
+        );
+
+    \$config'fileapi_manticore' = 'http://' . \$_SERVER'HTTP_HOST' . ':8080';
 
 ?>

pykolab-0.8.4.tar.gz/share/templates/roundcubemail/owncloud.inc.php.tpl Added

pykolab-0.8.23.tar.gz/tests/functional/resource_func.py -> pykolab-0.8.4.tar.gz/tests/functional/resource_func.py Changed

pykolab-0.8.23.tar.gz/tests/functional/test_kolabd/test_001_user_sync.py -> pykolab-0.8.4.tar.gz/tests/functional/test_kolabd/test_001_user_sync.py Changed

pykolab-0.8.23.tar.gz/tests/functional/test_kolabd/test_002_user_rename.py -> pykolab-0.8.4.tar.gz/tests/functional/test_kolabd/test_002_user_rename.py Changed

pykolab-0.8.23.tar.gz/tests/functional/test_wallace/test_002_footer.py -> pykolab-0.8.4.tar.gz/tests/functional/test_wallace/test_002_footer.py Changed

pykolab-0.8.23.tar.gz/tests/functional/test_wallace/test_006_resource_performance.py -> pykolab-0.8.4.tar.gz/tests/functional/test_wallace/test_006_resource_performance.py Changed

pykolab-0.8.23.tar.gz/tests/functional/test_wap_client/test_002_user_add.py -> pykolab-0.8.4.tar.gz/tests/functional/test_wap_client/test_002_user_add.py Changed

pykolab-0.8.23.tar.gz/tests/functional/test_wap_client/test_003_user_add_fr_FR.py -> pykolab-0.8.4.tar.gz/tests/functional/test_wap_client/test_003_user_add_fr_FR.py Changed

pykolab-0.8.23.tar.gz/tests/functional/user_add.py -> pykolab-0.8.4.tar.gz/tests/functional/user_add.py Changed

pykolab-0.8.23.tar.gz/tests/unit/test-002-attendee.py -> pykolab-0.8.4.tar.gz/tests/unit/test-002-attendee.py Changed

@@ -4,7 +4,6 @@
 
 from pykolab.xml import Attendee
 from pykolab.xml import participant_status_label
-from pykolab.xml.attendee import InvalidAttendeeCutypeError
 
 
 class TestEventXML(unittest.TestCase):
@@ -34,7 +33,7 @@
         self.assertEqual(self.attendee.get_participant_status(), 0)
 
     def test_005_participant_status_map_length(self):
-        self.assertEqual(len(self.attendee.participant_status_map), 7)
+        self.assertEqual(len(self.attendee.participant_status_map.keys()), 7)
 
     def test_006_participant_status_map_forward_lookup(self):
         # Forward lookups
@@ -48,19 +47,19 @@
 
     def test_007_participant_status_map_reverse_lookup(self):
         # Reverse lookups
-        self.assertEqual(k for k, v in self.attendee.participant_status_map.items() if v == 00, "NEEDS-ACTION")
-        self.assertEqual(k for k, v in self.attendee.participant_status_map.items() if v == 10, "ACCEPTED")
-        self.assertEqual(k for k, v in self.attendee.participant_status_map.items() if v == 20, "DECLINED")
-        self.assertEqual(k for k, v in self.attendee.participant_status_map.items() if v == 30, "TENTATIVE")
-        self.assertEqual(k for k, v in self.attendee.participant_status_map.items() if v == 40, "DELEGATED")
-        self.assertEqual(k for k, v in self.attendee.participant_status_map.items() if v == 50, "IN-PROCESS")
-        self.assertEqual(k for k, v in self.attendee.participant_status_map.items() if v == 60, "COMPLETED")
+        self.assertEqual(k for k, v in self.attendee.participant_status_map.iteritems() if v == 00, "NEEDS-ACTION")
+        self.assertEqual(k for k, v in self.attendee.participant_status_map.iteritems() if v == 10, "ACCEPTED")
+        self.assertEqual(k for k, v in self.attendee.participant_status_map.iteritems() if v == 20, "DECLINED")
+        self.assertEqual(k for k, v in self.attendee.participant_status_map.iteritems() if v == 30, "TENTATIVE")
+        self.assertEqual(k for k, v in self.attendee.participant_status_map.iteritems() if v == 40, "DELEGATED")
+        self.assertEqual(k for k, v in self.attendee.participant_status_map.iteritems() if v == 50, "IN-PROCESS")
+        self.assertEqual(k for k, v in self.attendee.participant_status_map.iteritems() if v == 60, "COMPLETED")
 
     def test_008_default_rsvp(self):
         self.assertEqual(self.attendee.get_rsvp(), 0)
 
     def test_009_rsvp_map_length(self):
-        self.assertEqual(len(self.attendee.rsvp_map), 2)
+        self.assertEqual(len(self.attendee.rsvp_map.keys()), 2)
 
     def test_010_rsvp_map_forward_lookup_boolean(self):
         self.assertEqual(self.attendee.rsvp_map"TRUE", True)
@@ -71,18 +70,18 @@
         self.assertEqual(self.attendee.rsvp_map"FALSE", 0)
 
     def test_012_rsvp_map_reverse_lookup_boolean(self):
-        self.assertEqual(k for k, v in self.attendee.rsvp_map.items() if v is True0, "TRUE")
-        self.assertEqual(k for k, v in self.attendee.rsvp_map.items() if v is False0, "FALSE")
+        self.assertEqual(k for k, v in self.attendee.rsvp_map.iteritems() if v is True0, "TRUE")
+        self.assertEqual(k for k, v in self.attendee.rsvp_map.iteritems() if v is False0, "FALSE")
 
     def test_013_rsvp_map_reverse_lookup_integer(self):
-        self.assertEqual(k for k, v in self.attendee.rsvp_map.items() if v == 10, "TRUE")
-        self.assertEqual(k for k, v in self.attendee.rsvp_map.items() if v == 00, "FALSE")
+        self.assertEqual(k for k, v in self.attendee.rsvp_map.iteritems() if v == 10, "TRUE")
+        self.assertEqual(k for k, v in self.attendee.rsvp_map.iteritems() if v == 00, "FALSE")
 
     def test_014_default_role(self):
         self.assertEqual(self.attendee.get_role(), 0)
 
     def test_015_role_map_length(self):
-        self.assertEqual(len(self.attendee.role_map), 4)
+        self.assertEqual(len(self.attendee.role_map.keys()), 4)
 
     def test_016_role_map_forward_lookup(self):
         self.assertEqual(self.attendee.role_map"REQ-PARTICIPANT", 0)
@@ -91,27 +90,23 @@
         self.assertEqual(self.attendee.role_map"NON-PARTICIPANT", 3)
 
     def test_017_role_map_reverse_lookup(self):
-        self.assertEqual(k for k, v in self.attendee.role_map.items() if v == 00, "REQ-PARTICIPANT")
-        self.assertEqual(k for k, v in self.attendee.role_map.items() if v == 10, "CHAIR")
-        self.assertEqual(k for k, v in self.attendee.role_map.items() if v == 20, "OPT-PARTICIPANT")
-        self.assertEqual(k for k, v in self.attendee.role_map.items() if v == 30, "NON-PARTICIPANT")
+        self.assertEqual(k for k, v in self.attendee.role_map.iteritems() if v == 00, "REQ-PARTICIPANT")
+        self.assertEqual(k for k, v in self.attendee.role_map.iteritems() if v == 10, "CHAIR")
+        self.assertEqual(k for k, v in self.attendee.role_map.iteritems() if v == 20, "OPT-PARTICIPANT")
+        self.assertEqual(k for k, v in self.attendee.role_map.iteritems() if v == 30, "NON-PARTICIPANT")
 
     def test_015_cutype_map_length(self):
-        self.assertEqual(len(self.attendee.cutype_map), 5)
+        self.assertEqual(len(self.attendee.cutype_map.keys()), 3)
 
     def test_016_cutype_map_forward_lookup(self):
-        self.assertEqual(self.attendee.cutype_map"GROUP", kolabformat.CutypeGroup)
-        self.assertEqual(self.attendee.cutype_map"INDIVIDUAL", kolabformat.CutypeIndividual)
-        self.assertEqual(self.attendee.cutype_map"RESOURCE", kolabformat.CutypeResource)
-        self.assertEqual(self.attendee.cutype_map"ROOM", kolabformat.CutypeRoom)
-        self.assertEqual(self.attendee.cutype_map"UNKNOWN", kolabformat.CutypeUnknown)
+        self.assertEqual(self.attendee.cutype_map"GROUP", 1)
+        self.assertEqual(self.attendee.cutype_map"INDIVIDUAL", 2)
+        self.assertEqual(self.attendee.cutype_map"RESOURCE", 3)
 
     def test_017_cutype_map_reverse_lookup(self):
-        self.assertEqual(k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeGroup0, "GROUP")
-        self.assertEqual(k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeIndividual0, "INDIVIDUAL")
-        self.assertEqual(k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeResource0, "RESOURCE")
-        self.assertEqual(k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeRoom0, "ROOM")
-        self.assertEqual(k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeUnknown0, "UNKNOWN")
+        self.assertEqual(k for k, v in self.attendee.cutype_map.iteritems() if v == 10, "GROUP")
+        self.assertEqual(k for k, v in self.attendee.cutype_map.iteritems() if v == 20, "INDIVIDUAL")
+        self.assertEqual(k for k, v in self.attendee.cutype_map.iteritems() if v == 30, "RESOURCE")
 
     def test_018_partstat_label(self):
         self.assertEqual(participant_status_label('NEEDS-ACTION'), "Needs Action")
@@ -138,8 +133,5 @@
         self.assertEqual(data'email', 'jane@doe.org')
         self.assertTrue(data'rsvp')
 
-    def test_030_to_cutype_exception(self):
-        self.assertRaises(InvalidAttendeeCutypeError, self.attendee.set_cutype, "DUMMY")
-
 if __name__ == '__main__':
     unittest.main()

pykolab-0.8.23.tar.gz/tests/unit/test-003-event.py -> pykolab-0.8.4.tar.gz/tests/unit/test-003-event.py Changed

@@ -41,7 +41,7 @@
 CLASS:PUBLIC
 ATTENDEE;CN="Manager, Jane";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYP
  E=INDIVIDUAL;RSVP=TRUE:mailto:jane.manager@example.org
-ATTENDEE;CUTYPE=ROOM;PARTSTAT=NEEDS-ACTION;ROLE=OPT-PARTICIPANT;RSVP=FA
+ATTENDEE;CUTYPE=RESOURCE;PARTSTAT=NEEDS-ACTION;ROLE=OPT-PARTICIPANT;RSVP=FA
  LSE:MAILTO:max@imum.com
 ORGANIZER;CN=Doe\, John:mailto:john.doe@example.org
 URL:http://somelink.com/foo
@@ -460,7 +460,7 @@
         self.assertIsInstance(_tz.tzinfo, datetime.tzinfo)
 
     def test_016_start_with_timezone(self):
-        _start = datetime.datetime(2012, 5, 23, 11, 58, 00, tzinfo=pytz.timezone("Europe/Zurich"))
+        _start = datetime.datetime(2012, 05, 23, 11, 58, 00, tzinfo=pytz.timezone("Europe/Zurich"))
         _start_utc = _start.astimezone(pytz.utc)
         # self.assertEqual(_start.__str__(), "2012-05-23 11:58:00+01:00")
         # self.assertEqual(_start_utc.__str__(), "2012-05-23 10:58:00+00:00")
@@ -469,7 +469,7 @@
         self.assertEqual(_start.tzinfo, pytz.timezone("Europe/Zurich"))
 
     def test_017_allday_without_timezone(self):
-        _start = datetime.date(2012, 5, 23)
+        _start = datetime.date(2012, 05, 23)
         self.assertEqual(_start.__str__(), "2012-05-23")
         self.event.set_start(_start)
         self.assertEqual(hasattr(_start, 'tzinfo'), False)
@@ -495,7 +495,7 @@
         self.assertEqual(event.get_categories(), "Personal")
         self.assertEqual(event.get_priority(), '2')
         self.assertEqual(event.get_classification(), kolabformat.ClassPublic)
-        self.assertEqual(event.get_attendee_by_email("max@imum.com").get_cutype(), kolabformat.CutypeRoom)
+        self.assertEqual(event.get_attendee_by_email("max@imum.com").get_cutype(), kolabformat.CutypeResource)
         self.assertEqual(event.get_sequence(), 2)
         self.assertTrue(event.is_recurring())
         self.assertIsInstance(event.get_duration(), datetime.timedelta)
@@ -553,12 +553,12 @@
 
     def test_019_as_string_itip(self):
         self.event.set_summary("test")
-        self.event.set_start(datetime.datetime(2014, 5, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London")))
-        self.event.set_end(datetime.datetime(2014, 5, 23, 12, 30, 00, tzinfo=pytz.timezone("Europe/London")))
+        self.event.set_start(datetime.datetime(2014, 05, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London")))
+        self.event.set_end(datetime.datetime(2014, 05, 23, 12, 30, 00, tzinfo=pytz.timezone("Europe/London")))
         self.event.set_sequence(3)
         self.event.set_classification('CONFIDENTIAL')
         self.event.add_custom_property('X-Custom', 'check')
-        self.event.set_recurrence_id(datetime.datetime(2014, 5, 23, 11, 0, 0), True)
+        self.event.set_recurrence_id(datetime.datetime(2014, 05, 23, 11, 0, 0), True)
 
         rrule = RecurrenceRule()
         rrule.set_frequency(kolabformat.RecurrenceRule.Weekly)
@@ -592,8 +592,8 @@
     def test_019_to_message_itip(self):
         self.event = Event()
         self.event.set_summary("test")
-        self.event.set_start(datetime.datetime(2014, 5, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London")))
-        self.event.set_end(datetime.datetime(2014, 5, 23, 12, 30, 00, tzinfo=pytz.timezone("Europe/London")))
+        self.event.set_start(datetime.datetime(2014, 05, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London")))
+        self.event.set_end(datetime.datetime(2014, 05, 23, 12, 30, 00, tzinfo=pytz.timezone("Europe/London")))
         self.event.set_organizer("me@kolab.org")
         self.event.add_attendee("john@doe.org")
         self.event.add_attendee("jane@doe.org")
@@ -742,17 +742,17 @@
 
     def test_021_ical_exceptions(self):
         self.event.set_summary("test")
-        self.event.set_start(datetime.datetime(2014, 5, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London")))
-        self.event.set_end(datetime.datetime(2014, 5, 23, 12, 30, 00, tzinfo=pytz.timezone("Europe/London")))
+        self.event.set_start(datetime.datetime(2014, 05, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London")))
+        self.event.set_end(datetime.datetime(2014, 05, 23, 12, 30, 00, tzinfo=pytz.timezone("Europe/London")))
 
         rrule = kolabformat.RecurrenceRule()
         rrule.setFrequency(kolabformat.RecurrenceRule.Weekly)
         self.event.set_recurrence(rrule)
 
         xmlexception = Event(from_string=str(self.event))
-        xmlexception.set_start(datetime.datetime(2014, 5, 30, 14, 00, 00, tzinfo=pytz.timezone("Europe/London")))
-        xmlexception.set_end(datetime.datetime(2014, 5, 30, 16, 00, 00, tzinfo=pytz.timezone("Europe/London")))
-        xmlexception.set_recurrence_id(datetime.datetime(2014, 5, 30, 11, 0, 0), False)
+        xmlexception.set_start(datetime.datetime(2014, 05, 30, 14, 00, 00, tzinfo=pytz.timezone("Europe/London")))
+        xmlexception.set_end(datetime.datetime(2014, 05, 30, 16, 00, 00, tzinfo=pytz.timezone("Europe/London")))
+        xmlexception.set_recurrence_id(datetime.datetime(2014, 05, 30, 11, 0, 0), False)
         self.event.add_exception(xmlexception)
 
         ical = icalendar.Calendar.from_ical(self.event.as_string_itip())
@@ -889,7 +889,7 @@
 
         self.assertIsInstance(data, dict)
         self.assertIsInstance(data'start', datetime.datetime)
-        self.assertIsInstance(data'end', datetime.datetime)
+        # self.assertIsInstance(data'end', datetime.datetime)
         self.assertIsInstance(data'created', datetime.datetime)
         self.assertIsInstance(data'lastmodified-date', datetime.datetime)
         self.assertEqual(data'uid', '75c740bb-b3c6-442c-8021-ecbaeb0a025e')
@@ -936,7 +936,7 @@
         e2.set_lastmodified()
 
         diff = compute_diff(e1.to_dict(), e2.to_dict(), True)
-        self.assertEqual(len(diff), 5, "Diff: (length: %d):\r\n%r\r\n%r" % (len(diff), diff, e2.__str__()))
+        self.assertEqual(len(diff), 4, "Diff: (length: %d):\r\n%r\r\n%r" % (len(diff), diff, e2.__str__()))
 
         ps = self._find_prop_in_list(diff, 'summary')
         self.assertIsInstance(ps, OrderedDict)
@@ -1005,24 +1005,6 @@
 
         self.assertEqual(rdates, "20140530T110000", "20140620T110000", "20140815T100000")
 
-    def test_029_dummy_datetime(self):
-        ical = """
-BEGIN:VEVENT
-UID:8515D49BA15EFF7DB34F080877BE11F5-D1F2672D6F04F316
-DTSTAMP:00000000T000000
-DTSTART:20190514T060000
-DTEND:20190514T073000
-SUMMARY:Summary
-SEQUENCE:1
-CREATED:00000000T000000
-LAST-MODIFIED:00000000T000000
-ORGANIZER:MAILTO:tests@test.com
-END:VEVENT
-"""
-        event = event_from_ical(ical)
-        self.assertEqual(str(event.get_lastmodified()), "1970-01-01 00:00:00+00:00")
-
-
     def _find_prop_in_list(self, diff, name):
         for prop in diff:
             if prop'property' == name:

pykolab-0.8.23.tar.gz/tests/unit/test-008-sievelib.py -> pykolab-0.8.4.tar.gz/tests/unit/test-008-sievelib.py Changed

pykolab-0.8.23.tar.gz/tests/unit/test-009-parse_ldap_uri.py -> pykolab-0.8.4.tar.gz/tests/unit/test-009-parse_ldap_uri.py Changed

pykolab-0.8.23.tar.gz/tests/unit/test-011-itip.py -> pykolab-0.8.4.tar.gz/tests/unit/test-011-itip.py Changed

pykolab-0.8.23.tar.gz/tests/unit/test-011-wallace_resources.py -> pykolab-0.8.4.tar.gz/tests/unit/test-011-wallace_resources.py Changed

@@ -3,7 +3,6 @@
 import datetime
 
 from pykolab import itip
-from pykolab.imap import IMAP
 from icalendar import Calendar
 from email import message
 from email import message_from_string
@@ -42,7 +41,7 @@
 METHOD:REQUEST
 BEGIN:VEVENT
 UID:626421779C777FBE9C9B85A80D04DDFA-A4BF5BBB9FEAA271
-DTSTAMP:20120713T125414
+DTSTAMP:20120713T1254140
 DTSTART;TZID=3DEurope/London:20120713T100000
 DTEND;TZID=3DEurope/London:20120713T110000
 SUMMARY:test
@@ -76,7 +75,7 @@
 METHOD:REQUEST
 BEGIN:VEVENT
 UID:626421779C777FBE9C9B85A80D04DDFA-A4BF5BBB9FEAA271
-DTSTAMP:20120713T125414
+DTSTAMP:20120713T1254140
 DTSTART;TZID=3DEurope/London:20120713T100000
 DTEND;TZID=3DEurope/London:20120713T110000
 SUMMARY:test
@@ -106,23 +105,15 @@
 self.patch(pykolab.auth.Auth, "get_entry_attributes", self._mock_get_entry_attributes)
 self.patch(pykolab.auth.Auth, "search_entry_by_attribute", self._mock_search_entry_by_attribute)
 
- # Mock IMAP operations
- self.patch(pykolab.imap.IMAP, "connect", self._mock_nop)
- self.patch(pykolab.imap.IMAP, "disconnect", self._mock_nop)
- self.patch(pykolab.imap.IMAP, "set_acl", self._mock_nop)
- self.patch(pykolab.imap.IMAP, "append", self._mock_imap_append)
-
 # intercept calls to smtplib.SMTP.sendmail()
 import smtplib
 self.patch(smtplib.SMTP, "__init__", self._mock_smtp_init)
 self.patch(smtplib.SMTP, "quit", self._mock_nop)
- self.patch(smtplib.SMTP, "connect", self._mock_smtp_init)
 self.patch(smtplib.SMTP, "sendmail", self._mock_smtp_sendmail)
 
 self.smtplog = 
- self.imap_append_log = 
 
- def _mock_nop(self, domain=None, arg3=None, arg4=None):
+ def _mock_nop(self, domain=None):
 pass
 
 def _mock_find_resource(self, address):
@@ -148,11 +139,6 @@
 
 def _mock_smtp_sendmail(self, from_addr, to_addr, message, mail_options=None, rcpt_options=None):
 self.smtplog.append((from_addr, to_addr, message))
- return 
-
- def _mock_imap_append(self, folder, msg):
- self.imap_append_log.append((folder, msg))
- return True
 
 def _get_ics_part(self, message):
 ics_part = None
@@ -246,41 +232,3 @@
 self.assertIn("ACCEPTED".lower(), response2'subject'.lower(), "Delegation message subject: %r" % (response2'subject'))
 self.assertEqual(ical2'attendee'.__str__(), "MAILTO:resource-car-audi-a4@example.org")
 self.assertEqual(ical2'attendee'.params'PARTSTAT', u"ACCEPTED")
-
- def test_007_accept_reservation_request_store_and_notify(self):
- itip_event = itip.events_from_message(message_from_string(itip_multipart))0
-
- resource = {
- 'mail': 'resource-collection-car@example.org',
- 'kolabtargetfolder': 'shared/Resources/Test@example.org',
- 'dn': 'cn=cars,ou=Resources,cd=example,dc=org',
- 'cn': 'Cars',
- 'owner': 'uid=foo,ou=People,cd=example,dc=org',
- 'kolabinvitationpolicy': module_resources.ACT_STORE_AND_NOTIFY
- }
-
- conf.command_set('wallace', 'webmail_url', 'https://%(domain)s/roundcube')
- module_resources.imap = IMAP()
-
- module_resources.accept_reservation_request(itip_event, resource)
-
- # Assert no reply message sent to the organizer
- self.assertEqual(len(self.smtplog), 1)
- self.assertEqual(len(self.imap_append_log), 1)
-
- # Assert the notification sent to the resource owner
- mail = message_from_string(self.smtplog02)
-
- self.assertEqual("resource-collection-car@example.org", self.smtplog00)
- self.assertEqual("resource-collection-car@example.org", mail'from')
- self.assertEqual("foo@example.org", self.smtplog01)
- self.assertEqual("foo@example.org", mail'to')
- self.assertFalse(mail.is_multipart())
- self.assertIn("New booking request for Cars", mail'subject')
- body = mail.get_payload(decode=True)
- self.assertIn("The resource booking request is for Cars by Doe, John <doe@example.org>", body)
- self.assertIn("You can change the status via https://example.org/roundcube?_task=calendar", body)
-
- # Assert the message appended to the resource folder
- self.assertEqual(resource'kolabtargetfolder', self.imap_append_log00)
- self.assertIn("<text>NEEDS-ACTION</text>", self.imap_append_log01)

pykolab-0.8.23.tar.gz/tests/unit/test-012-wallace_invitationpolicy.py -> pykolab-0.8.4.tar.gz/tests/unit/test-012-wallace_invitationpolicy.py Changed

pykolab-0.8.23.tar.gz/tests/unit/test-017-diff.py -> pykolab-0.8.4.tar.gz/tests/unit/test-017-diff.py Changed

@@ -190,19 +190,18 @@
         self.assertEqual(diff0'old', 0)
         self.assertEqual(diff0'new', 1)
 
-        self.assertEqual(diff1'property', 'summary')
-        self.assertEqual(diff1'old', 'Old attachments')
-        self.assertEqual(diff1'new', 'New attachments')
+        self.assertEqual(diff1'property', 'description')
+        self.assertEqual(diff1'old', '')
 
-        self.assertEqual(diff2'property', 'attach')
-        self.assertEqual(diff2'new', None)
-        self.assertEqual(diff2'old''uri', "cid:silhouette.1427297477.7514.png")
+        self.assertEqual(diff2'property', 'summary')
+        self.assertEqual(diff2'old', 'Old attachments')
+        self.assertEqual(diff2'new', 'New attachments')
 
-        self.assertEqual(diff3'property', 'lastmodified-date')
-
-        self.assertEqual(diff4'property', 'description')
-        self.assertEqual(diff4'old', '')
+        self.assertEqual(diff3'property', 'attach')
+        self.assertEqual(diff3'new', None)
+        self.assertEqual(diff3'old''uri', "cid:silhouette.1427297477.7514.png")
 
+        self.assertEqual(diff4'property', 'lastmodified-date')
 
 if __name__ == '__main__':
     unittest.main()

pykolab-0.8.23.tar.gz/ucs/kolab_sieve.py -> pykolab-0.8.4.tar.gz/ucs/kolab_sieve.py Changed

pykolab-0.8.23.tar.gz/ucs/listener.py -> pykolab-0.8.4.tar.gz/ucs/listener.py Changed

pykolab-0.8.23.tar.gz/wallace.py -> pykolab-0.8.4.tar.gz/wallace.py Changed

pykolab-0.8.23.tar.gz/wallace/__init__.py -> pykolab-0.8.4.tar.gz/wallace/__init__.py Changed

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2019 Kolab Systems AG (http://www.kolabsys.com)
+# Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
 #
@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import asyncore
 from distutils import version
 import grp
@@ -26,43 +24,37 @@
 import os
 import pwd
 import traceback
-import smtpd
+from smtpd import SMTPChannel
 import socket
 import struct
 import sys
 import tempfile
-from threading import _Timer
 import time
+import traceback
 
 import pykolab
 from pykolab import utils
-from pykolab.logger import StderrToLogger
-from pykolab.translate import _ as _l
-
-import modules
-from modules import cb_action_ACCEPT
+from pykolab.translate import _
 
-# pylint: disable=invalid-name
 log = pykolab.getLogger('pykolab.wallace')
-sys.stderr = StderrToLogger(log)
 conf = pykolab.getConf()
 
+from modules import cb_action_ACCEPT
 
-def pickup_message(filepath, *args, **kwargs):
+def pickup_message(filepath, *args, **kw):
 wallace_modules = args0
-
- if 'module' in kwargs:
+ if kw.has_key('module'):
 
 # Cause the previous modules to be skipped
- wallace_modules = wallace_modules(wallace_modules.index(kwargs'module') + 1):
+ wallace_modules = wallace_modules(wallace_modules.index(kw'module')+1):
 
- log.debug(_l("Wallace modules: %r") % (wallace_modules), level=8)
+ log.debug(_("Wallace modules: %r") % (wallace_modules), level=8)
 
 # Execute the module
- if 'stage' in kwargs:
- modules.execute(kwargs'module', filepath, stage=kwargs'stage')
+ if kw.has_key('stage'):
+ modules.execute(kw'module', filepath, stage=kw'stage')
 else:
- modules.execute(kwargs'module', filepath)
+ modules.execute(kw'module', filepath)
 
 # After all modules are executed, continue with a call to
 # accept the message and re-inject in to Postfix.
@@ -71,18 +63,11 @@
 for module in wallace_modules:
 try:
 result_filepath = modules.execute(module, filepath)
- except Exception:
- log.error(
- "Module %s.execute() failed on message %r with error: %s" % (
- module,
- filepath,
- traceback.format_exc()
- )
- )
-
+ except:
+ log.error(_("Module %s.execute() failed on message %r with error: %s" % (module, filepath, traceback.format_exc())))
 result_filepath = False
 
- if result_filepath is not None and result_filepath is not False:
+ if not result_filepath == None and not result_filepath == False:
 filepath = result_filepath
 else:
 # A module has returned False or None
@@ -94,170 +79,117 @@
 if continue_with_accept:
 cb_action_ACCEPT('wallace', filepath)
 
-
 def modules_heartbeat(wallace_modules):
 lastrun = 0
 
- while not multiprocessing.current_process().finished.is_set():
+ while True:
 try:
 for module in wallace_modules:
 try:
 modules.heartbeat(module, lastrun)
- except Exception:
- log.error(
- "Module %s.heartbeat() failed with error: %s" % (
- module,
- traceback.format_exc()
- )
- )
+ except:
+ log.error(_("Module %s.heartbeat() failed with error: %s" % (module, traceback.format_exc())))
 
 lastrun = int(time.time())
- multiprocessing.current_process().finished.wait(60)
-
- except (SystemExit, KeyboardInterrupt) as errmsg:
- log.warning("Exiting %s, %s" % (multiprocessing.current_process().name, errmsg))
- break
-
-
-def worker_process(*args, **kwargs):
- import signal
- signal.signal(signal.SIGINT, signal.SIG_IGN)
- log.debug("Worker process %s initializing" % (multiprocessing.current_process().name), level=1)
-
-
-# pylint: disable=too-few-public-methods
-class Timer(_Timer):
- def run(self):
- while True:
- while not self.finished.is_set():
- self.finished.wait(self.interval)
- log.debug(_l("Timer looping function '%s' every %ss") % (
- self.function.__name__,
- self.interval
- ), level=8)
- self.function(*self.args, **self.kwargs)
-
- self.finished.set()
- log.debug(
- _l("Timer loop %s") % ('still active', 'finished')self.finished.is_set(),
- level=8
- )
-
+ time.sleep(60)
+ except (SystemExit, KeyboardInterrupt), e:
+ log.info("Terminating heartbeat process")
 break
 
+def worker_process(*args, **kw):
+ log.debug(_("Worker process %s initializing") % (multiprocessing.current_process().name), level=1)
 
-class WallaceDaemon:
- heartbeat = None
- timer = None
-
+class WallaceDaemon(object):
 def __init__(self):
 self.current_connections = 0
 self.max_connections = 24
- self.parent_pid = None
 self.pool = None
 
- daemon_group = conf.add_cli_parser_option_group(_l("Daemon Options"))
+ daemon_group = conf.add_cli_parser_option_group(_("Daemon Options"))
 
 daemon_group.add_option(
- "--fork",
- dest="fork_mode",
- action="store_true",
- default=False,
- help=_l("Fork to the background.")
- )
-
- daemon_group.add_option(
- "-b", "--bind",
- dest="wallace_bind_address",
- action="store",
- default="localhost",
- help=_l("Bind address for Wallace.")
- )
+ "--fork",
+ dest = "fork_mode",
+ action = "store_true",
+ default = False,
+ help = _("Fork to the background.")
+ )
 
 daemon_group.add_option(
- "-g", "--group",
- dest="process_groupname",
- action="store",
- default="kolab",
- help=_l("Run as group GROUPNAME"),
- metavar="GROUPNAME"
- )
+ "-b", "--bind",
+ dest = "wallace_bind_address",
+ action = "store",
+ default = "localhost",
+ help = _("Bind address for Wallace.")
+ )
 
 daemon_group.add_option(
- "--threads",
- dest="max_threads",
- action="store",
- default=4,
- type=int,
- help=_l("Number of threads to use.")
- )
+ "-g",
+ "--group",
+ dest = "process_groupname",
+ action = "store",
+ default = "kolab",
+ help = _("Run as group GROUPNAME"),
+ metavar = "GROUPNAME"
+ )
 
 daemon_group.add_option(
- "--max-tasks",
- dest="max_tasks",
- action="store",
- default=None,
- type=int,
- help=_l("Number of tasks per process.")
- )
+ "--threads",
+ dest = "max_threads",
+ action = "store",
+ default = 4,
+ type = int,
+ help = _("Number of threads to use.")
+ )
 
 daemon_group.add_option(
- "-p", "--pid-file",
- dest="pidfile",
- action="store",
- default="/var/run/wallaced/wallaced.pid",
- help=_l("Path to the PID file to use.")
- )
+ "-p", "--pid-file",
+ dest = "pidfile",
+ action = "store",
+ default = "/var/run/wallaced/wallaced.pid",
+ help = _("Path to the PID file to use.")
+ )
 
 daemon_group.add_option(
- "--port",
- dest="wallace_port",
- action="store",
- default=10026,
- type=int,
- help=_l("Port that Wallace is supposed to use.")
- )
+ "--port",
+ dest = "wallace_port",
+ action = "store",
+ default = 10026,
+ type = int,
+ help = _("Port that Wallace is supposed to use.")
+ )
 
 daemon_group.add_option(
- "-u", "--user",
- dest="process_username",
- action="store",
- default="kolab",
- help=_l("Run as user USERNAME"),
- metavar="USERNAME"
- )
+ "-u",
+ "--user",
+ dest = "process_username",
+ action = "store",
+ default = "kolab",
+ help = _("Run as user USERNAME"),
+ metavar = "USERNAME"
+ )
 
 conf.finalize_conf()
 
 utils.ensure_directory(
- os.path.dirname(conf.pidfile),
- conf.process_username,
- conf.process_groupname
- )
-
- if conf.debuglevel >= 9:
- mp_logger = multiprocessing.get_logger()
- mp_logger.setLevel(multiprocessing.SUBDEBUG)
- mp_logger.debug('Python multi-processing logger started')
+ os.path.dirname(conf.pidfile),
+ conf.process_username,
+ conf.process_groupname
+ )
 
- modules.initialize()
+ import modules
+ modules.__init__()
 
 self.modules = conf.get_list('wallace', 'modules')
- if not self.modules:
+ if self.modules == None:
 self.modules = 
 
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-statements
 def do_wallace(self):
- self.parent_pid = os.getpid()
-
 if version.StrictVersion(sys.version:3) >= version.StrictVersion("2.7"):
- self.pool = multiprocessing.Pool(conf.max_threads, worker_process, (), conf.max_tasks)
+ self.pool = multiprocessing.Pool(conf.max_threads, worker_process, (), 1)
 else:
 self.pool = multiprocessing.Pool(conf.max_threads, worker_process, ())
 
- self.pickup_spool_messages(sync=True)
-
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 
@@ -271,24 +203,21 @@
 
 s.bind((conf.wallace_bind_address, conf.wallace_port))
 bound = True
-
- # pylint: disable=broad-except
- except Exception:
+ except Exception, e:
 log.warning(
- _l("Could not bind to socket on port %d on bind address %s") % (
- conf.wallace_port,
- conf.wallace_bind_address
+ _("Could not bind to socket on port %d on bind " + \
+ "address %s") % (
+ conf.wallace_port,
+ conf.wallace_bind_address
+ )
 )
- )
 
 while not shutdown:
 try:
 s.shutdown(socket.SHUT_RDWR)
 shutdown = True
-
- # pylint: disable=broad-except
- except Exception:
- log.warning(_l("Could not shut down socket"))
+ except Exception, e:
+ log.warning(_("Could not shut down socket"))
 time.sleep(1)
 
 s.close()
@@ -297,174 +226,85 @@
 
 s.listen(5)
 
- self.timer = Timer(180, self.pickup_spool_messages, args=, kwargs={'sync': True})
-
- # pylint: disable=attribute-defined-outside-init
- self.timer.daemon = True
+ # Mind you to include the trailing slash
+ pickup_path = '/var/spool/pykolab/wallace/'
+ for root, directory, files in os.walk(pickup_path):
+ for filename in files:
+ filepath = os.path.join(root, filename)
+
+ if not root == pickup_path:
+ module = os.path.dirname(root).replace(pickup_path, '')
+
+ # Compare uppercase status (specifically, DEFER) with
+ # lowercase (plugin names).
+ #
+ # The messages in DEFER are supposed to be picked up by
+ # another thread, whereas the messages in other directories
+ # are pending being handled by their respective plugins.
+ #
+ # TODO: Handle messages in spool directories for which a
+ # plugin had been enabled, but is not enabled any longer.
+ #
+
+ if module.lower() == "defer":
+ # Wallace was unable to deliver to re-injection smtpd.
+ # Skip it, another thread is picking up the deferred
+ # messages.
+ continue
+
+ stage = root.replace(pickup_path, '').split('/')
+ if len(stage) < 2:
+ stage = None
+ else:
+ stage = stage1
+
+ if stage.lower() == "hold":
+ continue
+
+ # Do not handle messages in a defer state.
+ if stage.lower() == "defer":
+ continue
 
- self.timer.start()
+ self.current_connections += 1
+ self.pool.apply_async(pickup_message, (filepath, (self.modules), {'module': module, 'stage': stage}))
+ self.current_connections -= 1
 
- # start background process to run periodic jobs in active modules
- try:
- self.heartbeat = multiprocessing.Process(
- target=modules_heartbeat,
- name='Wallace_Heartbeat',
- args=self.modules
- )
+ continue
 
- self.heartbeat.finished = multiprocessing.Event()
- self.heartbeat.daemon = True
- self.heartbeat.start()
+ self.current_connections += 1
+ self.pool.apply_async(pickup_message, (filepath, (self.modules)))
+ self.current_connections -= 1
 
- except Exception as errmsg:
- log.error("Failed to start heartbeat daemon: %s" % (errmsg))
- finally:
- log.debug(
- "Wallace heartbeat is %s" % ('not alive', 'alive')self.heartbeat.is_alive(),
- level=8
- )
+ # start background process to run periodic jobs in active modules
+ self.heartbeat = multiprocessing.Process(target=modules_heartbeat, args=self.modules)
+ self.heartbeat.daemon = True
+ self.heartbeat.start()
 
 try:
 while 1:
 while self.current_connections >= self.max_connections:
- log.debug(
- _l("Reached limit of max connections of: %s. Sleeping for 0.5s") % (
- self.max_connections
- ),
- level=6
- )
-
 time.sleep(0.5)
 
 pair = s.accept()
- log.debug(
- _l("Accepted connection %r with address %r") % (
- pair if pair is not None else (None, None)
- ),
- level=8
- )
-
- if pair is not None:
+ log.info(_("Accepted connection"))
+ if not pair == None:
 self.current_connections += 1
 connection, address = pair
-
- _smtpd = smtpd
- # Set DEBUGSTREAM of smtpd to log to pykolab logger
- if conf.debuglevel > 8:
- _smtpd.DEBUGSTREAM = pykolab.logger.StderrToLogger(log)
-
- log.debug(_l("Creating SMTPChannel for accepted message"), level=8)
- _smtpd.SMTPChannel(self, connection, address)
+ channel = SMTPChannel(self, connection, address)
 asyncore.loop()
- else:
- log.error(_l("Socket accepted, but (conn, address) tuple is None."))
 
- # pylint: disable=broad-except
- except Exception:
+ except Exception, errmsg:
 traceback.print_exc()
 s.shutdown(1)
 s.close()
 
 # shut down hearbeat process
 self.heartbeat.terminate()
- self.timer.cancel()
- self.timer.join()
 
- # pylint: disable=no-self-use
 def data_header(self, mailfrom, rcpttos):
 COMMASPACE = ', '
-
 return "X-Kolab-From: " + mailfrom + "\r\n" + \
- "X-Kolab-To: " + COMMASPACE.join(rcpttos) + "\r\n"
-
- def pickup_spool_messages(self, sync=False):
- # Mind you to include the trailing slash
- pickup_path = '/var/spool/pykolab/wallace/'
-
- messages = 
- for root, _, files in os.walk(pickup_path):
- for filename in files:
- messages.append((root, filename))
-
- for root, filename in messages:
- filepath = os.path.join(root, filename)
-
- try:
- # ignore calls on too young files
- if os.stat(filepath).st_mtime + 150 > time.time():
- log.debug("File not more than 150s old. Skipping %s" % (filepath), level=8)
- continue
-
- # ignore calls on lock files
- if '/locks/' in filepath:
- log.debug("File is in locks directory. Skipping %s" % (filepath), level=8)
- continue
-
- # pylint: disable=broad-except
- except Exception as errmsg:
- log.error("Error: %s. Skipping %s" % (errmsg, filepath))
- continue
-
- if not root == pickup_path:
- module = os.path.dirname(root).replace(pickup_path, '')
-
- # Compare uppercase status (specifically, DEFER) with
- # lowercase (plugin names).
- #
- # The messages in DEFER are supposed to be picked up by
- # another thread, whereas the messages in other directories
- # are pending being handled by their respective plugins.
- #
- # TODO: Handle messages in spool directories for which a
- # plugin had been enabled, but is not enabled any longer.
- #
-
- if module.lower() == "defer":
- # Wallace was unable to deliver to re-injection smtpd.
- # Skip it, another thread is picking up the deferred
- # messages.
- continue
-
- stage = root.replace(pickup_path, '').split('/')
-
- if len(stage) < 2:
- stage = None
- else:
- stage = stage1
-
- if stage.lower() == "hold":
- continue
-
- # Do not handle messages in a defer state.
- if stage.lower() == "defer":
- continue
-
- self.current_connections += 1
-
- if sync:
- pickup_message(filepath, self.modules, module=module, stage=stage)
- else:
- self.pool.apply_async(
- pickup_message,
- (
- filepath,
- (self.modules),
- {'module': module, 'stage': stage}
- )
- )
-
- self.current_connections -= 1
-
- continue
-
- self.current_connections += 1
-
- if sync:
- pickup_message(filepath, self.modules)
- else:
- self.pool.apply_async(pickup_message, (filepath, (self.modules)))
-
- self.current_connections -= 1
+ "X-Kolab-To: " + COMMASPACE.join(rcpttos) + "\r\n"
 
 def process_message(self, peer, mailfrom, rcpttos, data):
 """
@@ -479,67 +319,30 @@
 # @TODO: and add line separator (\n or \r\n?)
 # we should make sure there's only one line separator between
 # kolab headers and the original message (data)
- os.write(fp, header)
+ os.write(fp, header);
 os.write(fp, data)
 os.close(fp)
 
- log.debug(_l("Started processing accepted message %s") % filename, level=8)
 self.pool.apply_async(pickup_message, (filename, (self.modules)))
 
 self.current_connections -= 1
 
 return "250 OK Message %s queued" % (filename)
 
- def reload_config(self, *args, **kwargs):
+ def reload_config(self, *args, **kw):
 pass
 
- def remove_pid(self, *args, **kwargs):
- try:
- if os.getpid() == self.parent_pid:
- log.debug("Stopping process %s" % multiprocessing.current_process().name, level=8)
-
- log.debug(_l("Terminating processes pool"), level=8)
- self.pool.close()
-
- if hasattr(self, 'timer'):
- if not self.timer.finished.is_set():
- log.debug("Canceling Wallace Timer", level=8)
- self.timer.finished.set()
- self.timer.cancel()
-
- log.debug(_l("Terminating heartbeat process"), level=8)
- self.heartbeat.finished.set()
- self.heartbeat.terminate()
-
- self.pool.close()
- self.pool.join(5)
- self.timer.join(5)
- self.heartbeat.join(5)
+ def remove_pid(self, *args, **kw):
+ if os.access(conf.pidfile, os.R_OK):
+ os.remove(conf.pidfile)
 
- if os.access(conf.pidfile, os.R_OK):
- log.warning(_l("Removing PID file %s") % conf.pidfile)
- os.remove(conf.pidfile)
+ if self.pool is not None:
+ self.pool.close()
+ self.pool.join()
 
- log.warning("Exiting!")
- sys.exit()
+ raise SystemExit
 
- else:
- sys.exit(0)
-
- except Exception as errmsg:
- log.debug(
- "Exception while trying to stop %s: %s" % (
- multiprocessing.current_process().name, errmsg
- ),
- level=8
- )
-
- sys.exit(1)
-
- sys.exit(0)
-
- # pylint: disable=too-many-locals
- def run(self): # noqa: C901
+ def run(self):
 """
 Run the Wallace daemon.
 """
@@ -548,9 +351,9 @@
 
 try:
 try:
- (ruid, _, _) = os.getresuid()
- (rgid, _, _) = os.getresgid()
- except AttributeError:
+ (ruid, euid, suid) = os.getresuid()
+ (rgid, egid, sgid) = os.getresgid()
+ except AttributeError, errmsg:
 ruid = os.getuid()
 rgid = os.getgid()
 
@@ -559,48 +362,65 @@
 if rgid == 0:
 # Get group entry details
 try:
- (_, _, group_gid, _) = grp.getgrnam(conf.process_groupname)
+ (
+ group_name,
+ group_password,
+ group_gid,
+ group_members
+ ) = grp.getgrnam(conf.process_groupname)
 
 except KeyError:
- print(_l("Group %s does not exist") % (conf.process_groupname))
+ print >> sys.stderr, _("Group %s does not exist") % (
+ conf.process_groupname
+ )
 
 sys.exit(1)
 
 # Set real and effective group if not the same as current.
 if not group_gid == rgid:
 log.debug(
- _l("Switching real and effective group id to %d") % (
- group_gid
- ),
- level=8
- )
+ _("Switching real and effective group id to %d") % (
+ group_gid
+ ),
+ level=8
+ )
 
 os.setregid(group_gid, group_gid)
 
 if ruid == 0:
 # Means we haven't switched yet.
 try:
- (_, _, user_uid, _, _, _, _) = pwd.getpwnam(conf.process_username)
+ (
+ user_name,
+ user_password,
+ user_uid,
+ user_gid,
+ user_gecos,
+ user_homedir,
+ user_shell
+ ) = pwd.getpwnam(conf.process_username)
 
 except KeyError:
- print(_l("User %s does not exist") % (conf.process_username))
+ print >> sys.stderr, _("User %s does not exist") % (
+ conf.process_username
+ )
 
 sys.exit(1)
 
+
 # Set real and effective user if not the same as current.
 if not user_uid == ruid:
 log.debug(
- _l("Switching real and effective user id to %d") % (
- user_uid
- ),
- level=8
- )
+ _("Switching real and effective user id to %d") % (
+ user_uid
+ ),
+ level=8
+ )
 
 os.setreuid(user_uid, user_uid)
 
- # pylint: disable=broad-except
- except Exception:
- log.error(_l("Could not change real and effective uid and/or gid"))
+ except:
+ log.error(_("Could not change real and effective uid and/or gid"))
 
 try:
 pid = os.getpid()
@@ -618,7 +438,7 @@
 # Give up the session, all control,
 # all open file descriptors, see #5151
 os.chdir("/")
- old_umask = os.umask(0)
+ os.umask(0)
 os.setsid()
 
 pid = os.fork()
@@ -633,35 +453,29 @@
 os.close(1)
 os.close(2)
 
- os.open(os.devnull, os.O_RDONLY)
- os.open(os.devnull, os.O_WRONLY)
- os.open(os.devnull, os.O_WRONLY)
-
- os.umask(old_umask)
-
 log.remove_stdout_handler()
 self.set_signal_handlers()
 self.write_pid()
 self.do_wallace()
 
- except SystemExit as errmsg:
- exitcode = errmsg
+ except SystemExit, e:
+ exitcode = e
 except KeyboardInterrupt:
 exitcode = 1
- log.info(_l("Interrupted by user"))
- except AttributeError:
+ log.info(_("Interrupted by user"))
+ except AttributeError, e:
 exitcode = 1
 traceback.print_exc()
- print(_l("Traceback occurred, please report a bug."))
+ print >> sys.stderr, _("Traceback occurred, please report a bug at https://issues.kolab.org")
 
- except TypeError as errmsg:
+ except TypeError, e:
 exitcode = 1
 traceback.print_exc()
- log.error(_l("Type Error: %s") % errmsg)
- except Exception:
+ log.error(_("Type Error: %s") % e)
+ except:
 exitcode = 2
 traceback.print_exc()
- print(_l("Traceback occurred, please report a bug."))
+ print >> sys.stderr, _("Traceback occurred, please report a bug at https://issues.kolab.org")
 
 sys.exit(exitcode)
 
@@ -673,8 +487,8 @@
 def write_pid(self):
 pid = os.getpid()
 if os.access(os.path.dirname(conf.pidfile), os.W_OK):
- fp = open(conf.pidfile, 'w')
+ fp = open(conf.pidfile,'w')
 fp.write("%d\n" % (pid))
 fp.close()
 else:
- print(_l("Could not write pid file %s") % (conf.pidfile))
+ print >> sys.stderr, _("Could not write pid file %s") % (conf.pidfile)

pykolab-0.8.23.tar.gz/wallace/module_footer.py -> pykolab-0.8.4.tar.gz/wallace/module_footer.py Changed

@@ -18,7 +18,6 @@
 #
 
 import os
-import re
 import tempfile
 import time
 
@@ -30,9 +29,7 @@
 
 from pykolab.translate import _
 
-log = pykolab.getLogger('pykolab.wallace/footer')
-extra_log_params = {'qid': '-'}
-log = pykolab.logger.LoggerAdapter(log, extra_log_params)
+log = pykolab.getLogger('pykolab.wallace')
 conf = pykolab.getConf()
 
 mybasepath = '/var/spool/pykolab/wallace/footer/'
@@ -43,29 +40,6 @@
 def description():
 return """Append a footer to messages."""
 
-def append_footer(content, footer, position=None, isHtml=False):
- if (isHtml):
- append = "\n\n" + footer + "\n\n"
- if position == 'top':
- match = re.search('(<body^>*>)', content, re.IGNORECASE | re.DOTALL)
- if match:
- content = content.replace(match.group(0), match.group(0) + append)
- else:
- content = "<html><body>" + append + content + "</body></html>"
- else:
- match = re.search('(</body>)', content, re.IGNORECASE | re.DOTALL)
- if match:
- content = content.replace(match.group(0), append + match.group(0))
- else:
- content = "<html><body>" + content + append + "</body></html>"
- else:
- if position == 'top':
- content = footer + "\n\n" + content
- else:
- content += "\n\n-- \n" + footer
-
- return content
-
 def set_part_content(part, content):
 # Reset old encoding and use quoted-printable (#5414)
 del part'Content-Transfer-Encoding'
@@ -75,13 +49,6 @@
 return True
 
 def execute(*args, **kw):
- global extra_log_params
-
- # TODO: Test for correct call.
- filepath = args0
-
- extra_log_params'qid' = os.path.basename(filepath)
-
 if not os.path.isdir(mybasepath):
 os.makedirs(mybasepath)
 
@@ -89,6 +56,9 @@
 if not os.path.isdir(os.path.join(mybasepath, stage)):
 os.makedirs(os.path.join(mybasepath, stage))
 
+ # TODO: Test for correct call.
+ filepath = args0
+
 if 'stage' in kw:
 log.debug(_("Issuing callback after processing to stage %s") % (kw'stage'), level=8)
 log.debug(_("Testing cb_action_%s()") % (kw'stage'), level=8)
@@ -111,7 +81,6 @@
 
 footer = {}
 
- footer_position = conf.get('wallace', 'footer_position')
 footer_html_file = conf.get('wallace', 'footer_html')
 footer_text_file = conf.get('wallace', 'footer_text')
 
@@ -165,12 +134,16 @@
 
 if content_type == "text/plain":
 content = part.get_payload(decode=True)
- content = append_footer(content, footer'plain', footer_position, False)
+ content += "\n\n-- \n%s" % (footer'plain')
 footer_added = set_part_content(part, content)
 
 elif content_type == "text/html":
 content = part.get_payload(decode=True)
- content = append_footer(content, footer'html', footer_position, True)
+ append = "\n\n" + footer'html'
+ if "</body>" in content:
+ content = content.replace("</body>", append + "</body>")
+ else:
+ content = "<html><body>" + content + append + "</body></html>"
 footer_added = set_part_content(part, content)
 
 if footer_added:

pykolab-0.8.23.tar.gz/wallace/module_gpgencrypt.py -> pykolab-0.8.4.tar.gz/wallace/module_gpgencrypt.py Changed

@@ -40,9 +40,7 @@
 
 from pykolab.translate import _
 
-log = pykolab.getLogger('pykolab.wallace/gpgencrypt')
-extra_log_params = {'qid': '-'}
-log = pykolab.logger.LoggerAdapter(log, extra_log_params)
+log = pykolab.getLogger('pykolab.wallace')
 conf = pykolab.getConf()
 
 mybasepath = '/var/spool/pykolab/wallace/gpgencrypt/'
@@ -88,13 +86,6 @@
     return msg
 
 def execute(*args, **kw):
-    global extra_log_params
-
-    # TODO: Test for correct call.
-    filepath = args0
-
-    extra_log_params'qid' = os.path.basename(filepath)
-
     if not os.path.isdir(mybasepath):
         os.makedirs(mybasepath)
 
@@ -102,7 +93,10 @@
         if not os.path.isdir(os.path.join(mybasepath, stage)):
             os.makedirs(os.path.join(mybasepath, stage))
 
-    if 'stage' in kw:
+    # TODO: Test for correct call.
+    filepath = args0
+
+    if kw.has_key('stage'):
         log.debug(_("Issuing callback after processing to stage %s") % (kw'stage'), level=8)
         log.debug(_("Testing cb_action_%s()") % (kw'stage'), level=8)
         if hasattr(modules, 'cb_action_%s' % (kw'stage')):
@@ -286,7 +280,7 @@
         os.unlink(filepath)
 
         exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','gpgencrypt', new_filepath))
-    except Exception as errmsg:
+    except Exception, errmsg:
         log.error(_("An error occurred: %r") % (errmsg))
         if conf.debuglevel > 8:
             import traceback

pykolab-0.8.23.tar.gz/wallace/module_invitationpolicy.py -> pykolab-0.8.4.tar.gz/wallace/module_invitationpolicy.py Changed

@@ -19,8 +19,6 @@
 
 import datetime
 import os
-import random
-import signal
 import tempfile
 import time
 from urlparse import urlparse
@@ -138,17 +136,14 @@
 'ACT_SAVE_AND_FORWARD': ACT_SAVE_AND_FORWARD + COND_TYPE_EVENT,
 }
 
-policy_value_map = dict((v &~ COND_TYPE_ALL, k) for (k, v) in policy_name_map.items())
+policy_value_map = dict((v &~ COND_TYPE_ALL, k) for (k, v) in policy_name_map.iteritems())
 
 object_type_conditons = {
 'event': COND_TYPE_EVENT,
 'task': COND_TYPE_TASK
 }
 
-log = pykolab.getLogger('pykolab.wallace/invitationpolicy')
-extra_log_params = {'qid': '-'}
-log = pykolab.logger.LoggerAdapter(log, extra_log_params)
-
+log = pykolab.getLogger('pykolab.wallace')
 conf = pykolab.getConf()
 
 mybasepath = '/var/spool/pykolab/wallace/invitationpolicy/'
@@ -187,11 +182,9 @@
 return """Invitation policy execution module."""
 
 def cleanup():
- global auth, imap, write_locks, extra_log_params
-
- log.debug("cleanup(): %r, %r" % (auth, imap), level=8)
+ global auth, imap, write_locks
 
- extra_log_params'qid' = '-'
+ log.debug("cleanup(): %r, %r" % (auth, imap), level=9)
 
 auth.disconnect()
 del auth
@@ -205,11 +198,7 @@
 remove_write_lock(key, False)
 
 def execute(*args, **kw):
- global auth, imap, extra_log_params
-
- filepath = args0
-
- extra_log_params'qid' = os.path.basename(filepath)
+ global auth, imap
 
 # (re)set language to default
 pykolab.translate.setUserLanguage(conf.get('kolab','default_locale'))
@@ -221,18 +210,20 @@
 if not os.path.isdir(os.path.join(mybasepath, stage)):
 os.makedirs(os.path.join(mybasepath, stage))
 
- log.debug(_("Invitation policy called for %r, %r") % (args, kw), level=8)
+ log.debug(_("Invitation policy called for %r, %r") % (args, kw), level=9)
 
 auth = Auth()
 imap = IMAP()
 
+ filepath = args0
+
 # ignore calls on lock files
- if '/locks/' in filepath or 'stage' in kw and kw'stage' == 'locks':
+ if '/locks/' in filepath or kw.has_key('stage') and kw'stage' == 'locks':
 return False
 
 log.debug("Invitation policy executing for %r, %r" % (filepath, '/locks/' in filepath), level=8)
 
- if 'stage' in kw:
+ if kw.has_key('stage'):
 log.debug(_("Issuing callback after processing to stage %s") % (kw'stage'), level=8)
 
 log.debug(_("Testing cb_action_%s()") % (kw'stage'), level=8)
@@ -280,7 +271,7 @@
 # is an iTip message by checking the length of this list.
 try:
 itip_events = objects_from_message(message, 'VEVENT','VTODO', 'REQUEST', 'REPLY', 'CANCEL')
- except Exception as errmsg:
+ except Exception, errmsg:
 log.error(_("Failed to parse iTip objects from message: %r" % (errmsg)))
 itip_events = 
 
@@ -289,10 +280,10 @@
 
 else:
 any_itips = True
- log.debug(_("iTip objects attached to this message contain the following information: %r") % (itip_events), level=8)
+ log.debug(_("iTip objects attached to this message contain the following information: %r") % (itip_events), level=9)
 
 # See if any iTip actually allocates a user.
- if any_itips and len(x'uid' for x in itip_events if 'attendees' in x or 'organizer' in x) > 0:
+ if any_itips and len(x'uid' for x in itip_events if x.has_key('attendees') or x.has_key('organizer')) > 0:
 auth.connect()
 
 # we're looking at the first itip object
@@ -308,13 +299,9 @@
 # extend with addresses from delegators
 # (only do this lookup for REPLY messages)
 receiving_user'_delegated_mailboxes' = 
-
 if itip_event'method' == 'REPLY':
 for _delegator in auth.list_delegators(recipient_user_dn):
- if not _delegator'_mailbox_basename' == None:
- receiving_user'_delegated_mailboxes'.append(
- _delegator'_mailbox_basename'.split('@')0
- )
+ receiving_user'_delegated_mailboxes'.append(_delegator'_mailbox_basename'.split('@')0)
 
 log.debug(_("Recipient emails for %s: %r") % (recipient_user_dn, recipient_emails), level=8)
 break
@@ -328,19 +315,15 @@
 
 # for replies, the organizer is the recipient
 if itip_event'method' == 'REPLY':
- # Outlook can send iTip replies without an organizer property
- if 'organizer' in itip_event:
- organizer_mailto = str(itip_event'organizer').split(':')-1
- user_attendees = organizer_mailto if organizer_mailto in recipient_emails else 
- else:
- user_attendees = recipient_email
+ organizer_mailto = str(itip_event'organizer').split(':')-1
+ user_attendees = organizer_mailto if organizer_mailto in recipient_emails else 
 
 else:
 # Limit the attendees to the one that is actually invited with the current message.
- attendees = str(a).split(':')-1 for a in (itip_event'attendees' if 'attendees' in itip_event else )
+ attendees = str(a).split(':')-1 for a in (itip_event'attendees' if itip_event.has_key('attendees') else )
 user_attendees = a for a in attendees if a in recipient_emails
 
- if 'organizer' in itip_event:
+ if itip_event.has_key('organizer'):
 sender_email = itip_event'xml'.get_organizer().email()
 
 # abort if no attendee matches the envelope recipient
@@ -354,7 +337,7 @@
 recipient_email = user_attendees0
 
 # change gettext language to the preferredlanguage setting of the receiving user
- if 'preferredlanguage' in receiving_user:
+ if receiving_user.has_key('preferredlanguage'):
 pykolab.translate.setUserLanguage(receiving_user'preferredlanguage')
 
 # find user's kolabInvitationPolicy settings and the matching policy values
@@ -369,7 +352,7 @@
 }
 
 done = None
- if itip_event'method' in method_processing_map:
+ if method_processing_map.has_key(itip_event'method'):
 processor_func = method_processing_mapitip_event'method'
 
 # connect as cyrus-admin
@@ -412,8 +395,8 @@
 
 try:
 receiving_attendee = itip_event'xml'.get_attendee_by_email(recipient_email)
- log.debug(_("Receiving attendee: %r") % (receiving_attendee.to_dict()), level=8)
- except Exception as errmsg:
+ log.debug(_("Receiving Attendee: %r") % (receiving_attendee), level=9)
+ except Exception, errmsg:
 log.error("Could not find envelope attendee: %r" % (errmsg))
 return MESSAGE_FORWARD
 
@@ -432,8 +415,8 @@
 
 # compare sequence number to determine a (re-)scheduling request
 if existing is not None:
+ log.debug(_("Existing %s: %r") % (existing.type, existing), level=9)
 scheduling_required = itip_event'sequence' > 0 and itip_event'sequence' > existing.get_sequence()
- log.debug(_("Scheduling required: %r, for existing %s: %s") % (scheduling_required, existing.type, existing.get_uid()), level=8)
 save_object = True
 
 # if scheduling: check availability (skip that for tasks)
@@ -486,7 +469,7 @@
 # if RSVP, send an iTip REPLY
 if rsvp or scheduling_required:
 # set attendee's CN from LDAP record if yet missing
- if not receiving_attendee.get_name() and 'cn' in receiving_user:
+ if not receiving_attendee.get_name() and receiving_user.has_key('cn'):
 receiving_attendee.set_name(receiving_user'cn')
 
 # send iTip reply
@@ -541,8 +524,8 @@
 if policy & ACT_UPDATE:
 try:
 sender_attendee = itip_event'xml'.get_attendee_by_email(sender_email)
- log.debug(_("Sender Attendee: %r") % (sender_attendee), level=8)
- except Exception as errmsg:
+ log.debug(_("Sender Attendee: %r") % (sender_attendee), level=9)
+ except Exception, errmsg:
 log.error("Could not find envelope sender attendee: %r" % (errmsg))
 return MESSAGE_FORWARD
 
@@ -565,7 +548,7 @@
 existing.set_attendee_participant_status(sender_email, sender_attendee.get_participant_status(), rsvp=False)
 existing_attendee = existing.get_attendee(sender_email)
 updated_attendees.append(existing_attendee)
- except Exception as errmsg:
+ except Exception, errmsg:
 log.error("Could not find corresponding attende in organizer's copy: %r" % (errmsg))
 
 # append delegated-from attendee ?
@@ -586,19 +569,19 @@
 
 if not existing_delegatee:
 existing.add_attendee(sender_delegatee)
- log.debug(_("Add delegatee: %r") % (sender_delegatee.to_dict()), level=8)
+ log.debug(_("Add delegatee: %r") % (sender_delegatee.to_dict()), level=9)
 else:
 existing_delegatee.copy_from(sender_delegatee)
- log.debug(_("Update existing delegatee: %r") % (existing_delegatee.to_dict()), level=8)
+ log.debug(_("Update existing delegatee: %r") % (existing_delegatee.to_dict()), level=9)
 
 updated_attendees.append(sender_delegatee)
 
 # copy all parameters from replying attendee (e.g. delegated-to, role, etc.)
 existing_attendee.copy_from(sender_attendee)
 existing.update_attendees(existing_attendee)
- log.debug(_("Update delegator: %r") % (existing_attendee.to_dict()), level=8)
+ log.debug(_("Update delegator: %r") % (existing_attendee.to_dict()), level=9)
 
- except Exception as errmsg:
+ except Exception, errmsg:
 log.error("Could not find delegated-to attendee: %r" % (errmsg))
 
 # update the organizer's copy of the object
@@ -693,7 +676,7 @@
 auth.connect()
 
 # return cached value
- if email_address in user_dn_from_email_address.cache:
+ if user_dn_from_email_address.cache.has_key(email_address):
 return user_dn_from_email_address.cacheemail_address
 
 local_domains = auth.list_domains()
@@ -712,7 +695,7 @@
 if isinstance(user_dn, basestring):
 log.debug(_("User DN: %r") % (user_dn), level=8)
 else:
- log.debug(_("No user record(s) found for %r") % (email_address), level=8)
+ log.debug(_("No user record(s) found for %r") % (email_address), level=9)
 
 # remember this lookup
 user_dn_from_email_address.cacheemail_address = user_dn
@@ -724,7 +707,7 @@
 
 def get_matching_invitation_policies(receiving_user, sender_email, type_condition=COND_TYPE_ALL):
 # get user's kolabInvitationPolicy settings
- policies = receiving_user'kolabinvitationpolicy' if 'kolabinvitationpolicy' in receiving_user else 
+ policies = receiving_user'kolabinvitationpolicy' if receiving_user.has_key('kolabinvitationpolicy') else 
 if policies and not isinstance(policies, list):
 policies = policies
 
@@ -742,7 +725,7 @@
 
 if domain == '' or domain == '*' or str(sender_email).endswith(domain):
 value = value.upper()
- if value in policy_name_map:
+ if policy_name_map.has_key(value):
 val = policy_name_mapvalue
 # append if type condition matches
 if val & type_condition:
@@ -767,7 +750,7 @@
 
 mail_attribute = mail_attribute.lower()
 
- if mail_attribute not in user_rec:
+ if not user_rec.has_key(mail_attribute):
 log.error(_("User record doesn't have the mailbox attribute %r set" % (mail_attribute)))
 return False
 
@@ -780,21 +763,21 @@
 imap.disconnect()
 imap.connect(login=False)
 imap.login_plain(admin_login, admin_password, user_recmail_attribute)
- except Exception as errmsg:
+ except Exception, errmsg:
 log.error(_("IMAP proxy authentication failed: %r") % (errmsg))
 return False
 
 return True
 
 
-def list_user_folders(user_rec, _type):
+def list_user_folders(user_rec, type):
 """
 Get a list of the given user's private calendar/tasks folders
 """
 global imap
 
 # return cached list
- if '_imap_folders' in user_rec:
+ if user_rec.has_key('_imap_folders'):
 return user_rec'_imap_folders'
 
 result = 
@@ -802,84 +785,39 @@
 if not imap_proxy_auth(user_rec):
 return result
 
- folders = imap.get_metadata('*')
-
- log.debug(
- _("List %r folders for user %r: %r") % (
- _type,
- user_rec'mail',
- folders
- ),
- level=8
- )
+ folders = imap.list_folders('*')
+ log.debug(_("List %r folders for user %r: %r") % (type, user_rec'mail', folders), level=8)
 
 (ns_personal, ns_other, ns_shared) = imap.namespaces()
 
- _folders = {}
-
- # Filter the folders by type relevance
- for folder, metadata in folders.items():
- key = '/shared' + FOLDER_TYPE_ANNOTATION
- if key in metadata:
- if metadatakey.startswith(_type):
- _foldersfolder = metadata
-
- key = '/private' + FOLDER_TYPE_ANNOTATION
- if key in metadata:
- if metadatakey.startswith(_type):
- _foldersfolder = metadata
-
- for folder, metadata in _folders.items():
- folder_delegated = False
-
- # Exclude shared and other user's namespace
- #
- # First, test if this is another users folder
- if ns_other is not None and folder.startswith(ns_other):
- # If we have no delegated mailboxes, we can skip this entirely
- if '_delegated_mailboxes' not in user_rec:
+ for folder in folders:
+ # exclude shared and other user's namespace
+ if ns_other is not None and folder.startswith(ns_other) and '_delegated_mailboxes' in user_rec:
+ # allow shared folders from delegators
+ if len(_mailbox for _mailbox in user_rec'_delegated_mailboxes' if folder.startswith(ns_other + _mailbox + '/')) == 0:
 continue
-
- for _m in user_rec'_delegated_mailboxes':
- if folder.startswith(ns_other + _m + '/'):
- folder_delegated = True
-
- if not folder_delegated:
- continue
-
 # TODO: list shared folders the user has write privileges ?
- if ns_shared is not None:
- if len(_ns for _ns in ns_shared if folder.startswith(_ns)) > 0:
- continue
-
- key = '/shared' + FOLDER_TYPE_ANNOTATION
- if key in metadata:
- if metadatakey.startswith(_type):
- result.append(folder)
-
- key = '/private' + FOLDER_TYPE_ANNOTATION
- if key in metadata:
- if metadatakey.startswith(_type):
- result.append(folder)
-
- # store default folder in user record
- if metadatakey.endswith('.default'):
- user_rec'_default_folder' = folder
- continue
-
- # store private and confidential folders in user record
- if metadatakey.endswith('.confidential'):
- if '_confidential_folder' not in user_rec:
+ if ns_shared is not None and len(_ns for _ns in ns_shared if folder.startswith(_ns)) > 0:
+ continue
+
+ metadata = imap.get_metadata(folder)
+ log.debug(_("IMAP metadata for %r: %r") % (folder, metadata), level=9)
+ if metadata.has_key(folder) and ( \
+ metadatafolder.has_key('/shared' + FOLDER_TYPE_ANNOTATION) and metadatafolder'/shared' + FOLDER_TYPE_ANNOTATION.startswith(type) \
+ or metadatafolder.has_key('/private' + FOLDER_TYPE_ANNOTATION) and metadatafolder'/private' + FOLDER_TYPE_ANNOTATION.startswith(type)):
+ result.append(folder)
+
+ if metadatafolder.has_key('/private' + FOLDER_TYPE_ANNOTATION):
+ # store default folder in user record
+ if metadatafolder'/private' + FOLDER_TYPE_ANNOTATION.endswith('.default'):
+ user_rec'_default_folder' = folder
+
+ # store private and confidential folders in user record
+ if metadatafolder'/private' + FOLDER_TYPE_ANNOTATION.endswith('.confidential') and not user_rec.has_key('_confidential_folder'):
 user_rec'_confidential_folder' = folder
-
- continue
-
- if metadatakey.endswith('.private'):
- if '_private_folder' not in user_rec:
+ if metadatafolder'/private' + FOLDER_TYPE_ANNOTATION.endswith('.private') and not user_rec.has_key('_private_folder'):
 user_rec'_private_folder' = folder
 
- continue
-
 # cache with user record
 user_rec'_imap_folders' = result
 
@@ -910,7 +848,7 @@
 
 try:
 msguid = re.search(r"\WUID (\d+)", data00).group(1)
- except Exception:
+ except Exception, errmsg:
 log.error(_("No UID found in IMAP response: %r") % (data00))
 continue
 
@@ -936,7 +874,7 @@
 setattr(event, '_lock_key', lock_key)
 setattr(event, '_msguid', msguid)
 
- except Exception:
+ except Exception, errmsg:
 log.error(_("Failed to parse %s from message %s/%s: %s") % (type, folder, num, traceback.format_exc()))
 event = None
 master = None
@@ -961,7 +899,7 @@
 conflict = False
 
 # return previously detected conflict
- if '_conflicts' in itip_event:
+ if itip_event.has_key('_conflicts'):
 return not itip_event'_conflicts'
 
 for folder in list_user_folders(receiving_user, 'event'):
@@ -977,7 +915,7 @@
 
 try:
 event = event_from_message(message_from_string(data01))
- except Exception as errmsg:
+ except Exception, errmsg:
 log.error(_("Failed to parse event from message %s/%s: %r") % (folder, num, errmsg))
 continue
 
@@ -991,7 +929,7 @@
 break
 
 end = time.time()
- log.debug(_("start: %r, end: %r, total: %r, messages: %d") % (start, end, (end-start), num_messages), level=8)
+ log.debug(_("start: %r, end: %r, total: %r, messages: %d") % (start, end, (end-start), num_messages), level=9)
 
 # remember the result of this check for further iterations
 itip_event'_conflicts' = conflict
@@ -1019,7 +957,7 @@
 if not wait:
 return False
 
- log.debug(_("%r is locked, waiting...") % (key), level=8)
+ log.debug(_("%r is locked, waiting...") % (key), level=9)
 time.sleep(0.5)
 locktime = os.path.getmtime(filename) if os.path.isfile(filename) else 0
 
@@ -1087,12 +1025,12 @@
 oc = object.get_classification()
 
 # use *.confidential/private folder for confidential/private invitations
- if oc == kolabformat.ClassConfidential and '_confidential_folder' in user_rec:
+ if oc == kolabformat.ClassConfidential and user_rec.has_key('_confidential_folder'):
 targetfolder = user_rec'_confidential_folder'
- elif oc == kolabformat.ClassPrivate and '_private_folder' in user_rec:
+ elif oc == kolabformat.ClassPrivate and user_rec.has_key('_private_folder'):
 targetfolder = user_rec'_private_folder'
 # use *.default folder if exists
- elif '_default_folder' in user_rec:
+ elif user_rec.has_key('_default_folder'):
 targetfolder = user_rec'_default_folder'
 # fallback to any existing folder of specified type
 elif targetfolders is not None and len(targetfolders) > 0:
@@ -1122,7 +1060,7 @@
 )
 return result
 
- except Exception as errmsg:
+ except Exception, errmsg:
 log.error(_("Failed to save %s to user folder at %r: %r") % (
 saveobj.type, targetfolder, errmsg
 ))
@@ -1160,7 +1098,7 @@
 imap.imap.m.expunge()
 return True
 
- except Exception as errmsg:
+ except Exception, errmsg:
 log.error(_("Failed to delete %s from folder %r: %r") % (
 existing.type, targetfolder, errmsg
 ))
@@ -1174,6 +1112,7 @@
 """
 global auth
 
+ import smtplib
 from email.MIMEText import MIMEText
 from email.Utils import formatdate
 from email.header import Header
@@ -1187,9 +1126,6 @@
 orgname = organizer.name()
 
 itip_comment = None
- if comment is not None:
- comment = comment.strip()
-
 if sender is not None and not comment == '':
 itip_comment = _("%s commented: %s") % (_attendee_name(sender), comment)
 
@@ -1205,7 +1141,7 @@
 
 for attendee in object.get_attendees():
 parstat = attendee.get_participant_status(True)
- if parstat in partstats:
+ if partstats.has_key(parstat):
 partstatsparstat.append(attendee.get_displayname())
 else:
 partstats'PENDING'.append(attendee.get_displayname())
@@ -1243,7 +1179,7 @@
 if itip_comment is not None:
 roundup += "\n" + itip_comment
 
- for status,attendees in partstats.items():
+ for status,attendees in partstats.iteritems():
 if len(attendees) > 0:
 roundup += "\n" + participant_status_label(status) + ":\n\t" + "\n\t".join(attendees) + "\n"
 else:
@@ -1299,19 +1235,34 @@
 msg'From' = Header(utils.str2unicode('%s' % orgname) if orgname else '')
 msg'From'.append("<%s>" % orgemail)
 
- seed = random.randint(0, 6)
- alarm_after = (seed * 10) + 60
- log.debug(_("Set alarm to %s seconds") % (alarm_after), level=8)
- signal.alarm(alarm_after)
+ smtp = smtplib.SMTP("localhost", 10027)
+
+ if conf.debuglevel > 8:
+ smtp.set_debuglevel(True)
+
+ success = False
+ retries = 5
+
+ while not success and retries > 0:
+ try:
+ success = smtp.sendmail(orgemail, receiving_user'mail', msg.as_string())
+ log.debug(_("Sent update notification to %r: %r") % (receiving_user'mail', success), level=8)
+ smtp.quit()
+ break
+ except Exception, errmsg:
+ log.error(_("SMTP sendmail error: %r") % (errmsg))
+
+ time.sleep(10)
+ retries -= 1
+
+ return success
 
- result = modules._sendmail(orgemail, receiving_user'mail', msg.as_string())
- log.debug(_("Sent update notification to %r: %r") % (receiving_user'mail', result), level=8)
- signal.alarm(0)
 
 def send_cancel_notification(object, receiving_user, deleted=False, sender=None, comment=None):
 """
 Send a notification about event/task cancellation
 """
+ import smtplib
 from email.MIMEText import MIMEText
 from email.Utils import formatdate
 from email.header import Header
@@ -1349,9 +1300,6 @@
 else:
 message_text += " " + _("The copy in your calendar has been marked as cancelled accordingly.")
 
- if comment is not None:
- comment = comment.strip()
-
 if sender is not None and not comment == '':
 message_text += "\n" + _("%s commented: %s") % (_attendee_name(sender), comment)
 
@@ -1369,14 +1317,18 @@
 msg'From' = Header(utils.str2unicode('%s' % orgname) if orgname else '')
 msg'From'.append("<%s>" % orgemail)
 
- seed = random.randint(0, 6)
- alarm_after = (seed * 10) + 60
- log.debug(_("Set alarm to %s seconds") % (alarm_after), level=8)
- signal.alarm(alarm_after)
+ smtp = smtplib.SMTP("localhost", 10027)
+
+ if conf.debuglevel > 8:
+ smtp.set_debuglevel(True)
+
+ try:
+ smtp.sendmail(orgemail, receiving_user'mail', msg.as_string())
+ except Exception, errmsg:
+ log.error(_("SMTP sendmail error: %r") % (errmsg))
+
+ smtp.quit()
 
- result = modules._sendmail(orgemail, receiving_user'mail', msg.as_string())
- log.debug(_("Sent cancel notification to %r: %r") % (receiving_user'mail', result), level=8)
- signal.alarm(0)
 
 def is_auto_reply(user, sender_email, type):
 accept_available = False

pykolab-0.8.23.tar.gz/wallace/module_optout.py -> pykolab-0.8.4.tar.gz/wallace/module_optout.py Changed

@@ -35,7 +35,7 @@
 
 from pykolab.translate import _
 
-log = pykolab.getLogger('pykolab.wallace/optout')
+log = pykolab.getLogger('pykolab.wallace')
 conf = pykolab.getConf()
 
 mybasepath = '/var/spool/pykolab/wallace/optout/'
@@ -57,7 +57,7 @@
     # TODO: Test for correct call.
     filepath = args0
 
-    if 'stage' in kw:
+    if kw.has_key('stage'):
         log.debug(_("Issuing callback after processing to stage %s") % (kw'stage'), level=8)
         log.debug(_("Testing cb_action_%s()") % (kw'stage'), level=8)
         if hasattr(modules, 'cb_action_%s' % (kw'stage')):
@@ -90,7 +90,7 @@
                 "Cc": 
             }
 
-    for recipient_type in recipients:
+    for recipient_type in recipients.keys():
         for recipient in recipientsrecipient_type:
             log.debug(
                     _("Running opt-out consult from envelope sender '%s " + \
@@ -136,7 +136,7 @@
 
         use_this = False
 
-        for recipient_type in _recipientsanswer:
+        for recipient_type in _recipientsanswer.keys():
             _message.__delitem__(recipient_type)
             if not len(_recipientsanswerrecipient_type) == 0:
                 _message.__setitem__(
@@ -177,7 +177,7 @@
 
     try:
         f = urllib.urlopen(optout_url, params)
-    except Exception:
+    except Exception, e:
         log.error(_("Could not send request to optout_url %s") % (optout_url))
         return "DEFER"
 
@@ -185,8 +185,8 @@
 
     try:
         response_data = json.loads(response)
-    except ValueError:
+    except ValueError, e:
         # Some data is not JSON
-        print("Response data is not JSON")
+        print "Response data is not JSON"
 
     return response_data'result'

pykolab-0.8.23.tar.gz/wallace/module_resources.py -> pykolab-0.8.4.tar.gz/wallace/module_resources.py Changed

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# pylint: disable=too-many-lines
 # Copyright 2010-2015 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
@@ -18,64 +17,53 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-import base64
 import datetime
-
-from email import message_from_string
-from email.parser import Parser
-from email.utils import formataddr
-from email.utils import getaddresses
-
+import icalendar
 import os
+import pytz
 import random
-import re
-import signal
-from six import string_types
+import tempfile
 import time
+from urlparse import urlparse
+from dateutil.tz import tzlocal
+import base64
 import uuid
+import re
 
-from dateutil.tz import tzlocal
+from email import message_from_string
+from email.parser import Parser
+from email.utils import formataddr
+from email.utils import getaddresses
 
 import modules
 
+import pykolab
 import kolabformat
 
-import pykolab
 from pykolab.auth import Auth
 from pykolab.conf import Conf
 from pykolab.imap import IMAP
-from pykolab.logger import LoggerAdapter
-from pykolab.itip import events_from_message
-from pykolab.itip import check_event_conflict
-from pykolab.translate import _
 from pykolab.xml import to_dt
 from pykolab.xml import utils as xmlutils
 from pykolab.xml import event_from_message
 from pykolab.xml import participant_status_label
+from pykolab.itip import events_from_message
+from pykolab.itip import check_event_conflict
+from pykolab.translate import _
 
 # define some contstants used in the code below
 COND_NOTIFY = 256
-ACT_MANUAL = 1
-ACT_ACCEPT = 2
-ACT_REJECT = 8
-ACT_STORE = 16
+ACT_MANUAL = 1
+ACT_ACCEPT = 2
 ACT_ACCEPT_AND_NOTIFY = ACT_ACCEPT + COND_NOTIFY
-ACT_STORE_AND_NOTIFY = ACT_STORE + COND_NOTIFY
 
-# noqa: E241
 policy_name_map = {
- 'ACT_MANUAL': ACT_MANUAL, # noqa: E241
- 'ACT_ACCEPT': ACT_ACCEPT, # noqa: E241
- 'ACT_REJECT': ACT_REJECT, # noqa: E241
- 'ACT_ACCEPT_AND_NOTIFY': ACT_ACCEPT_AND_NOTIFY,
- 'ACT_STORE_AND_NOTIFY': ACT_STORE_AND_NOTIFY
+ 'ACT_MANUAL': ACT_MANUAL,
+ 'ACT_ACCEPT': ACT_ACCEPT,
+ 'ACT_ACCEPT_AND_NOTIFY': ACT_ACCEPT_AND_NOTIFY
 }
 
-# pylint: disable=invalid-name
-log = pykolab.getLogger('pykolab.wallace/resources')
-extra_log_params = {'qid': '-'}
-log = LoggerAdapter(log, extra_log_params)
-
+log = pykolab.getLogger('pykolab.wallace')
 conf = pykolab.getConf()
 
 mybasepath = '/var/spool/pykolab/wallace/resources/'
@@ -83,34 +71,28 @@
 auth = None
 imap = None
 
-
 def __init__():
 modules.register('resources', execute, description=description(), heartbeat=heartbeat)
 
-
 def accept(filepath):
 new_filepath = os.path.join(
- mybasepath,
- 'ACCEPT',
- os.path.basename(filepath)
- )
+ mybasepath,
+ 'ACCEPT',
+ os.path.basename(filepath)
+ )
 
 cleanup()
 os.rename(filepath, new_filepath)
 filepath = new_filepath
- exec('modules.cb_action_ACCEPT(%r, %r)' % ('resources', filepath))
-
+ exec('modules.cb_action_ACCEPT(%r, %r)' % ('resources',filepath))
 
 def description():
 return """Resource management module."""
 
-
 def cleanup():
- global auth, imap, extra_log_params
-
- log.debug("cleanup(): %r, %r" % (auth, imap), level=8)
+ global auth, imap
 
- extra_log_params'qid' = '-'
+ log.debug("cleanup(): %r, %r" % (auth, imap), level=9)
 
 auth.disconnect()
 del auth
@@ -119,27 +101,16 @@
 imap.disconnect()
 del imap
 
-
-# pylint: disable=inconsistent-return-statements
-# pylint: disable=too-many-branches
-# pylint: disable=too-many-locals
-# pylint: disable=too-many-return-statements
-# pylint: disable=too-many-statements
 def execute(*args, **kw):
- global auth, imap, extra_log_params
-
- # TODO: Test for correct call.
- filepath = args0
-
- extra_log_params'qid' = os.path.basename(filepath)
+ global auth, imap
 
 # (re)set language to default
- pykolab.translate.setUserLanguage(conf.get('kolab', 'default_locale'))
+ pykolab.translate.setUserLanguage(conf.get('kolab','default_locale'))
 
 if not os.path.isdir(mybasepath):
 os.makedirs(mybasepath)
 
- for stage in 'incoming', 'ACCEPT', 'REJECT', 'HOLD', 'DEFER':
+ for stage in 'incoming', 'ACCEPT', 'REJECT', 'HOLD', 'DEFER' :
 if not os.path.isdir(os.path.join(mybasepath, stage)):
 os.makedirs(os.path.join(mybasepath, stage))
 
@@ -148,37 +119,40 @@
 auth = Auth()
 imap = IMAP()
 
- if 'stage' in kw:
+ # TODO: Test for correct call.
+ filepath = args0
+
+ if kw.has_key('stage'):
 log.debug(
- _("Issuing callback after processing to stage %s") % (
- kw'stage'
- ),
- level=8
- )
+ _("Issuing callback after processing to stage %s") % (
+ kw'stage'
+ ),
+ level=8
+ )
 
 log.debug(_("Testing cb_action_%s()") % (kw'stage'), level=8)
 if hasattr(modules, 'cb_action_%s' % (kw'stage')):
 log.debug(
- _("Attempting to execute cb_action_%s()") % (kw'stage'),
- level=8
- )
+ _("Attempting to execute cb_action_%s()") % (kw'stage'),
+ level=8
+ )
 
 exec(
- 'modules.cb_action_%s(%r, %r)' % (
- kw'stage',
- 'resources',
- filepath
+ 'modules.cb_action_%s(%r, %r)' % (
+ kw'stage',
+ 'resources',
+ filepath
+ )
 )
- )
 
 return filepath
 else:
 # Move to incoming
 new_filepath = os.path.join(
- mybasepath,
- 'incoming',
- os.path.basename(filepath)
- )
+ mybasepath,
+ 'incoming',
+ os.path.basename(filepath)
+ )
 
 if not filepath == new_filepath:
 log.debug("Renaming %r to %r" % (filepath, new_filepath))
@@ -192,11 +166,8 @@
 if not message.get('X-Kolab-To'):
 return filepath
 
- recipients = address for displayname, address in getaddresses(message.get_all('X-Kolab-To'))
-
- sender_email = 
- address for displayname, address in getaddresses(message.get_all('X-Kolab-From'))
- 0
+ recipients = address for displayname,address in getaddresses(message.get_all('X-Kolab-To'))
+ sender_email = address for displayname,address in getaddresses(message.get_all('X-Kolab-From'))0
 
 any_itips = False
 any_resources = False
@@ -207,46 +178,43 @@
 # is an iTip message by checking the length of this list.
 try:
 itip_events = events_from_message(message, 'REQUEST', 'REPLY', 'CANCEL')
-
- # pylint: disable=broad-except
- except Exception as errmsg:
- log.error(_("Failed to parse iTip events from message: %r" % (errmsg)))
+ except Exception, e:
+ log.error(_("Failed to parse iTip events from message: %r" % (e)))
 itip_events = 
 
 if not len(itip_events) > 0:
- log.info("Message is not an iTip message or does not contain any (valid) iTip.")
+ log.info(
+ _("Message is not an iTip message or does not contain any " + \
+ "(valid) iTip.")
+ )
 
 else:
 any_itips = True
 
 log.debug(
- "iTip events attached to this message contain the following information: %r" % (
- itip_events
- ),
- level=8
- )
+ _("iTip events attached to this message contain the " + \
+ "following information: %r") % (itip_events),
+ level=9
+ )
 
 if any_itips:
 # See if any iTip actually allocates a resource.
- if (len(x'resources' for x in itip_events if 'resources' in x) > 0
- or len(x'attendees' for x in itip_events if 'attendees' in x) > 0):
-
- possibly_any_resources = True
+ if len(x'resources' for x in itip_events if x.has_key('resources')) > 0 \
+ or len(x'attendees' for x in itip_events if x.has_key('attendees')) > 0:
+ possibly_any_resources = True
 
 if possibly_any_resources:
 auth.connect()
 
 for recipient in recipients:
 # extract reference UID from recipients like resource+UID@domain.org
- if re.match(r'.+\+A-Za-z0-9=/-+@', recipient):
+ if re.match('.+\+A-Za-z0-9=/-+@', recipient):
 try:
 (prefix, host) = recipient.split('@')
 (local, uid) = prefix.split('+')
 reference_uid = base64.b64decode(uid, '-/')
 recipient = local + '@' + host
-
- # pylint: disable=broad-except
- except Exception:
+ except:
 continue
 
 if not len(resource_record_from_email_address(recipient)) == 0:
@@ -255,14 +223,9 @@
 
 if any_resources:
 if not any_itips:
- log.debug(
- _("Not an iTip message, but sent to resource nonetheless. Reject message"),
- level=5
- )
-
+ log.debug(_("Not an iTip message, but sent to resource nonetheless. Reject message"), level=5)
 reject(filepath)
 return False
-
 else:
 # Continue. Resources and iTips. We like.
 pass
@@ -280,17 +243,12 @@
 
 # check if resource attendees match the envelope recipient
 if len(resource_dns) == 0:
- log.info(
- _("No resource attendees matching envelope recipient %s, Reject message") % (
- resource_recipient
- )
- )
-
+ log.info(_("No resource attendees matching envelope recipient %s, Reject message") % (resource_recipient))
 log.debug("%r" % (itip_events), level=8)
 reject(filepath)
-
 return False
 
+
 # Get the resource details, which includes details on the IMAP folder
 # This may append resource collection members to recource_dns
 resources = get_resource_records(resource_dns)
@@ -308,47 +266,23 @@
 
 # find initial reservation referenced by the reply
 if reference_uid:
- (event, master) = find_existing_event(
- reference_uid,
- itip_event'recurrence-id',
- receiving_resource
- )
-
- log.debug(
- _("iTip REPLY to %r, %r; matches %r") % (
- reference_uid,
- itip_event'recurrence-id',
- type(event)
- ),
- level=8
- )
+ (event, master) = find_existing_event(reference_uid, itip_event'recurrence-id', receiving_resource)
+ log.debug(_("iTip REPLY to %r, %r; matches %r") % (reference_uid, itip_event'recurrence-id', type(event)), level=8)
 
 if event:
 try:
 sender_attendee = itip_event'xml'.get_attendee_by_email(sender_email)
 owner_reply = sender_attendee.get_participant_status()
- log.debug(
- _("Sender Attendee: %r => %r") % (sender_attendee, owner_reply),
- level=8
- )
-
- # pylint: disable=broad-except
- except Exception as errmsg:
- log.error(_("Could not find envelope sender attendee: %r") % (errmsg))
+ log.debug(_("Sender Attendee: %r => %r") % (sender_attendee, owner_reply), level=9)
+ except Exception, e:
+ log.error(_("Could not find envelope sender attendee: %r") % (e))
 continue
 
 # compare sequence number to avoid outdated replies
 if not itip_event'sequence' == event.get_sequence():
- log.info(
- _(
- "The iTip reply sequence (%r) doesn't match the "
- + "referred event version (%r). Ignoring."
- ) % (
- itip_event'sequence',
- event.get_sequence()
- )
- )
-
+ log.info(_("The iTip reply sequence (%r) doesn't match the referred event version (%r). Ignoring.") % (
+ itip_event'sequence', event.get_sequence()
+ ))
 continue
 
 # forward owner response comment
@@ -365,20 +299,11 @@
 elif owner_reply == kolabformat.PartDeclined:
 decline_reservation_request(_itip_event, receiving_resource)
 else:
- log.info(
- _(
- "Invalid response (%r) received from resource owner for event %r"
- ) % (
- sender_attendee.get_participant_status(True),
- reference_uid
- )
- )
+ log.info(_("Invalid response (%r) received from resource owner for event %r") % (
+ sender_attendee.get_participant_status(True), reference_uid
+ ))
 else:
- log.info(
- _("Event referenced by this REPLY (%r) not found in resource calendar") % (
- reference_uid
- )
- )
+ log.info(_("Event referenced by this REPLY (%r) not found in resource calendar") % (reference_uid))
 
 else:
 log.info(_("No event reference found in this REPLY. Ignoring."))
@@ -389,74 +314,30 @@
 # else:
 
 try:
- receiving_attendee = itip_event'xml'.get_attendee_by_email(
- receiving_resource'mail'
- )
-
- log.debug(
- _("Receiving Resource: %r; %r") % (receiving_resource, receiving_attendee),
- level=8
- )
-
- # pylint: disable=broad-except
- except Exception as errmsg:
- log.error(_("Could not find envelope attendee: %r") % (errmsg))
+ receiving_attendee = itip_event'xml'.get_attendee_by_email(receiving_resource'mail')
+ log.debug(_("Receiving Resource: %r; %r") % (receiving_resource, receiving_attendee), level=9)
+ except Exception, e:
+ log.error(_("Could not find envelope attendee: %r") % (e))
 continue
 
 # ignore updates and cancellations to resource collections who already delegated the event
- att_delegated = (len(receiving_attendee.get_delegated_to()) > 0)
- att_nonpart = (receiving_attendee.get_role() == kolabformat.NonParticipant)
- att_rsvp = receiving_attendee.get_rsvp()
-
- if (att_delegated or att_nonpart) and not att_rsvp:
+ if len(receiving_attendee.get_delegated_to()) > 0 or receiving_attendee.get_role() == kolabformat.NonParticipant:
 done = True
-
- log.debug(
- _("Recipient %r is non-participant, ignoring message") % (
- receiving_resource'mail'
- ),
- level=8
- )
+ log.debug(_("Recipient %r is non-participant, ignoring message") % (receiving_resource'mail'), level=8)
 
 # process CANCEL messages
 if not done and itip_event'method' == "CANCEL":
 for resource in resource_dns:
- r_emails = a.get_email() for a in itip_event'xml'.get_attendees()
- _resource = resourcesresource
-
- if _resource'mail' in r_emails and 'kolabtargetfolder' in _resource:
- (event, master) = find_existing_event(
- itip_event'uid',
- itip_event'recurrence-id',
- _resource
- )
-
- if not event:
- continue
-
+ if resourcesresource'mail' in a.get_email() for a in itip_event'xml'.get_attendees() \
+ and resourcesresource.has_key('kolabtargetfolder'):
+ (event, master) = find_existing_event(itip_event'uid', itip_event'recurrence-id', resourcesresource)
 # remove entire event
- if master is None:
- log.debug(
- _("Cancellation for entire event %r: deleting") % (itip_event'uid'),
- level=8
- )
-
- delete_resource_event(
- itip_event'uid',
- resourcesresource,
- event._msguid
- )
-
+ if event and master is None:
+ log.debug(_("Cancellation for entire event %r: deleting") % (itip_event'uid'), level=8)
+ delete_resource_event(itip_event'uid', resourcesresource, event._msguid)
 # just cancel one single occurrence: add exception with status=cancelled
- else:
- log.debug(
- _("Cancellation for a single occurrence %r of %r: updating...") % (
- itip_event'recurrence-id',
- itip_event'uid'
- ),
- level=8
- )
-
+ elif master is not None:
+ log.debug(_("Cancellation for a single occurrence %r of %r: updating...") % (itip_event'recurrence-id', itip_event'uid'), level=8)
 event.set_status('CANCELLED')
 event.set_transparency(True)
 _itip_event = dict(xml=event, uid=event.get_uid(), _master=master)
@@ -470,102 +351,48 @@
 cleanup()
 return
 
- # do the magic for the receiving attendee
- (available_resource, itip_event) = check_availability(
- itip_events,
- resource_dns,
- resources,
- receiving_attendee
- )
 
- _reject = False
- resource = None
- original_resource = None
+ # do the magic for the receiving attendee
+ (available_resource, itip_event) = check_availability(itip_events, resource_dns, resources, receiving_attendee)
 
 # accept reservation
 if available_resource is not None:
- atts = a.get_email() for a in itip_event'xml'.get_attendees()
- if available_resource'mail' in atts:
+ if available_resource'mail' in a.get_email() for a in itip_event'xml'.get_attendees():
+ log.debug(_("Accept invitation for individual resource %r / %r") % (available_resource'dn', available_resource'mail'), level=8)
+
 # check if reservation was delegated
- if available_resource'mail' != receiving_resource'mail':
- if receiving_attendee.get_participant_status() == kolabformat.PartDelegated:
- original_resource = receiving_resource
+ original_resource = None
+ if available_resource'mail' != receiving_resource'mail' and receiving_attendee.get_participant_status() == kolabformat.PartDelegated:
+ original_resource = receiving_resource
+
+ accept_reservation_request(itip_event, available_resource, original_resource)
 
- resource = available_resource
 else:
 # This must have been a resource collection originally.
 # We have inserted the reference to the original resource
 # record in 'memberof'.
- if 'memberof' in available_resource:
+ if available_resource.has_key('memberof'):
 original_resource = resourcesavailable_resource'memberof'
 
- atts = a.get_email() for a in itip_event'xml'.get_attendees()
-
- if original_resource'mail' in atts:
+ if original_resource'mail' in a.get_email() for a in itip_event'xml'.get_attendees():
 #
 # Delegate:
 # - delegator: the original resource collection
 # - delegatee: the target resource
 #
- itip_event'xml'.delegate(
- original_resource'mail',
- available_resource'mail',
- available_resource'cn'
- )
+ itip_event'xml'.delegate(original_resource'mail', available_resource'mail', available_resource'cn')
 
 # set delegator to NON-PARTICIPANT and RSVP=FALSE
 delegator = itip_event'xml'.get_attendee_by_email(original_resource'mail')
 delegator.set_role(kolabformat.NonParticipant)
 delegator.set_rsvp(False)
 
- log.debug(
- _("Delegate invitation for resource collection %r to %r") % (
- original_resource'mail',
- available_resource'mail'
- ),
- level=8
- )
-
- resource = available_resource
-
- # Look for ACT_REJECT policy
- if resource is not None:
- invitationpolicy = get_resource_invitationpolicy(resource)
- log.debug(_("Apply invitation policies %r") % (invitationpolicy), level=8)
-
- if invitationpolicy is not None:
- for policy in invitationpolicy:
- if policy & ACT_REJECT:
- _reject = True
- break
-
- if resource is not None and not _reject:
- log.debug(
- _("Accept invitation for individual resource %r / %r") % (
- resource'dn',
- resource'mail'
- ),
- level=8
- )
-
- accept_reservation_request(
- itip_event,
- resource,
- original_resource,
- False,
- invitationpolicy
- )
+ log.debug(_("Delegate invitation for resource collection %r to %r") % (original_resource'mail', available_resource'mail'), level=8)
+ accept_reservation_request(itip_event, available_resource, original_resource)
 
+ # decline reservation
 else:
 resource = resourcesresource_dns0 # this is the receiving resource record
- log.debug(
- _("Decline invitation for individual resource %r / %r") % (
- resource'dn',
- resource'mail'
- ),
- level=8
- )
-
 decline_reservation_request(itip_event, resource)
 
 cleanup()
@@ -589,9 +416,6 @@
 
 resource_dns = auth.find_resource('*')
 
- # Remove referrals
- resource_dns = dn for dn in resource_dns if dn is not None
-
 # filter by resource_base_dn
 resource_base_dn = conf.get('ldap', 'resource_base_dn', None)
 if resource_base_dn is not None:
@@ -603,19 +427,13 @@
 
 for resource_dn in resource_dns:
 resource_attrs = auth.get_entry_attributes(None, resource_dn, 'kolabtargetfolder')
-
- if 'kolabtargetfolder' in resource_attrs:
+ if resource_attrs.has_key('kolabtargetfolder'):
 try:
 expunge_resource_calendar(resource_attrs'kolabtargetfolder')
- # pylint: disable=broad-except
- except Exception as errmsg:
- log.error(
- _("Expunge resource calendar for %s (%s) failed: %r") % (
- resource_dn,
- resource_attrs'kolabtargetfolder',
- errmsg
- )
- )
+ except Exception, e:
+ log.error(_("Expunge resource calendar for %s (%s) failed: %r") % (
+ resource_dn, resource_attrs'kolabtargetfolder', e
+ ))
 
 imap.disconnect()
 
@@ -623,7 +441,6 @@
 
 heartbeat._lastrun = now
 
-
 heartbeat._lastrun = 0
 
 
@@ -644,13 +461,7 @@
 
 # might raise an exception, let that bubble
 targetfolder = imap.folder_quote(mailbox)
-
- imap.set_acl(
- targetfolder,
- conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'),
- "lrswipkxtecda"
- )
-
+ imap.set_acl(targetfolder, conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'), "lrswipkxtecda")
 imap.imap.m.select(targetfolder)
 
 typ, data = imap.imap.m.search(None, 'UNDELETED')
@@ -658,16 +469,17 @@
 for num in data0.split():
 log.debug(
 _("Fetching message ID %r from folder %r") % (num, mailbox),
- level=8
+ level=9
 )
 
 typ, data = imap.imap.m.fetch(num, '(RFC822)')
 
+ event_message = message_from_string(data01)
+
 try:
 event = event_from_message(message_from_string(data01))
- # pylint: disable=broad-except
- except Exception as errmsg:
- log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, errmsg))
+ except Exception, e:
+ log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, e))
 continue
 
 if event:
@@ -675,24 +487,14 @@
 
 # consider recurring events and get real end date
 if event.is_recurring():
- dt_end = to_dt(event.get_last_occurrence())
+ dt_end = event.get_last_occurrence()
 if dt_end is None:
 # skip if recurring forever
 continue
 
 if dt_end and dt_end < expire_date:
 age = now - dt_end
-
- log.debug(
- _("Flag event %s from message %s/%s as deleted (age = %d days)") % (
- event.uid,
- mailbox,
- num,
- age.days
- ),
- level=8
- )
-
+ log.debug(_("Flag event %s from message %s/%s as deleted (age = %d days)") % (event.uid, mailbox, num, age.days), level=8)
 imap.imap.m.store(num, '+FLAGS', '\\Deleted')
 
 imap.imap.m.expunge()
@@ -708,61 +510,46 @@
 num_messages = 0
 available_resource = None
 
- for resource in resources:
+ for resource in resources.keys():
 # skip this for resource collections
- if 'kolabtargetfolder' not in resourcesresource:
+ if not resourcesresource.has_key('kolabtargetfolder'):
 continue
 
 # sets the 'conflicting' flag and adds a list of conflicting events found
 try:
 num_messages += read_resource_calendar(resourcesresource, itip_events)
- # pylint: disable=broad-except
- except Exception as e:
+ except Exception, e:
 log.error(_("Failed to read resource calendar for %r: %r") % (resource, e))
 
 end = time.time()
 
- log.debug(
- _("start: %r, end: %r, total: %r, messages: %d") % (
- start,
- end,
- (end - start),
- num_messages
- ),
- level=8
- )
+ log.debug(_("start: %r, end: %r, total: %r, messages: %d") % (start, end, (end-start), num_messages), level=9)
+
 
 # For each resource (collections are first!)
 # check conflicts and either accept or decline the reservation request
 for resource in resource_dns:
- log.debug(_("Polling for resource %r") % (resource), level=8)
+ log.debug(_("Polling for resource %r") % (resource), level=9)
 
- if resource not in resources:
- log.debug(_("Resource %r has been popped from the list") % (resource), level=8)
+ if not resources.has_key(resource):
+ log.debug(_("Resource %r has been popped from the list") % (resource), level=9)
 continue
 
- if 'conflicting_events' not in resourcesresource:
- log.debug(_("Resource is a collection"), level=8)
+ if not resourcesresource.has_key('conflicting_events'):
+ log.debug(_("Resource is a collection"), level=9)
 
 # check if there are non-conflicting collection members
- conflicting_members = 
- x for x in resourcesresource'uniquemember'
- if resourcesx'conflict'
- 
+ conflicting_members = x for x in resourcesresource'uniquemember' if resourcesx'conflict'
 
 # found at least one non-conflicting member, remove the conflicting ones and continue
 if len(conflicting_members) < len(resourcesresource'uniquemember'):
 for member in conflicting_members:
- resourcesresource'uniquemember' = 
- x for x in resourcesresource'uniquemember'
- if x != member
- 
-
+ resourcesresource'uniquemember' = x for x in resourcesresource'uniquemember' if x != member
 del resourcesmember
 
 log.debug(_("Removed conflicting resources from %r: (%r) => %r") % (
 resource, conflicting_members, resourcesresource'uniquemember'
- ), level=8)
+ ), level=9)
 
 else:
 # TODO: shuffle existing bookings of collection members in order
@@ -772,13 +559,7 @@
 continue
 
 if len(resourcesresource'conflicting_events') > 0:
- log.debug(
- _("Conflicting events: %r for resource %r") % (
- resourcesresource'conflicting_events',
- resource
- ),
- level=8
- )
+ log.debug(_("Conflicting events: %r for resource %r") % (resourcesresource'conflicting_events', resource), level=9)
 
 done = False
 
@@ -788,41 +569,24 @@
 if itip_event'recurrence-id' is not None:
 continue
 
- _eas = a.get_email() for a in itip_event'xml'.get_attendees()
 # Now we have the event that was conflicting
- if resourcesresource'mail' in _eas:
+ if resourcesresource'mail' in a.get_email() for a in itip_event'xml'.get_attendees():
 # this resource initially was delegated from a collection ?
- if receiving_attendee \
- and receiving_attendee.get_email() == resourcesresource'mail' \
+ if receiving_attendee and receiving_attendee.get_email() == resourcesresource'mail' \
 and len(receiving_attendee.get_delegated_from()) > 0:
-
 for delegator in receiving_attendee.get_delegated_from():
 collection_data = get_resource_collection(delegator.email())
 if collection_data is not None:
 # check if another collection member is available
- (available_resource, dummy) = check_availability(
- itip_events,
- collection_data0,
- collection_data1
- )
-
+ (available_resource, dummy) = check_availability(itip_events, collection_data0, collection_data1)
 break
 
 if available_resource is not None:
- log.debug(
- _("Delegate to another resource collection member: %r to %r") % (
- resourcesresource'mail',
- available_resource'mail'
- ),
- level=8
- )
+ log.debug(_("Delegate to another resource collection member: %r to %r") % \
+ (resourcesresource'mail', available_resource'mail'), level=8)
 
 # set this new resource as delegate for the receiving_attendee
- itip_event'xml'.delegate(
- resourcesresource'mail',
- available_resource'mail',
- available_resource'cn'
- )
+ itip_event'xml'.delegate(resourcesresource'mail', available_resource'mail', available_resource'cn')
 
 # set delegator to NON-PARTICIPANT and RSVP=FALSE
 receiving_attendee.set_role(kolabformat.NonParticipant)
@@ -832,11 +596,7 @@
 # remove existing_events as we now delegated back to the collection
 if len(resourcesresource'existing_events') > 0:
 for existing in resourcesresource'existing_events':
- delete_resource_event(
- existing.uid,
- resourcesresource,
- existing._msguid
- )
+ delete_resource_event(existing.uid, resourcesresource, existing._msguid)
 
 done = True
 
@@ -847,8 +607,7 @@
 # No conflicts, go accept
 for itip_event in itip_events:
 # directly invited resource
- _eas = a.get_email() for a in itip_event'xml'.get_attendees()
- if resourcesresource'mail' in _eas:
+ if resourcesresource'mail' in a.get_email() for a in itip_event'xml'.get_attendees():
 available_resource = resourcesresource
 done = True
 
@@ -856,14 +615,11 @@
 # This must have been a resource collection originally.
 # We have inserted the reference to the original resource
 # record in 'memberof'.
- if 'memberof' in resourcesresource:
+ if resourcesresource.has_key('memberof'):
 original_resource = resourcesresourcesresource'memberof'
 
 # Randomly select a target resource from the resource collection.
- _selected = random.randint(0, (len(original_resource'uniquemember') - 1))
-
- available_resource = resourcesoriginal_resource'uniquemember'_selected
-
+ available_resource = resourcesoriginal_resource'uniquemember'random.randint(0,(len(original_resource'uniquemember')-1))
 done = True
 
 if done:
@@ -889,7 +645,7 @@
 
 log.debug(
 _("Checking events in resource folder %r") % (mailbox),
- level=8
+ level=9
 )
 
 # set read ACLs for admin user
@@ -908,22 +664,22 @@
 
 log.debug(
 _("Fetching message UID %r from folder %r") % (num, mailbox),
- level=8
+ level=9
 )
 
 typ, data = imap.imap.m.fetch(num, '(UID RFC822)')
 
 try:
 msguid = re.search(r"\WUID (\d+)", data00).group(1)
- # pylint: disable=broad-except
- except Exception:
+ except Exception, e:
 log.error(_("No UID found in IMAP response: %r") % (data00))
 continue
 
+ event_message = message_from_string(data01)
+
 try:
 event = event_from_message(message_from_string(data01))
- # pylint: disable=broad-except
- except Exception as e:
+ except Exception, e:
 log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, e))
 continue
 
@@ -962,14 +718,13 @@
 master = None
 mailbox = resource_rec'kolabtargetfolder'
 
- log.debug(_("Searching %r for event %r") % (mailbox, uid), level=8)
+ log.debug(_("Searching %r for event %r") % (mailbox, uid), level=9)
 
 try:
 imap.imap.m.select(imap.folder_quote(mailbox))
 typ, data = imap.imap.m.search(None, '(UNDELETED HEADER SUBJECT "%s")' % (uid))
- # pylint: disable=broad-except
- except Exception as errmsg:
- log.error(_("Failed to access resource calendar:: %r") % (errmsg))
+ except Exception, e:
+ log.error(_("Failed to access resource calendar:: %r") % (e))
 return event
 
 for num in reversed(data0.split()):
@@ -977,8 +732,7 @@
 
 try:
 msguid = re.search(r"\WUID (\d+)", data00).group(1)
- # pylint: disable=broad-except
- except Exception:
+ except Exception, e:
 log.error(_("No UID found in IMAP response: %r") % (data00))
 continue
 
@@ -996,25 +750,17 @@
 return (event, master)
 
 # compare recurrence-id and skip to next message if not matching
- elif recurrence_id:
- if not xmlutils.dates_equal(recurrence_id, event.get_recurrence_id()):
- log.debug(
- _("Recurrence-ID not matching on message %s, skipping: %r != %r") % (
- msguid,
- recurrence_id,
- event.get_recurrence_id()
- ),
- level=8
- )
-
- continue
+ elif recurrence_id and not xmlutils.dates_equal(recurrence_id, event.get_recurrence_id()):
+ log.debug(_("Recurrence-ID not matching on message %s, skipping: %r != %r") % (
+ msguid, recurrence_id, event.get_recurrence_id()
+ ), level=8)
+ continue
 
 if event is not None:
 setattr(event, '_msguid', msguid)
 
- # pylint: disable=broad-except
- except Exception as errmsg:
- log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, errmsg))
+ except Exception, e:
+ log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, e))
 event = None
 master = None
 continue
@@ -1025,42 +771,28 @@
 return (event, master)
 
 
-def accept_reservation_request(
- itip_event,
- resource,
- delegator=None,
- confirmed=False,
- invitationpolicy=None
-):
+def accept_reservation_request(itip_event, resource, delegator=None, confirmed=False):
 """
 Accepts the given iTip event by booking it into the resource's
- calendar. Then, depending on the policy, set the attendee status of the given resource to
- ACCEPTED/TENTATIVE and send an iTip reply message to the organizer, or set the status to
- NEEDS-ACTION and don't send a reply to the organizer.
+ calendar. Then set the attendee status of the given resource to
+ ACCEPTED and sends an iTip reply message to the organizer.
 """
 owner = get_resource_owner(resource)
 confirmation_required = False
- do_send_response = True
- partstat = 'ACCEPTED'
 
 if not confirmed and owner:
- if invitationpolicy is None:
- invitationpolicy = get_resource_invitationpolicy(resource)
- log.debug(_("Apply invitation policies %r") % (invitationpolicy), level=8)
+ invitationpolicy = get_resource_invitationpolicy(resource)
+ log.debug(_("Apply invitation policies %r") % (invitationpolicy), level=9)
 
 if invitationpolicy is not None:
 for policy in invitationpolicy:
 if policy & ACT_MANUAL and owner'mail':
 confirmation_required = True
- partstat = 'TENTATIVE'
- break
- if policy & ACT_STORE:
- partstat = 'NEEDS-ACTION'
- # Do not send an immediate response to the organizer
- do_send_response = False
 break
 
- itip_event'xml'.set_transparency(False)
+ partstat = 'TENTATIVE' if confirmation_required else 'ACCEPTED'
+
+ itip_event'xml'.set_transparency(False);
 itip_event'xml'.set_attendee_participant_status(
 itip_event'xml'.get_attendee_by_email(resource'mail'),
 partstat
@@ -1073,7 +805,7 @@
 level=8
 )
 
- if saved and do_send_response:
+ if saved:
 send_response(delegator'mail' if delegator else resource'mail', itip_event, owner)
 
 if owner and confirmation_required:
@@ -1108,7 +840,7 @@
 
 # send response and notification
 owner = get_resource_owner(resource)
- send_response(resource'mail', itip_event, owner)
+ send_response(resource'mail', itip_event, get_resource_owner(resource))
 
 if owner:
 send_owner_notification(resource, owner, itip_event, True)
@@ -1120,6 +852,7 @@
 """
 try:
 save_event = itip_event'xml'
+ targetfolder = imap.folder_quote(resource'kolabtargetfolder')
 
 # add exception to existing recurring main event
 if resource.get('existing_master') is not None:
@@ -1131,7 +864,7 @@
 save_event.add_exception(itip_event'xml')
 
 # remove old copy of the reservation (also sets ACLs)
- if 'existing_events' in resource and len(resource'existing_events') > 0:
+ if resource.has_key('existing_events') and len(resource'existing_events') > 0:
 for existing in resource'existing_events':
 delete_resource_event(existing.uid, resource, existing._msguid)
 
@@ -1140,22 +873,18 @@
 delete_resource_event(save_event.uid, resource, save_event._msguid)
 
 else:
- imap.set_acl(
- resource'kolabtargetfolder',
- conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'),
- "lrswipkxtecda"
- )
+ imap.set_acl(targetfolder, conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'), "lrswipkxtecda")
 
 # append new version
- result = imap.append(
- resource'kolabtargetfolder',
+ result = imap.imap.m.append(
+ targetfolder,
+ None,
+ None,
 save_event.to_message(creator="Kolab Server <wallace@localhost>").as_string()
 )
-
 return result
 
- # pylint: disable=broad-except
- except Exception as e:
+ except Exception, e:
 log.error(_("Failed to save event to resource calendar at %r: %r") % (
 resource'kolabtargetfolder', e
 ))
@@ -1170,12 +899,7 @@
 targetfolder = imap.folder_quote(resource'kolabtargetfolder')
 
 try:
- imap.set_acl(
- targetfolder,
- conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'),
- "lrswipkxtecda"
- )
-
+ imap.set_acl(targetfolder, conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'), "lrswipkxtecda")
 imap.imap.m.select(targetfolder)
 
 # delete by IMAP UID
@@ -1190,7 +914,7 @@
 
 log.debug(_("Delete resource calendar object %r in %r: %r") % (
 uid, resource'kolabtargetfolder', data
- ), level=8)
+ ), level=9)
 
 for num in data0.split():
 imap.imap.m.store(num, '+FLAGS', '\\Deleted')
@@ -1198,8 +922,7 @@
 imap.imap.m.expunge()
 return True
 
- # pylint: disable=broad-except
- except Exception as e:
+ except Exception, e:
 log.error(_("Failed to delete calendar object %r from folder %r: %r") % (
 uid, targetfolder, e
 ))
@@ -1209,14 +932,14 @@
 
 def reject(filepath):
 new_filepath = os.path.join(
- mybasepath,
- 'REJECT',
- os.path.basename(filepath)
- )
+ mybasepath,
+ 'REJECT',
+ os.path.basename(filepath)
+ )
 
 os.rename(filepath, new_filepath)
 filepath = new_filepath
- exec('modules.cb_action_REJECT(%r, %r)' % ('resources', filepath))
+ exec('modules.cb_action_REJECT(%r, %r)' % ('resources',filepath))
 
 
 def resource_record_from_email_address(email_address):
@@ -1233,7 +956,7 @@
 
 local_domains = auth.list_domains()
 
- if local_domains is not None:
+ if not local_domains == None:
 local_domains = list(set(local_domains.keys()))
 
 if not email_address.split('@')1 in local_domains:
@@ -1250,10 +973,10 @@
 if len(resource_records) > 0:
 log.debug(_("Resource record(s): %r") % (resource_records), level=8)
 else:
- log.debug(_("No resource (collection) records found for %r") % (email_address), level=8)
+ log.debug(_("No resource (collection) records found for %r") % (email_address), level=9)
 
- elif isinstance(resource_records, string_types):
- resource_records = resource_records
+ elif isinstance(resource_records, basestring):
+ resource_records = resource_records 
 log.debug(_("Resource record: %r") % (resource_records), level=8)
 
 return resource_records
@@ -1272,47 +995,30 @@
 
 resource_records = 
 
- log.debug(_("Raw itip_events: %r") % (itip_events), level=8)
+ log.debug(_("Raw itip_events: %r") % (itip_events), level=9)
 attendees_raw = 
-
- _lars = 
- x for x in 
- y'attendees' for y in itip_events
- if 'attendees' in y and isinstance(y'attendees', list)
- 
- 
-
- for list_attendees_raw in _lars:
+ for list_attendees_raw in x for x in y'attendees' for y in itip_events if y.has_key('attendees') and isinstance(y'attendees', list):
 attendees_raw.extend(list_attendees_raw)
 
- _lars = 
- y'attendees' for y in itip_events
- if 'attendees' in y and isinstance(y'attendees', string_types)
- 
-
- for list_attendees_raw in _lars:
+ for list_attendees_raw in y'attendees' for y in itip_events if y.has_key('attendees') and isinstance(y'attendees', basestring):
 attendees_raw.append(list_attendees_raw)
 
- log.debug(_("Raw set of attendees: %r") % (attendees_raw), level=8)
+ log.debug(_("Raw set of attendees: %r") % (attendees_raw), level=9)
 
 # TODO: Resources are actually not implemented in the format. We reset this
 # list later.
 resources_raw = 
- _lrrs = x for x in y'resources' for y in itip_events if 'resource' in y
-
- for list_resources_raw in _lrrs:
+ for list_resources_raw in x for x in y'resources' for y in itip_events if y.has_key('resources'):
 resources_raw.extend(list_resources_raw)
 
- log.debug(_("Raw set of resources: %r") % (resources_raw), level=8)
+ log.debug(_("Raw set of resources: %r") % (resources_raw), level=9)
 
 # consider organizer (in REPLY messages), too
- organizers_raw = 
- re.sub(r'\+A-Za-z0-9=/-+@', '@', str(y'organizer')) for y in itip_events
- if 'organizer' in y
- 
+ organizers_raw = re.sub('\+A-Za-z0-9=/-+@', '@', str(y'organizer')) for y in itip_events if y.has_key('organizer')
 
 log.debug(_("Raw set of organizers: %r") % (organizers_raw), level=8)
 
+
 # TODO: We expect the format of an attendee line to literally be:
 #
 # ATTENDEE:RSVP=TRUE;ROLE=REQ-PARTICIPANT;MAILTO:lydia.bossers@kolabsys.com
@@ -1339,9 +1045,9 @@
 resource_records.extend(_resource_records)
 log.debug(_("Resource record(s): %r") % (_resource_records), level=8)
 else:
- log.debug(_("No resource (collection) records found for %r") % (attendee), level=8)
+ log.debug(_("No resource (collection) records found for %r") % (attendee), level=9)
 
- elif isinstance(_resource_records, string_types):
+ elif isinstance(_resource_records, basestring):
 resource_records.append(_resource_records)
 log.debug(_("Resource record: %r") % (_resource_records), level=8)
 
@@ -1365,10 +1071,7 @@
 resources = a for a in resources if a == recipient_email
 
 for resource in resources:
- log.debug(
- _("Checking if resource %r is a resource (collection)") % (resource),
- level=8
- )
+ log.debug(_("Checking if resource %r is a resource (collection)") % (resource), level=8)
 
 _resource_records = auth.find_resource(resource)
 if isinstance(_resource_records, list):
@@ -1377,21 +1080,17 @@
 log.debug(_("Resource record(s): %r") % (_resource_records), level=8)
 
 else:
- log.debug(
- _("No resource (collection) records found for %r") % (resource),
- level=8
- )
+ log.debug(_("No resource (collection) records found for %r") % (resource), level=8)
 
- elif isinstance(_resource_records, string_types):
+ elif isinstance(_resource_records, basestring):
 resource_records.append(_resource_records)
 log.debug(_("Resource record: %r") % (_resource_records), level=8)
 else:
 log.warning(_("Resource reservation made but no resource records found"))
 
- log.debug(
- _("The following resources are being referred to in the iTip: %r") % (resource_records),
- level=8
- )
+
+ log.debug(_("The following resources are being referred to in the " + \
+ "iTip: %r") % (resource_records), level=8)
 
 return resource_records
 
@@ -1412,17 +1111,17 @@
 resource_attrs'dn' = resource_dn
 parse_kolabinvitationpolicy(resource_attrs)
 
- if 'kolabsharedfolder' not in x.lower() for x in resource_attrs'objectclass':
- if 'uniquemember' in resource_attrs:
+ if not 'kolabsharedfolder' in x.lower() for x in resource_attrs'objectclass':
+ if resource_attrs.has_key('uniquemember'):
 if not isinstance(resource_attrs'uniquemember', list):
- resource_attrs'uniquemember' = resource_attrs'uniquemember'
+ resource_attrs'uniquemember' = resource_attrs'uniquemember' 
 resourcesresource_dn = resource_attrs
 for uniquemember in resource_attrs'uniquemember':
 member_attrs = auth.get_entry_attributes(
- None,
- uniquemember,
- '*'
- )
+ None,
+ uniquemember,
+ '*'
+ )
 
 if 'kolabsharedfolder' in x.lower() for x in member_attrs'objectclass':
 member_attrs'dn' = uniquemember
@@ -1430,10 +1129,8 @@
 
 resourcesuniquemember = member_attrs
 resourcesuniquemember'memberof' = resource_dn
-
- if 'owner' not in member_attrs and 'owner' in resourcesresource_dn:
+ if not member_attrs.has_key('owner') and resourcesresource_dn.has_key('owner'):
 resourcesuniquemember'owner' = resourcesresource_dn'owner'
-
 resource_dns.append(uniquemember)
 else:
 resourcesresource_dn = resource_attrs
@@ -1442,26 +1139,23 @@
 
 
 def parse_kolabinvitationpolicy(attrs, parent=None):
- if 'kolabinvitationpolicy' in attrs:
+ if attrs.has_key('kolabinvitationpolicy'):
 if not isinstance(attrs'kolabinvitationpolicy', list):
 attrs'kolabinvitationpolicy' = attrs'kolabinvitationpolicy'
+ attrs'kolabinvitationpolicy' = policy_name_mapp for p in attrs'kolabinvitationpolicy' if policy_name_map.has_key(p)
 
- attrs'kolabinvitationpolicy' = 
- policy_name_mapp for p in attrs'kolabinvitationpolicy' if p in policy_name_map
- 
-
- elif isinstance(parent, dict) and 'kolabinvitationpolicy' in parent:
+ elif isinstance(parent, dict) and parent.has_key('kolabinvitationpolicy'):
 attrs'kolabinvitationpolicy' = parent'kolabinvitationpolicy'
 
 
 def get_resource_collection(email_address):
 """
- Obtain a resource collection object from an email address.
+ 
 """
 resource_dns = resource_record_from_email_address(email_address)
 if len(resource_dns) == 1:
 resource_attrs = auth.get_entry_attributes(None, resource_dns0, 'objectclass')
- if 'kolabsharedfolder' not in x.lower() for x in resource_attrs'objectclass':
+ if not 'kolabsharedfolder' in x.lower() for x in resource_attrs'objectclass':
 resources = get_resource_records(resource_dns)
 return (resource_dns, resources)
 
@@ -1480,9 +1174,9 @@
 
 owners = 
 
- if 'owner' in resource:
+ if resource.has_key('owner'):
 if not isinstance(resource'owner', list):
- owners = resource'owner'
+ owners = resource'owner' 
 else:
 owners = resource'owner'
 
@@ -1490,16 +1184,16 @@
 # get owner attribute from collection
 collections = auth.search_entry_by_attribute('uniquemember', resource'dn')
 if not isinstance(collections, list):
- collections = collections
+ collections = collections 
 
- for dn, collection in collections:
- if 'owner' in collection and isinstance(collection'owner', list):
+ for dn,collection in collections:
+ if collection.has_key('owner') and isinstance(collection'owner', list):
 owners += collection'owner'
- elif 'owner' in collection:
+ elif collection.has_key('owner'):
 owners.append(collection'owner')
 
 for dn in owners:
- owner = auth.get_entry_attributes(None, dn, 'cn', 'mail', 'telephoneNumber')
+ owner = auth.get_entry_attributes(None, dn, 'cn','mail','telephoneNumber')
 if owner is not None:
 return owner
 
@@ -1512,7 +1206,7 @@
 """
 global auth
 
- if 'kolabinvitationpolicy' not in resource or resource'kolabinvitationpolicy' is None:
+ if not resource.has_key('kolabinvitationpolicy') or resource'kolabinvitationpolicy' is None:
 if not auth:
 auth = Auth()
 auth.connect()
@@ -1520,24 +1214,21 @@
 # get kolabinvitationpolicy attribute from collection
 collections = auth.search_entry_by_attribute('uniquemember', resource'dn')
 if not isinstance(collections, list):
- collections = (collections'dn', collections)
+ collections = (collections'dn',collections) 
 
- log.debug(
- _("Check collections %r for kolabinvitationpolicy attributes") % (collections),
- level=8
- )
+ log.debug(_("Check collections %r for kolabinvitationpolicy attributes") % (collections), level=9)
 
- for dn, collection in collections:
+ for dn,collection in collections:
 # ldap.search_entry_by_attribute() doesn't return the attributes lower-cased
- if 'kolabInvitationPolicy' in collection:
+ if collection.has_key('kolabInvitationPolicy'):
 collection'kolabinvitationpolicy' = collection'kolabInvitationPolicy'
 
- if 'kolabinvitationpolicy' in collection:
+ if collection.has_key('kolabinvitationpolicy'):
 parse_kolabinvitationpolicy(collection)
 resource'kolabinvitationpolicy' = collection'kolabinvitationpolicy'
 break
 
- return resource'kolabinvitationpolicy' if 'kolabinvitationpolicy' in resource else None
+ return resource'kolabinvitationpolicy' if resource.has_key('kolabinvitationpolicy') else None
 
 
 def send_response(from_address, itip_events, owner=None):
@@ -1548,7 +1239,7 @@
 """
 
 if isinstance(itip_events, dict):
- itip_events = itip_events
+ itip_events = itip_events 
 
 for itip_event in itip_events:
 attendee = itip_event'xml'.get_attendee_by_email(from_address)
@@ -1561,10 +1252,7 @@
 
 # Extra actions to take: send delegated reply
 if participant_status == "DELEGATED":
- delegatee = 
- a for a in itip_event'xml'.get_attendees()
- if from_address in a.get_delegated_from(True)
- 0
+ delegatee = a for a in itip_event'xml'.get_attendees() if from_address in a.get_delegated_from(True)0
 
 delegated_message_text = _("""
 *** This is an automated response, please do not reply! ***
@@ -1572,45 +1260,31 @@
 Your reservation was delegated to "%s" which is available for the requested time.
 """) % (delegatee.get_name())
 
- pykolab.itip.send_reply(
- from_address,
- itip_event,
- delegated_message_text,
- subject=subject_template
- )
+ pykolab.itip.send_reply(from_address, itip_event, delegated_message_text,
+ subject=subject_template)
 
 # adjust some vars for the regular reply from the delegatee
 message_text = reservation_response_text(delegatee.get_participant_status(True), owner)
 from_address = delegatee.get_email()
 time.sleep(2)
 
- pykolab.itip.send_reply(
- from_address,
- itip_event,
- message_text,
- subject=subject_template
- )
+ pykolab.itip.send_reply(from_address, itip_event, message_text,
+ subject=subject_template)
 
 
 def reservation_response_text(status, owner):
 message_text = _("""
 *** This is an automated response, please do not reply! ***
-
+ 
 We hereby inform you that your reservation was %s.
 """) % (participant_status_label(status))
 
 if owner:
- message_text += _(
- """
- If you have questions about this reservation, please contact
- %s <%s> %s
- """
- ) % (
- owner'cn',
- owner'mail',
- owner'telephoneNumber' if 'telephoneNumber' in owner else ''
- )
-
+ message_text += _("""
+ If you have questions about this reservation, please contact
+ %s <%s> %s
+ """) % (owner'cn', owner'mail', owner'telephoneNumber' if owner.has_key('telephoneNumber') else '')
+ 
 return message_text
 
 
@@ -1618,6 +1292,7 @@
 """
 Send a reservation notification to the resource owner
 """
+ import smtplib
 from pykolab import utils
 from email.MIMEText import MIMEText
 from email.Utils import formatdate
@@ -1647,78 +1322,49 @@
 )
 
 # change gettext language to the preferredlanguage setting of the resource owner
- if 'preferredlanguage' in owner:
+ if owner.has_key('preferredlanguage'):
 pykolab.translate.setUserLanguage(owner'preferredlanguage')
 
- message_text = owner_notification_text(resource, owner, itip_event'xml', success, status)
+ message_text = owner_notification_text(resource, owner, itip_event'xml', success)
 
 msg = MIMEText(utils.stripped_message(message_text), _charset='utf-8')
 
 msg'To' = owner'mail'
 msg'From' = resource'mail'
 msg'Date' = formatdate(localtime=True)
- if status == 'NEEDS-ACTION':
- msg'Subject' = utils.str2unicode(_('New booking request for %s') % (
- resource'cn'
- ))
- else:
- msg'Subject' = utils.str2unicode(_('Booking for %s has been %s') % (
- resource'cn', participant_status_label(status) if success else _('failed')
- ))
+ msg'Subject' = utils.str2unicode(_('Booking for %s has been %s') % (
+ resource'cn', participant_status_label(status) if success else _('failed')
+ ))
 
- seed = random.randint(0, 6)
- alarm_after = (seed * 10) + 60
- log.debug(_("Set alarm to %s seconds") % (alarm_after), level=8)
- signal.alarm(alarm_after)
+ smtp = smtplib.SMTP("localhost", 10027)
 
- result = modules._sendmail(resource'mail', owner'mail', msg.as_string())
- log.debug(_("Owner notification was sent successfully: %r") % result, level=8)
- signal.alarm(0)
+ if conf.debuglevel > 8:
+ smtp.set_debuglevel(True)
 
+ try:
+ smtp.sendmail(resource'mail', owner'mail', msg.as_string())
+ except Exception, e:
+ log.error(_("SMTP sendmail error: %r") % (e))
 
-def owner_notification_text(resource, owner, event, success, status):
+ smtp.quit()
+
+def owner_notification_text(resource, owner, event, success):
 organizer = event.get_organizer()
 status = event.get_attendee_by_email(resource'mail').get_participant_status(True)
- domain = resource'mail'.split('@')1
- url = conf.get('wallace', 'webmail_url')
 
 if success:
- if status == 'NEEDS-ACTION':
- message_text = _(
- """
- The resource booking request is for %(resource)s by %(orgname)s <%(orgemail)s> for %(date)s.
+ message_text = _("""
+ The resource booking for %(resource)s by %(orgname)s <%(orgemail)s> has been %(status)s for %(date)s.
 
- *** This is an automated message, sent to you as the resource owner. ***
- """
- )
- else:
- message_text = _(
- """
- The resource booking for %(resource)s by %(orgname)s <%(orgemail)s> has been
- %(status)s for %(date)s.
-
- *** This is an automated message, sent to you as the resource owner. ***
- """
- )
-
-
- if url:
- message_text += (
- "\n "
- + _("You can change the status via %(url)s") % { 'url': url } + '?_task=calendar'
- )
+ *** This is an automated message, sent to you as the resource owner. ***
+ """)
 else:
- message_text = _(
- """
- A reservation request for %(resource)s could not be processed automatically.
-
- Please contact %(orgname)s <%(orgemail)s> who requested this resource for %(date)s.
-
- Subject for the event: %(summary)s.
+ message_text = _("""
+ A reservation request for %(resource)s could not be processed automatically.
+ Please contact %(orgname)s <%(orgemail)s> who requested this resource for %(date)s. Subject: %(summary)s.
 
- *** This is an automated message, sent to you as the resource owner. ***
- """
- )
+ *** This is an automated message, sent to you as the resource owner. ***
+ """)
 
 return message_text % {
 'resource': resource'cn',
@@ -1726,27 +1372,22 @@
 'date': event.get_date_text(),
 'status': participant_status_label(status),
 'orgname': organizer.name(),
- 'orgemail': organizer.email(),
- 'domain': domain
+ 'orgemail': organizer.email()
 }
 
 
 def send_owner_confirmation(resource, owner, itip_event):
 """
- Send a reservation request to the resource owner for manual confirmation (ACCEPT or
- DECLINE).
+ Send a reservation request to the resource owner for manual confirmation (ACCEPT or DECLINE)
 
- This clones the given invtation with a new UID and setting the resource as organizer in
- order to receive the reply from the owner.
+ This clones the given invtation with a new UID and setting the resource as organizer in order to
+ receive the reply from the owner.
 """
 
 uid = itip_event'uid'
 event = itip_event'xml'
 organizer = event.get_organizer()
- event_attendees = 
- a.get_displayname() for a in event.get_attendees()
- if not a.get_cutype() == kolabformat.CutypeResource
- 
+ event_attendees = a.get_displayname() for a in event.get_attendees() if not a.get_cutype() == kolabformat.CutypeResource
 
 log.debug(
 _("Clone invitation for owner confirmation: %r from %r") % (
@@ -1763,31 +1404,23 @@
 
 # add resource owner as (the sole) attendee
 event._attendees = 
- event.add_attendee(
- owner'mail',
- owner'cn',
- rsvp=True,
- role=kolabformat.Required,
- participant_status=kolabformat.PartNeedsAction
- )
+ event.add_attendee(owner'mail', owner'cn', rsvp=True, role=kolabformat.Required, participant_status=kolabformat.PartNeedsAction)
 
 # flag this iTip message as confirmation type
 event.add_custom_property('X-Kolab-InvitationType', 'CONFIRMATION')
 
- message_text = _(
- """
- A reservation request for %(resource)s requires your approval!
- Please either accept or decline this invitation without saving it to your calendar.
+ message_text = _("""
+ A reservation request for %(resource)s requires your approval!
+ Please either accept or decline this invitation without saving it to your calendar.
 
- The reservation request was sent from %(orgname)s <%(orgemail)s>.
+ The reservation request was sent from %(orgname)s <%(orgemail)s>.
 
- Subject: %(summary)s.
- Date: %(date)s
- Participants: %(attendees)s
+ Subject: %(summary)s.
+ Date: %(date)s
+ Participants: %(attendees)s
 
- *** This is an automated message, please don't reply by email. ***
- """
- ) % {
+ *** This is an automated message, please don't reply by email. ***
+ """)% {
 'resource': resource'cn',
 'orgname': organizer.name(),
 'orgemail': organizer.email(),
@@ -1796,10 +1429,8 @@
 'attendees': ",\n+ ".join(event_attendees)
 }
 
- pykolab.itip.send_request(
- owner'mail',
- itip_event,
- message_text,
+ pykolab.itip.send_request(owner'mail', itip_event, message_text,
 subject=_('Booking request for %s requires confirmation') % (resource'cn'),
- direct=True
- )
+ direct=True)
+
+

pykolab-0.8.23.tar.gz/wallace/modules.py -> pykolab-0.8.4.tar.gz/wallace/modules.py Changed

pykolab-0.8.23.tar.gz/wallace/wallace.systemd -> pykolab-0.8.4.tar.gz/wallace/wallace.systemd Changed

pykolab.dsc Changed

@@ -2,8 +2,8 @@
 Source: pykolab
 Binary: pykolab, kolab-cli, kolab-conf, kolab-saslauthd, kolab-server, kolab-telemetry, kolab-xml, wallace
 Architecture: all
-Version: 0.8.23-0~kolab1
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+Version: 0.8.4-0~kolab1
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.kolab.org
 Standards-Version: 3.9.3
@@ -14,12 +14,13 @@
 gawk,
 gettext,
 intltool,
+ libcroco3,
 libexpat1,
 libglib2.0-0,
 libglib2.0-dev,
 libpcre3,
 libssl-dev,
- libunistring2 | libunistring0,
+ libunistring0,
 libxml-parser-perl,
 libxml2,
 mime-support,
@@ -27,7 +28,6 @@
 python-icalendar,
 python-minimal,
 python-nose,
- python-six,
 python-tzlocal,
 univention-config-dev | bash (>= 1.0)
 Package-List:
@@ -40,5 +40,5 @@
 pykolab deb python optional
 wallace deb python optional
 Files:
- 00000000000000000000000000000000 0 pykolab-0.8.23.tar.gz
+ 00000000000000000000000000000000 0 pykolab-0.8.4.tar.gz
 00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 1796 0

Request History

tpokorra created request over 8 years ago

fix for setup-kolab

vanmeeuwen declined request over 8 years ago

No longer needed.

vanmeeuwen declined review over 8 years ago

No longer needed.

tpokorra revoked request about 8 years ago

thanks for upgrading pykolab to 0.8.5