Cleanup, indentation, pyflakes

dkimpy_milter/__init__.py

@@ -25,15 +25,12 @@ import sys
 import syslog
 import Milter
 import dkim
-from dkim.dnsplug import get_txt
-from dkim.util import parse_tag_value
 import authres
 import os
 import tempfile
 import StringIO
 import re
-from Milter.config import MilterConfigParser
-from Milter.utils import iniplist,parse_addr,parseaddr
+from Milter.utils import parse_addr,parseaddr
 import dkimpy_milter.config as config
 from dkimpy_milter.util import drop_privileges
 from dkimpy_milter.util import setExceptHook
@@ -173,15 +170,12 @@ class dkimMilter(Milter.Base):
         domain = milterconfig.get('Domain')
     else:
         domain = ''
-    if (self.fdomain in domain) and ((not milterconfig.get('Mode') == 'v') or not self.external_connection):
+    if (self.fdomain in domain) and not milterconfig.get('Mode') == 'v' and not self.external_connection:
       txt = self.fp.read()
       self.sign_dkim(txt)
-      result = None
     if (self.has_dkim) and (not self.internal_connection) and (milterconfig.get('Mode') == 'v' or milterconfig.get('Mode') == 'sv'):
       txt = self.fp.read()
       self.check_dkim(txt)
-    else:
-      result = 'none'
     if self.arresults:
         h = authres.AuthenticationResultsHeader(authserv_id = self.AuthservID, 
             results=self.arresults)
@@ -225,7 +219,6 @@ class dkimMilter(Milter.Base):
       
   def check_dkim(self,txt):
       res = False
-      conf = self.conf
       for y in range(self.has_dkim): # Verify _ALL_ the signatures
           d = dkim.DKIM(txt)
           try:

dkimpy_milter/config.py

@@ -28,7 +28,6 @@ import syslog
 import os
 import sys
 import re
-import urllib
 import stat
 import dkim
 import socket

dkimpy_milter/util.py

@@ -46,7 +46,6 @@ def fold(header):
             j = i + 1
         pre += header[:j] + b"\n   "
         header = header[j:]
-        namelen = 0
     return pre + header
 
 def user_group(userid):