From beb861e22d5922fe1d262f768a95da7a78f6229c Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 9 Nov 2011 09:55:53 +0100
Subject: [PATCH] Some corrections.

The test virus message is well detected by Amavis but not the spam one.

see #187
---
 demo/__init__.py  | 2 +-
 demo/views.py     | 1 +
 lib/emailutils.py | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/__init__.py b/demo/__init__.py
index f7adcb2e9..639b61c17 100755
--- a/demo/__init__.py
+++ b/demo/__init__.py
@@ -11,7 +11,7 @@ def menu(**kwargs):
         return []
     return [
         {"name"  : "demo",
-         "label" : _("Demo"),
+         "label" : _("Test messages"),
          "img" : static_url("pics/demo.png"),
          "class" : "topdropdown",
          "menu"  : [
diff --git a/demo/views.py b/demo/views.py
index e43f64fa8..4a1aabf37 100755
--- a/demo/views.py
+++ b/demo/views.py
@@ -1,4 +1,5 @@
 # coding: utf-8
+import os
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from modoboa.admin.lib import is_not_localadmin
diff --git a/lib/emailutils.py b/lib/emailutils.py
index 317c82d40..6f896defa 100644
--- a/lib/emailutils.py
+++ b/lib/emailutils.py
@@ -228,7 +228,6 @@ def __sendmail(sender, rcpt, msgstring, server='localhost', port=25):
     """
     try:
         s = smtplib.SMTP(server, port)
-        s.connect()
         s.sendmail(sender, [rcpt], msgstring)
         s.quit()
     except smtplib.SMTPException, e: