summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pykolab/__init__.py3
-rw-r--r--pykolab/auth/ldap/__init__.py6
-rw-r--r--pykolab/cli/__init__.py2
-rw-r--r--pykolab/cli/cmd_acl_cleanup.py2
-rw-r--r--pykolab/cli/cmd_add_alias.py2
-rw-r--r--pykolab/cli/cmd_add_domain.py2
-rw-r--r--pykolab/cli/cmd_add_user.py2
-rw-r--r--pykolab/cli/cmd_add_user_subscription.py2
-rw-r--r--pykolab/cli/cmd_check_quota.py2
-rw-r--r--pykolab/cli/cmd_count_domain_mailboxes.py2
-rw-r--r--pykolab/cli/cmd_create_mailbox.py2
-rw-r--r--pykolab/cli/cmd_delete_domain.py2
-rw-r--r--pykolab/cli/cmd_delete_mailbox.py2
-rw-r--r--pykolab/cli/cmd_delete_mailbox_acl.py2
-rw-r--r--pykolab/cli/cmd_delete_message.py2
-rw-r--r--pykolab/cli/cmd_export_mailbox.py2
-rw-r--r--pykolab/cli/cmd_find_domain.py2
-rw-r--r--pykolab/cli/cmd_list_deleted_mailboxes.py2
-rw-r--r--pykolab/cli/cmd_list_domain_mailboxes.py2
-rw-r--r--pykolab/cli/cmd_list_domains.py2
-rw-r--r--pykolab/cli/cmd_list_mailbox_acls.py2
-rw-r--r--pykolab/cli/cmd_list_mailbox_metadata.py2
-rw-r--r--pykolab/cli/cmd_list_mailboxes.py2
-rw-r--r--pykolab/cli/cmd_list_messages.py2
-rw-r--r--pykolab/cli/cmd_list_ous.py2
-rw-r--r--pykolab/cli/cmd_list_quota.py2
-rw-r--r--pykolab/cli/cmd_list_user_subscriptions.py2
-rw-r--r--pykolab/cli/cmd_list_users.py2
-rw-r--r--pykolab/cli/cmd_mailbox_cleanup.py2
-rw-r--r--pykolab/cli/cmd_remove_mailaddress.py2
-rw-r--r--pykolab/cli/cmd_remove_user_subscription.py2
-rw-r--r--pykolab/cli/cmd_rename_mailbox.py2
-rw-r--r--pykolab/cli/cmd_server_info.py2
-rw-r--r--pykolab/cli/cmd_set_language.py2
-rw-r--r--pykolab/cli/cmd_set_mail.py2
-rw-r--r--pykolab/cli/cmd_set_mailbox_acl.py2
-rw-r--r--pykolab/cli/cmd_set_mailbox_metadata.py2
-rw-r--r--pykolab/cli/cmd_set_quota.py2
-rw-r--r--pykolab/cli/cmd_sync.py2
-rw-r--r--pykolab/cli/cmd_sync_mailhost_attrs.py2
-rw-r--r--pykolab/cli/cmd_transfer_mailbox.py2
-rw-r--r--pykolab/cli/cmd_undelete_mailbox.py2
-rw-r--r--pykolab/cli/cmd_user_info.py2
-rw-r--r--pykolab/imap/__init__.py4
-rw-r--r--pykolab/setup/__init__.py2
-rw-r--r--pykolab/setup/setup_freebusy.py2
-rw-r--r--pykolab/setup/setup_guam.py2
-rw-r--r--pykolab/setup/setup_imap.py2
-rw-r--r--pykolab/setup/setup_kolabd.py2
-rw-r--r--pykolab/setup/setup_ldap.py2
-rw-r--r--pykolab/setup/setup_manticore.py2
-rw-r--r--pykolab/setup/setup_mta.py2
-rw-r--r--pykolab/setup/setup_mysql.py2
-rw-r--r--pykolab/setup/setup_php.py2
-rw-r--r--pykolab/setup/setup_roundcube.py2
-rw-r--r--pykolab/setup/setup_syncroton.py2
-rw-r--r--pykolab/xml/__init__.py58
-rw-r--r--pykolab/xml/attendee.py2
-rw-r--r--pykolab/xml/event.py6
-rw-r--r--wallace/__init__.py4
-rw-r--r--wallace/module_footer.py2
-rw-r--r--wallace/module_gpgencrypt.py2
-rw-r--r--wallace/module_invitationpolicy.py2
-rw-r--r--wallace/module_optout.py2
-rw-r--r--wallace/module_resources.py2
-rw-r--r--wallace/module_signature.py2
66 files changed, 101 insertions, 100 deletions
diff --git a/pykolab/__init__.py b/pykolab/__init__.py
index 09e3267..fdbc3a6 100644
--- a/pykolab/__init__.py
+++ b/pykolab/__init__.py
@@ -52,4 +52,5 @@ def getConf():
return conf
-import base
+from . import base
+
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index a2edf12..2b3e56a 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -48,8 +48,8 @@ from pykolab.constants import SUPPORTED_LDAP_CONTROLS
from pykolab.errors import *
from pykolab.translate import _ as _l
-import auth_cache
-import cache
+from . import auth_cache
+from . import cache
# pylint: disable=invalid-name
log = pykolab.getLogger('pykolab.auth')
@@ -3038,7 +3038,7 @@ class LDAP(Base):
):
import ldapurl
- import syncrepl
+ from . import syncrepl
ldap_url = ldapurl.LDAPUrl(self.config_get('ldap_uri'))
diff --git a/pykolab/cli/__init__.py b/pykolab/cli/__init__.py
index 46c9930..3aafd03 100644
--- a/pykolab/cli/__init__.py
+++ b/pykolab/cli/__init__.py
@@ -42,7 +42,7 @@ conf = pykolab.getConf()
class Cli(object):
def __init__(self):
- import commands
+ from . import commands
commands.__init__()
to_execute = []
diff --git a/pykolab/cli/cmd_acl_cleanup.py b/pykolab/cli/cmd_acl_cleanup.py
index 2d6bd6e..54cfd38 100644
--- a/pykolab/cli/cmd_acl_cleanup.py
+++ b/pykolab/cli/cmd_acl_cleanup.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_add_alias.py b/pykolab/cli/cmd_add_alias.py
index 81ca005..8f90032 100644
--- a/pykolab/cli/cmd_add_alias.py
+++ b/pykolab/cli/cmd_add_alias.py
@@ -22,7 +22,7 @@ from six import string_types
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_add_domain.py b/pykolab/cli/cmd_add_domain.py
index fecd82a..8034281 100644
--- a/pykolab/cli/cmd_add_domain.py
+++ b/pykolab/cli/cmd_add_domain.py
@@ -19,7 +19,7 @@
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_add_user.py b/pykolab/cli/cmd_add_user.py
index 09cc08c..b01b9ad 100644
--- a/pykolab/cli/cmd_add_user.py
+++ b/pykolab/cli/cmd_add_user.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_add_user_subscription.py b/pykolab/cli/cmd_add_user_subscription.py
index 06ac0e2..50ba9af 100644
--- a/pykolab/cli/cmd_add_user_subscription.py
+++ b/pykolab/cli/cmd_add_user_subscription.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_check_quota.py b/pykolab/cli/cmd_check_quota.py
index cae5077..c102735 100644
--- a/pykolab/cli/cmd_check_quota.py
+++ b/pykolab/cli/cmd_check_quota.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_count_domain_mailboxes.py b/pykolab/cli/cmd_count_domain_mailboxes.py
index 47bbcb1..0559bcc 100644
--- a/pykolab/cli/cmd_count_domain_mailboxes.py
+++ b/pykolab/cli/cmd_count_domain_mailboxes.py
@@ -19,7 +19,7 @@
import datetime
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_create_mailbox.py b/pykolab/cli/cmd_create_mailbox.py
index 9e91800..4da5c47 100644
--- a/pykolab/cli/cmd_create_mailbox.py
+++ b/pykolab/cli/cmd_create_mailbox.py
@@ -19,7 +19,7 @@
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_delete_domain.py b/pykolab/cli/cmd_delete_domain.py
index 60ca55b..28bbcaf 100644
--- a/pykolab/cli/cmd_delete_domain.py
+++ b/pykolab/cli/cmd_delete_domain.py
@@ -19,7 +19,7 @@
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_delete_mailbox.py b/pykolab/cli/cmd_delete_mailbox.py
index 40f8b44..66ec534 100644
--- a/pykolab/cli/cmd_delete_mailbox.py
+++ b/pykolab/cli/cmd_delete_mailbox.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_delete_mailbox_acl.py b/pykolab/cli/cmd_delete_mailbox_acl.py
index d146aac..c15f85b 100644
--- a/pykolab/cli/cmd_delete_mailbox_acl.py
+++ b/pykolab/cli/cmd_delete_mailbox_acl.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_delete_message.py b/pykolab/cli/cmd_delete_message.py
index 5c7c242..5f68ee8 100644
--- a/pykolab/cli/cmd_delete_message.py
+++ b/pykolab/cli/cmd_delete_message.py
@@ -19,7 +19,7 @@
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_export_mailbox.py b/pykolab/cli/cmd_export_mailbox.py
index 78d55f1..f37c7b2 100644
--- a/pykolab/cli/cmd_export_mailbox.py
+++ b/pykolab/cli/cmd_export_mailbox.py
@@ -19,7 +19,7 @@
from __future__ import print_function
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_find_domain.py b/pykolab/cli/cmd_find_domain.py
index f65af3f..64dc2de 100644
--- a/pykolab/cli/cmd_find_domain.py
+++ b/pykolab/cli/cmd_find_domain.py
@@ -19,7 +19,7 @@
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_deleted_mailboxes.py b/pykolab/cli/cmd_list_deleted_mailboxes.py
index 55b6b9f..6596142 100644
--- a/pykolab/cli/cmd_list_deleted_mailboxes.py
+++ b/pykolab/cli/cmd_list_deleted_mailboxes.py
@@ -19,7 +19,7 @@
import datetime
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_domain_mailboxes.py b/pykolab/cli/cmd_list_domain_mailboxes.py
index fd9a7fd..602fc5d 100644
--- a/pykolab/cli/cmd_list_domain_mailboxes.py
+++ b/pykolab/cli/cmd_list_domain_mailboxes.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_domains.py b/pykolab/cli/cmd_list_domains.py
index e76edca..d72ed71 100644
--- a/pykolab/cli/cmd_list_domains.py
+++ b/pykolab/cli/cmd_list_domains.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_mailbox_acls.py b/pykolab/cli/cmd_list_mailbox_acls.py
index dc86e47..d4f76d5 100644
--- a/pykolab/cli/cmd_list_mailbox_acls.py
+++ b/pykolab/cli/cmd_list_mailbox_acls.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_mailbox_metadata.py b/pykolab/cli/cmd_list_mailbox_metadata.py
index 27d881c..7734770 100644
--- a/pykolab/cli/cmd_list_mailbox_metadata.py
+++ b/pykolab/cli/cmd_list_mailbox_metadata.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_mailboxes.py b/pykolab/cli/cmd_list_mailboxes.py
index 738cd86..3cb7f03 100644
--- a/pykolab/cli/cmd_list_mailboxes.py
+++ b/pykolab/cli/cmd_list_mailboxes.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_messages.py b/pykolab/cli/cmd_list_messages.py
index 786a5f0..af2c447 100644
--- a/pykolab/cli/cmd_list_messages.py
+++ b/pykolab/cli/cmd_list_messages.py
@@ -19,7 +19,7 @@
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_ous.py b/pykolab/cli/cmd_list_ous.py
index 61a4cb9..46b991f 100644
--- a/pykolab/cli/cmd_list_ous.py
+++ b/pykolab/cli/cmd_list_ous.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_quota.py b/pykolab/cli/cmd_list_quota.py
index d956168..7dd6b9d 100644
--- a/pykolab/cli/cmd_list_quota.py
+++ b/pykolab/cli/cmd_list_quota.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_user_subscriptions.py b/pykolab/cli/cmd_list_user_subscriptions.py
index ad6e549..3d90812 100644
--- a/pykolab/cli/cmd_list_user_subscriptions.py
+++ b/pykolab/cli/cmd_list_user_subscriptions.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_list_users.py b/pykolab/cli/cmd_list_users.py
index a17eeba..bb5506e 100644
--- a/pykolab/cli/cmd_list_users.py
+++ b/pykolab/cli/cmd_list_users.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_mailbox_cleanup.py b/pykolab/cli/cmd_mailbox_cleanup.py
index 656a978..ccc964d 100644
--- a/pykolab/cli/cmd_mailbox_cleanup.py
+++ b/pykolab/cli/cmd_mailbox_cleanup.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_remove_mailaddress.py b/pykolab/cli/cmd_remove_mailaddress.py
index 120c2d9..cfc4f89 100644
--- a/pykolab/cli/cmd_remove_mailaddress.py
+++ b/pykolab/cli/cmd_remove_mailaddress.py
@@ -22,7 +22,7 @@ from six import string_types
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_remove_user_subscription.py b/pykolab/cli/cmd_remove_user_subscription.py
index b16249c..208ff4a 100644
--- a/pykolab/cli/cmd_remove_user_subscription.py
+++ b/pykolab/cli/cmd_remove_user_subscription.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_rename_mailbox.py b/pykolab/cli/cmd_rename_mailbox.py
index 4373acf..b46c79d 100644
--- a/pykolab/cli/cmd_rename_mailbox.py
+++ b/pykolab/cli/cmd_rename_mailbox.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_server_info.py b/pykolab/cli/cmd_server_info.py
index 0ae0c0e..f0f867a 100644
--- a/pykolab/cli/cmd_server_info.py
+++ b/pykolab/cli/cmd_server_info.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_set_language.py b/pykolab/cli/cmd_set_language.py
index 83b5d95..df575c5 100644
--- a/pykolab/cli/cmd_set_language.py
+++ b/pykolab/cli/cmd_set_language.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_set_mail.py b/pykolab/cli/cmd_set_mail.py
index 0b457cb..97512fd 100644
--- a/pykolab/cli/cmd_set_mail.py
+++ b/pykolab/cli/cmd_set_mail.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_set_mailbox_acl.py b/pykolab/cli/cmd_set_mailbox_acl.py
index 63b5c2d..a18c48b 100644
--- a/pykolab/cli/cmd_set_mailbox_acl.py
+++ b/pykolab/cli/cmd_set_mailbox_acl.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_set_mailbox_metadata.py b/pykolab/cli/cmd_set_mailbox_metadata.py
index 91aec50..339b664 100644
--- a/pykolab/cli/cmd_set_mailbox_metadata.py
+++ b/pykolab/cli/cmd_set_mailbox_metadata.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_set_quota.py b/pykolab/cli/cmd_set_quota.py
index b6c89c1..3692f10 100644
--- a/pykolab/cli/cmd_set_quota.py
+++ b/pykolab/cli/cmd_set_quota.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_sync.py b/pykolab/cli/cmd_sync.py
index 2aaf9df..85952cb 100644
--- a/pykolab/cli/cmd_sync.py
+++ b/pykolab/cli/cmd_sync.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
from distutils import version
import multiprocessing
diff --git a/pykolab/cli/cmd_sync_mailhost_attrs.py b/pykolab/cli/cmd_sync_mailhost_attrs.py
index 4d9663f..a3e200f 100644
--- a/pykolab/cli/cmd_sync_mailhost_attrs.py
+++ b/pykolab/cli/cmd_sync_mailhost_attrs.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_transfer_mailbox.py b/pykolab/cli/cmd_transfer_mailbox.py
index 1593eea..071eda4 100644
--- a/pykolab/cli/cmd_transfer_mailbox.py
+++ b/pykolab/cli/cmd_transfer_mailbox.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_undelete_mailbox.py b/pykolab/cli/cmd_undelete_mailbox.py
index 5b74a64..35b7a2f 100644
--- a/pykolab/cli/cmd_undelete_mailbox.py
+++ b/pykolab/cli/cmd_undelete_mailbox.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/cli/cmd_user_info.py b/pykolab/cli/cmd_user_info.py
index beaeb40..eb7dfcb 100644
--- a/pykolab/cli/cmd_user_info.py
+++ b/pykolab/cli/cmd_user_info.py
@@ -21,7 +21,7 @@ from __future__ import print_function
import sys
-import commands
+from . import commands
import pykolab
diff --git a/pykolab/imap/__init__.py b/pykolab/imap/__init__.py
index e5ecfa8..171e4e5 100644
--- a/pykolab/imap/__init__.py
+++ b/pykolab/imap/__init__.py
@@ -178,7 +178,7 @@ class IMAP(object):
if hostname not in self._imap:
if backend == 'cyrus-imap':
- import cyrus
+ from . import cyrus
self._imap[hostname] = cyrus.Cyrus(uri)
# Actually connect
if login:
@@ -187,7 +187,7 @@ class IMAP(object):
self._imap[hostname].logged_in = True
elif backend == 'dovecot':
- import dovecot
+ from . import dovecot
self._imap[hostname] = dovecot.Dovecot(uri)
# Actually connect
if login:
diff --git a/pykolab/setup/__init__.py b/pykolab/setup/__init__.py
index 26638b0..f23d358 100644
--- a/pykolab/setup/__init__.py
+++ b/pykolab/setup/__init__.py
@@ -30,7 +30,7 @@ to_execute = []
class Setup(object):
def __init__(self):
- import components
+ from . import components
components.__init__()
arg_num = 0
diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index 09203a6..f492f73 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -30,7 +30,7 @@ try:
except ImportError:
from urllib.parse import urlparse
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_guam.py b/pykolab/setup/setup_guam.py
index 6a23527..16b407f 100644
--- a/pykolab/setup/setup_guam.py
+++ b/pykolab/setup/setup_guam.py
@@ -23,7 +23,7 @@ import subprocess
import sys
import time
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_imap.py b/pykolab/setup/setup_imap.py
index c55582e..e145c0f 100644
--- a/pykolab/setup/setup_imap.py
+++ b/pykolab/setup/setup_imap.py
@@ -22,7 +22,7 @@ from Cheetah.Template import Template
import os
import subprocess
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_kolabd.py b/pykolab/setup/setup_kolabd.py
index 54892ce..2c4a78e 100644
--- a/pykolab/setup/setup_kolabd.py
+++ b/pykolab/setup/setup_kolabd.py
@@ -20,7 +20,7 @@
import os
import subprocess
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index fb865e9..9765545 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -28,7 +28,7 @@ import subprocess
import tempfile
import time
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_manticore.py b/pykolab/setup/setup_manticore.py
index 2f17244..c199ec6 100644
--- a/pykolab/setup/setup_manticore.py
+++ b/pykolab/setup/setup_manticore.py
@@ -26,7 +26,7 @@ import subprocess
import sys
import time
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index a880a5a..db8766d 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -23,7 +23,7 @@ import os
import shutil
import subprocess
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py
index 335c353..96ad202 100644
--- a/pykolab/setup/setup_mysql.py
+++ b/pykolab/setup/setup_mysql.py
@@ -24,7 +24,7 @@ import subprocess
import tempfile
import time
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_php.py b/pykolab/setup/setup_php.py
index cbb93c0..a8fa654 100644
--- a/pykolab/setup/setup_php.py
+++ b/pykolab/setup/setup_php.py
@@ -24,7 +24,7 @@ import shutil
import subprocess
import tempfile
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index b5567be..462c23a 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -31,7 +31,7 @@ import time
from Cheetah.Template import Template
-import components
+from . import components
import pykolab
diff --git a/pykolab/setup/setup_syncroton.py b/pykolab/setup/setup_syncroton.py
index 8ad2d8c..507ebf8 100644
--- a/pykolab/setup/setup_syncroton.py
+++ b/pykolab/setup/setup_syncroton.py
@@ -24,7 +24,7 @@ import subprocess
import sys
import time
-import components
+from . import components
import pykolab
diff --git a/pykolab/xml/__init__.py b/pykolab/xml/__init__.py
index 99a269b..12ac4e6 100644
--- a/pykolab/xml/__init__.py
+++ b/pykolab/xml/__init__.py
@@ -1,37 +1,37 @@
-from attendee import Attendee
-from attendee import InvalidAttendeeParticipantStatusError
-from attendee import participant_status_label
+from .attendee import Attendee
+from .attendee import InvalidAttendeeParticipantStatusError
+from .attendee import participant_status_label
-from contact import Contact
-from contact import ContactIntegrityError
-from contact import contact_from_string
-from contact import contact_from_message
-from contact_reference import ContactReference
-from recurrence_rule import RecurrenceRule
+from .contact import Contact
+from .contact import ContactIntegrityError
+from .contact import contact_from_string
+from .contact import contact_from_message
+from .contact_reference import ContactReference
+from .recurrence_rule import RecurrenceRule
-from event import Event
-from event import EventIntegrityError
-from event import InvalidEventDateError
-from event import InvalidEventStatusError
-from event import event_from_ical
-from event import event_from_string
-from event import event_from_message
+from .event import Event
+from .event import EventIntegrityError
+from .event import InvalidEventDateError
+from .event import InvalidEventStatusError
+from .event import event_from_ical
+from .event import event_from_string
+from .event import event_from_message
-from todo import Todo
-from todo import TodoIntegrityError
-from todo import todo_from_ical
-from todo import todo_from_string
-from todo import todo_from_message
+from .todo import Todo
+from .todo import TodoIntegrityError
+from .todo import todo_from_ical
+from .todo import todo_from_string
+from .todo import todo_from_message
-from note import Note
-from note import NoteIntegrityError
-from note import note_from_string
-from note import note_from_message
+from .note import Note
+from .note import NoteIntegrityError
+from .note import note_from_string
+from .note import note_from_message
-from utils import property_label
-from utils import property_to_string
-from utils import compute_diff
-from utils import to_dt
+from .utils import property_label
+from .utils import property_to_string
+from .utils import compute_diff
+from .utils import to_dt
__all__ = [
"Attendee",
diff --git a/pykolab/xml/attendee.py b/pykolab/xml/attendee.py
index 050a1d5..cd8458f 100644
--- a/pykolab/xml/attendee.py
+++ b/pykolab/xml/attendee.py
@@ -3,7 +3,7 @@ import kolabformat
from pykolab.translate import _
from pykolab.translate import N_
-from contact_reference import ContactReference
+from .contact_reference import ContactReference
participant_status_labels = {
"NEEDS-ACTION": N_("Needs Action"),
diff --git a/pykolab/xml/event.py b/pykolab/xml/event.py
index 3b4fb29..cfd9289 100644
--- a/pykolab/xml/event.py
+++ b/pykolab/xml/event.py
@@ -18,9 +18,9 @@ from pykolab.xml.utils import ustr
from pykolab.translate import _
from os import path
-from attendee import Attendee
-from contact_reference import ContactReference
-from recurrence_rule import RecurrenceRule
+from .attendee import Attendee
+from .contact_reference import ContactReference
+from .recurrence_rule import RecurrenceRule
from collections import OrderedDict
log = pykolab.getLogger('pykolab.xml_event')
diff --git a/wallace/__init__.py b/wallace/__init__.py
index 4a22e3e..4f73ac6 100644
--- a/wallace/__init__.py
+++ b/wallace/__init__.py
@@ -39,8 +39,8 @@ from pykolab import utils
from pykolab.logger import StderrToLogger
from pykolab.translate import _ as _l
-import modules
-from modules import cb_action_ACCEPT
+from . import modules
+from .modules import cb_action_ACCEPT
# pylint: disable=invalid-name
log = pykolab.getLogger('pykolab.wallace')
diff --git a/wallace/module_footer.py b/wallace/module_footer.py
index 2833a59..96e8cf6 100644
--- a/wallace/module_footer.py
+++ b/wallace/module_footer.py
@@ -25,7 +25,7 @@ import time
from email import message_from_file
from email.encoders import encode_quopri
-import modules
+from . import modules
import pykolab
from pykolab.translate import _
diff --git a/wallace/module_gpgencrypt.py b/wallace/module_gpgencrypt.py
index 9083055..e98bf0d 100644
--- a/wallace/module_gpgencrypt.py
+++ b/wallace/module_gpgencrypt.py
@@ -34,7 +34,7 @@ import email.mime.text
import email.encoders
import gnupg
-import modules
+from . import modules
import pykolab
diff --git a/wallace/module_invitationpolicy.py b/wallace/module_invitationpolicy.py
index 38dfc70..da6eec9 100644
--- a/wallace/module_invitationpolicy.py
+++ b/wallace/module_invitationpolicy.py
@@ -38,7 +38,7 @@ from email.parser import Parser
from email.utils import formataddr
from email.utils import getaddresses
-import modules
+from . import modules
import pykolab
import kolabformat
diff --git a/wallace/module_optout.py b/wallace/module_optout.py
index 6e44378..9220ebe 100644
--- a/wallace/module_optout.py
+++ b/wallace/module_optout.py
@@ -32,7 +32,7 @@ from email import message_from_file
from email.utils import formataddr
from email.utils import getaddresses
-import modules
+from . import modules
import pykolab
diff --git a/wallace/module_resources.py b/wallace/module_resources.py
index e29f193..afaf384 100644
--- a/wallace/module_resources.py
+++ b/wallace/module_resources.py
@@ -36,7 +36,7 @@ import uuid
from dateutil.tz import tzlocal
-import modules
+from . import modules
import kolabformat
diff --git a/wallace/module_signature.py b/wallace/module_signature.py
index c483d93..cfebcb5 100644
--- a/wallace/module_signature.py
+++ b/wallace/module_signature.py
@@ -26,7 +26,7 @@ from email.encoders import encode_quopri
from email.parser import Parser
from email.utils import getaddresses
-import modules
+from . import modules
import pykolab
from pykolab.auth import Auth