summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-05-08 10:25:02 -0400
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-05-08 10:25:02 -0400
commit63acf78a4961f78034baf88e9ea8fed83f459bd1 (patch)
tree3a69f42ef9fb41242621845dabe686d7a0203ed7
parente0326b2e0d7b9fb88592baf7dc1991bd4d35a0e6 (diff)
downloadpykolab-63acf78a4961f78034baf88e9ea8fed83f459bd1.tar.gz
Remove the imports of legacy auth and imap
-rw-r--r--pykolab/cli/__init__.py3
-rw-r--r--pykolab/cli/cmd_create_mailbox.py3
-rw-r--r--pykolab/cli/cmd_delete_mailbox.py3
-rw-r--r--pykolab/cli/cmd_export_mailbox.py3
-rw-r--r--pykolab/cli/cmd_list_deleted_mailboxes.py3
-rw-r--r--pykolab/cli/cmd_list_mailboxes.py3
-rw-r--r--pykolab/cli/cmd_remove_mailaddress.py5
-rw-r--r--pykolab/cli/cmd_set_language.py3
-rw-r--r--pykolab/cli/cmd_set_mail.py3
-rw-r--r--pykolab/cli/cmd_sync.py3
-rw-r--r--pykolab/cli/cmd_transfer_mailbox.py3
-rw-r--r--pykolab/cli/cmd_undelete_mailbox.py3
-rw-r--r--pykolab/cli/telemetry/cmd_examine_command_issue.py3
-rw-r--r--pykolab/cli/telemetry/cmd_examine_session.py3
-rw-r--r--pykolab/cli/telemetry/cmd_expire_sessions.py3
-rw-r--r--pykolab/cli/telemetry/cmd_list_sessions.py3
16 files changed, 1 insertions, 49 deletions
diff --git a/pykolab/cli/__init__.py b/pykolab/cli/__init__.py
index cf2747c..a51a3aa 100644
--- a/pykolab/cli/__init__.py
+++ b/pykolab/cli/__init__.py
@@ -38,9 +38,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
class Cli(object):
def __init__(self):
import commands
diff --git a/pykolab/cli/cmd_create_mailbox.py b/pykolab/cli/cmd_create_mailbox.py
index cd4655e..20d9d6d 100644
--- a/pykolab/cli/cmd_create_mailbox.py
+++ b/pykolab/cli/cmd_create_mailbox.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('create_mailbox', execute, description=description(), aliases='cm')
diff --git a/pykolab/cli/cmd_delete_mailbox.py b/pykolab/cli/cmd_delete_mailbox.py
index 6b26372..973cd8b 100644
--- a/pykolab/cli/cmd_delete_mailbox.py
+++ b/pykolab/cli/cmd_delete_mailbox.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('delete_mailbox', execute, description=description(), aliases=['dm'])
diff --git a/pykolab/cli/cmd_export_mailbox.py b/pykolab/cli/cmd_export_mailbox.py
index 2e0875c..72ea139 100644
--- a/pykolab/cli/cmd_export_mailbox.py
+++ b/pykolab/cli/cmd_export_mailbox.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('export_mailbox', execute)
diff --git a/pykolab/cli/cmd_list_deleted_mailboxes.py b/pykolab/cli/cmd_list_deleted_mailboxes.py
index f62bb3c..b29e977 100644
--- a/pykolab/cli/cmd_list_deleted_mailboxes.py
+++ b/pykolab/cli/cmd_list_deleted_mailboxes.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('list_deleted_mailboxes', execute)
diff --git a/pykolab/cli/cmd_list_mailboxes.py b/pykolab/cli/cmd_list_mailboxes.py
index 547eb74..35e7a7b 100644
--- a/pykolab/cli/cmd_list_mailboxes.py
+++ b/pykolab/cli/cmd_list_mailboxes.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('list_mailboxes', execute, description="List mailboxes.\n" + \
"%-28s" % ('') + \
diff --git a/pykolab/cli/cmd_remove_mailaddress.py b/pykolab/cli/cmd_remove_mailaddress.py
index 6a4daea..d6eb43b 100644
--- a/pykolab/cli/cmd_remove_mailaddress.py
+++ b/pykolab/cli/cmd_remove_mailaddress.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('remove_mail', execute, description=description())
@@ -56,4 +53,4 @@ def execute(*args, **kw):
if not address == email_address:
_user_addresses.append(address)
- auth.set_user_attribute('klab.cc', user, 'mailAlternateAddress', _user_addresses) \ No newline at end of file
+ auth.set_user_attribute('klab.cc', user, 'mailAlternateAddress', _user_addresses)
diff --git a/pykolab/cli/cmd_set_language.py b/pykolab/cli/cmd_set_language.py
index 6b94d42..316d95a 100644
--- a/pykolab/cli/cmd_set_language.py
+++ b/pykolab/cli/cmd_set_language.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('set_language', execute, description=description())
diff --git a/pykolab/cli/cmd_set_mail.py b/pykolab/cli/cmd_set_mail.py
index 2d4e75c..d32952f 100644
--- a/pykolab/cli/cmd_set_mail.py
+++ b/pykolab/cli/cmd_set_mail.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('set_mail', execute, description=description())
diff --git a/pykolab/cli/cmd_sync.py b/pykolab/cli/cmd_sync.py
index 348c010..2cbb05f 100644
--- a/pykolab/cli/cmd_sync.py
+++ b/pykolab/cli/cmd_sync.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('sync', execute, description="Synchronize Kolab Users with IMAP.")
diff --git a/pykolab/cli/cmd_transfer_mailbox.py b/pykolab/cli/cmd_transfer_mailbox.py
index e7a7acc..65843a9 100644
--- a/pykolab/cli/cmd_transfer_mailbox.py
+++ b/pykolab/cli/cmd_transfer_mailbox.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('transfer_mailbox', execute, description="Transfer a mailbox to another server.")
diff --git a/pykolab/cli/cmd_undelete_mailbox.py b/pykolab/cli/cmd_undelete_mailbox.py
index 1440943..316e164 100644
--- a/pykolab/cli/cmd_undelete_mailbox.py
+++ b/pykolab/cli/cmd_undelete_mailbox.py
@@ -26,9 +26,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
def __init__():
commands.register('undelete_mailbox', execute, description="Recover mailboxes previously deleted.")
diff --git a/pykolab/cli/telemetry/cmd_examine_command_issue.py b/pykolab/cli/telemetry/cmd_examine_command_issue.py
index fc8d3f7..ec827a0 100644
--- a/pykolab/cli/telemetry/cmd_examine_command_issue.py
+++ b/pykolab/cli/telemetry/cmd_examine_command_issue.py
@@ -25,9 +25,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
from pykolab import telemetry
from pykolab.cli import commands
diff --git a/pykolab/cli/telemetry/cmd_examine_session.py b/pykolab/cli/telemetry/cmd_examine_session.py
index 38dac94..b9bbcad 100644
--- a/pykolab/cli/telemetry/cmd_examine_session.py
+++ b/pykolab/cli/telemetry/cmd_examine_session.py
@@ -25,9 +25,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
from pykolab import telemetry
from pykolab.cli import commands
diff --git a/pykolab/cli/telemetry/cmd_expire_sessions.py b/pykolab/cli/telemetry/cmd_expire_sessions.py
index 2066106..a2c693a 100644
--- a/pykolab/cli/telemetry/cmd_expire_sessions.py
+++ b/pykolab/cli/telemetry/cmd_expire_sessions.py
@@ -25,9 +25,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
from pykolab import telemetry
from pykolab.cli import commands
diff --git a/pykolab/cli/telemetry/cmd_list_sessions.py b/pykolab/cli/telemetry/cmd_list_sessions.py
index c90ef9d..4579ec5 100644
--- a/pykolab/cli/telemetry/cmd_list_sessions.py
+++ b/pykolab/cli/telemetry/cmd_list_sessions.py
@@ -25,9 +25,6 @@ from pykolab.translate import _
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
-auth = pykolab.auth
-imap = pykolab.imap
-
from pykolab import telemetry
from pykolab.cli import commands