D3391.1775206536.diff
No OneTemporary
Actions

Authored By

Unknown

Size

21 KB

Referenced Files

None

Subscribers

None

D3391.1775206536.diff
View Options

	diff --git a/pykolab/__init__.py b/pykolab/__init__.py
	--- a/pykolab/__init__.py
	+++ b/pykolab/__init__.py
	@@ -52,4 +52,5 @@

	return conf

	-import base
	+from . import base
	+
	diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
	--- a/pykolab/auth/ldap/__init__.py
	+++ b/pykolab/auth/ldap/__init__.py
	@@ -48,8 +48,8 @@
	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 @@
	):

	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
	--- a/pykolab/cli/__init__.py
	+++ b/pykolab/cli/__init__.py
	@@ -42,7 +42,7 @@

	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
	--- 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
	--- a/pykolab/cli/cmd_add_alias.py
	+++ b/pykolab/cli/cmd_add_alias.py
	@@ -22,7 +22,7 @@

	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
	--- 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
	--- 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
	--- a/pykolab/cli/cmd_add_user_subscription.py
	+++ b/pykolab/cli/cmd_add_user_subscription.py
	@@ -21,7 +21,7 @@

	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
	--- a/pykolab/cli/cmd_check_quota.py
	+++ b/pykolab/cli/cmd_check_quota.py
	@@ -21,7 +21,7 @@

	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
	--- 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
	--- 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
	--- 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
	--- a/pykolab/cli/cmd_delete_mailbox.py
	+++ b/pykolab/cli/cmd_delete_mailbox.py
	@@ -21,7 +21,7 @@

	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
	--- a/pykolab/cli/cmd_delete_mailbox_acl.py
	+++ b/pykolab/cli/cmd_delete_mailbox_acl.py
	@@ -21,7 +21,7 @@

	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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/pykolab/cli/cmd_list_mailbox_acls.py
	+++ b/pykolab/cli/cmd_list_mailbox_acls.py
	@@ -21,7 +21,7 @@

	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
	--- a/pykolab/cli/cmd_list_mailbox_metadata.py
	+++ b/pykolab/cli/cmd_list_mailbox_metadata.py
	@@ -21,7 +21,7 @@

	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
	--- 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
	--- 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
	--- 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
	--- a/pykolab/cli/cmd_list_quota.py
	+++ b/pykolab/cli/cmd_list_quota.py
	@@ -21,7 +21,7 @@

	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
	--- 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
	--- 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
	--- 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
	--- a/pykolab/cli/cmd_remove_mailaddress.py
	+++ b/pykolab/cli/cmd_remove_mailaddress.py
	@@ -22,7 +22,7 @@

	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
	--- a/pykolab/cli/cmd_remove_user_subscription.py
	+++ b/pykolab/cli/cmd_remove_user_subscription.py
	@@ -21,7 +21,7 @@

	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
	--- a/pykolab/cli/cmd_rename_mailbox.py
	+++ b/pykolab/cli/cmd_rename_mailbox.py
	@@ -21,7 +21,7 @@

	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
	--- 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
	--- 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
	--- 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
	--- a/pykolab/cli/cmd_set_mailbox_acl.py
	+++ b/pykolab/cli/cmd_set_mailbox_acl.py
	@@ -21,7 +21,7 @@

	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
	--- a/pykolab/cli/cmd_set_mailbox_metadata.py
	+++ b/pykolab/cli/cmd_set_mailbox_metadata.py
	@@ -21,7 +21,7 @@

	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
	--- a/pykolab/cli/cmd_set_quota.py
	+++ b/pykolab/cli/cmd_set_quota.py
	@@ -21,7 +21,7 @@

	import sys

	-import commands
	+from . import commands

	import pykolab

	diff --git a/pykolab/cli/cmd_sync.py b/pykolab/cli/cmd_sync.py
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/pykolab/cli/cmd_user_info.py
	+++ b/pykolab/cli/cmd_user_info.py
	@@ -21,7 +21,7 @@

	import sys

	-import commands
	+from . import commands

	import pykolab

	diff --git a/pykolab/imap/__init__.py b/pykolab/imap/__init__.py
	--- a/pykolab/imap/__init__.py
	+++ b/pykolab/imap/__init__.py
	@@ -178,7 +178,7 @@

	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 @@
	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
	--- a/pykolab/setup/__init__.py
	+++ b/pykolab/setup/__init__.py
	@@ -30,7 +30,7 @@

	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
	--- a/pykolab/setup/setup_freebusy.py
	+++ b/pykolab/setup/setup_freebusy.py
	@@ -30,7 +30,7 @@
	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
	--- a/pykolab/setup/setup_guam.py
	+++ b/pykolab/setup/setup_guam.py
	@@ -23,7 +23,7 @@
	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
	--- a/pykolab/setup/setup_imap.py
	+++ b/pykolab/setup/setup_imap.py
	@@ -22,7 +22,7 @@
	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
	--- 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
	--- a/pykolab/setup/setup_ldap.py
	+++ b/pykolab/setup/setup_ldap.py
	@@ -28,7 +28,7 @@
	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
	--- a/pykolab/setup/setup_manticore.py
	+++ b/pykolab/setup/setup_manticore.py
	@@ -26,7 +26,7 @@
	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
	--- a/pykolab/setup/setup_mta.py
	+++ b/pykolab/setup/setup_mta.py
	@@ -23,7 +23,7 @@
	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
	--- a/pykolab/setup/setup_mysql.py
	+++ b/pykolab/setup/setup_mysql.py
	@@ -24,7 +24,7 @@
	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
	--- a/pykolab/setup/setup_php.py
	+++ b/pykolab/setup/setup_php.py
	@@ -24,7 +24,7 @@
	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
	--- a/pykolab/setup/setup_roundcube.py
	+++ b/pykolab/setup/setup_roundcube.py
	@@ -31,7 +31,7 @@

	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
	--- a/pykolab/setup/setup_syncroton.py
	+++ b/pykolab/setup/setup_syncroton.py
	@@ -24,7 +24,7 @@
	import sys
	import time

	-import components
	+from . import components

	import pykolab

	diff --git a/pykolab/xml/__init__.py b/pykolab/xml/__init__.py
	--- 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
	--- a/pykolab/xml/attendee.py
	+++ b/pykolab/xml/attendee.py
	@@ -3,7 +3,7 @@
	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
	--- a/pykolab/xml/event.py
	+++ b/pykolab/xml/event.py
	@@ -18,9 +18,9 @@
	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
	--- a/wallace/__init__.py
	+++ b/wallace/__init__.py
	@@ -39,8 +39,8 @@
	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
	--- a/wallace/module_footer.py
	+++ b/wallace/module_footer.py
	@@ -25,7 +25,7 @@
	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
	--- a/wallace/module_gpgencrypt.py
	+++ b/wallace/module_gpgencrypt.py
	@@ -34,7 +34,7 @@
	import email.encoders
	import gnupg

	-import modules
	+from . import modules

	import pykolab

	diff --git a/wallace/module_invitationpolicy.py b/wallace/module_invitationpolicy.py
	--- a/wallace/module_invitationpolicy.py
	+++ b/wallace/module_invitationpolicy.py
	@@ -38,7 +38,7 @@
	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
	--- a/wallace/module_optout.py
	+++ b/wallace/module_optout.py
	@@ -32,7 +32,7 @@
	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
	--- a/wallace/module_resources.py
	+++ b/wallace/module_resources.py
	@@ -36,7 +36,7 @@

	from dateutil.tz import tzlocal

	-import modules
	+from . import modules

	import kolabformat

	diff --git a/wallace/module_signature.py b/wallace/module_signature.py
	--- a/wallace/module_signature.py
	+++ b/wallace/module_signature.py
	@@ -26,7 +26,7 @@
	from email.parser import Parser
	from email.utils import getaddresses

	-import modules
	+from . import modules
	import pykolab

	from pykolab.auth import Auth

File Metadata

Mime Type: text/plain
Expires: Fri, Apr 3, 8:55 AM (6 h, 17 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 18779988
Default Alt Text: D3391.1775206536.diff (21 KB)

D3391.1775206536.diffNo OneTemporaryActions

D3391.1775206536.diffView Options

File Metadata

Event Timeline

D3391.1775206536.diff
No OneTemporary
Actions

D3391.1775206536.diff
View Options