This commit was manufactured by cvs2svn to create tag 'pymilter-0_9_2'.

Sprout from master 2009-06-04 22:17:40 UTC Stuart Gathman <stuart@gathman.org> 'Release 0.9.2-3' Cherrypick from bmsi 2005-05-31 18:23:49 UTC Stuart Gathman <stuart@gathman.org> 'Development changes since 0.7.2': sample.py test/amazon test/big5 test/bounce test/bounce1 test/bound test/honey test/missingboundary test/samp1 test/spam44 test/spam7 test/spam8 test/test1 test/test8 test/virus1 test/virus13 test/virus2 test/virus3 test/virus4 test/virus5 test/virus6 test/virus7 testsample.py
2009-06-04 22:17:41 +00:00
42 changed files with 1598 additions and 23983 deletions
@@ -1,8 +0,0 @@
 *.pyc
 build/
 test/*.out
 test/*.tstout
 test/*.log
 test.db
 dist
 MANIFEST
@@ -1,5 +1,5 @@
 Jim Niemira (urmane@urmane.org) wrote the original C module and some quick
-and dirty python to use it.  Stuart D. Gathman (stuart@gathman.org) took that
+and dirty python to use it.  Stuart D. Gathman (stuart@bmsi.com) took that
 kludge and added threading and context objects to it, wrote a proper OO
 wrapper (Milter.py) that handles attachments, did lots of testing, packaged
 it with distutils, and generally transformed it from a quick hack to a
@@ -7,8 +7,6 @@ real, usable Python extension.
 Other contributors (in random order):
 Daniel Troeder
  for pointing out a typo in @noreply
 arkanes@irc.freenode.net
  for suggesting a class method to compute and cache protocol masks
 habnabit@habnabit.org
@@ -43,4 +41,4 @@ Business Management Systems - http://www.bmsi.com
  for hosting the website, and providing paying clients who need milter service
  so I can work on it as part of my day job.
-If I have left anybody out, send me a reminder: stuart@gathman.org
+If I have left anybody out, send me a reminder: stuart@bmsi.com
@@ -1,213 +1,3 @@
 # Revision 1.35  2013/03/14 22:11:25  customdesigned
 # Release 0.9.8
 #
 # Revision 1.34  2013/03/09 05:42:14  customdesigned
 # Make TestBase members private, fix getsymlist misspelling.
 #
 # Revision 1.33  2013/03/09 00:25:23  customdesigned
 # Better untrapped exception message.  const char for doc comments.
 #
 # Revision 1.32  2013/01/13 01:46:16  customdesigned
 # Doc updates.
 #
 # Revision 1.31  2012/04/12 23:32:50  customdesigned
 # Replace redundant callback array with macros.  If this doesn't break anything,
 # macros can be eliminated with code changes.
 #
 # Revision 1.30  2012/04/12 23:08:06  customdesigned
 # Support RFC2553 on BSD
 #
 # Revision 1.29  2011/06/09 15:45:27  customdesigned
 # Print callback name for non-int return error.
 #
 # Revision 1.28  2011/06/08 23:13:48  customdesigned
 # Generate special exception when callback return not int.
 #
 # Revision 1.27  2009/07/28 21:45:54  customdesigned
 # Add getversion() to return runtime version.
 #
 # Revision 1.26  2009/07/28 21:08:20  customdesigned
 # Increment del count.
 #
 # Revision 1.25  2009/07/28 20:58:55  customdesigned
 # getdiag method
 #
 # Revision 1.24  2009/06/09 01:54:44  customdesigned
 # Forgot to initialize optional parameter.
 #
 # Revision 1.23  2009/05/29 20:44:58  customdesigned
 # Typo SMFIP_NO constants.
 #
 # Revision 1.22  2009/05/29 19:53:36  customdesigned
 # Typo SMFIS_ALL_OPTS
 #
 # Revision 1.21  2009/05/29 19:49:40  customdesigned
 # Typo calling helo instead of negotiate.
 #
 # Revision 1.20  2009/05/29 18:25:59  customdesigned
 # Null terminate keyword list.
 #
 # Revision 1.19  2009/05/28 18:36:42  customdesigned
 # Support new callbacks, including negotiate
 #
 # Revision 1.18  2009/05/21 21:53:05  customdesigned
 # First cut at support unknown, data, negotiate callbacks.
 #
 # Revision 1.17  2009/02/06 04:28:08  customdesigned
 # Oops!  Missing options argument pointer for addrcpt.
 #
 # Revision 1.16  2008/12/16 04:21:05  customdesigned
 # Fedora release
 #
 # Revision 1.15  2008/12/13 20:29:56  customdesigned
 # Split off milter applications.
 #
 # Revision 1.14  2008/12/04 19:43:00  customdesigned
 # Doc updates.
 #
 # Revision 1.13  2008/11/23 03:06:47  customdesigned
 # Milter support for chgfrom.
 #
 # Revision 1.12  2008/11/21 20:42:52  customdesigned
 # Support smfi_chgfrom and smfi_addrcpt_par.
 #
 # Revision 1.11  2007/09/25 02:26:29  customdesigned
 # Update license.
 #
 # Revision 1.10  2006/02/12 02:00:42  customdesigned
 # Resolve FIXME for wrap_close.
 #
 # Revision 1.9  2005/12/23 21:46:36  customdesigned
 # Compile on sendmail-8.12 (ifdef SMFIR_INSHEADER)
 #
 # Revision 1.8  2005/10/20 23:23:36  customdesigned
 # Include smfi_progress is SMFIR_PROGRESS defined
 #
 # Revision 1.7  2005/10/20 23:04:46  customdesigned
 # Add optional idx for position of added header.
 #
 # Revision 1.6  2005/07/15 22:18:17  customdesigned
 # Support callback exception policy
 #
 # Revision 1.5  2005/06/24 04:20:07  customdesigned
 # Report context allocation error.
 #
 # Revision 1.4  2005/06/24 04:12:43  customdesigned
 # Remove unused name argument to generic wrappers.
 #
 # Revision 1.3  2005/06/24 03:57:35  customdesigned
 # Handle close called before connect.
 #
 # Revision 1.2  2005/06/02 04:18:55  customdesigned
 # Update copyright notices after reading article on /.
 #
 # Revision 1.1.1.2  2005/05/31 18:09:06  customdesigned
 # Release 0.7.1
 #
 # Revision 2.31  2004/08/23 02:24:36  stuart
 # Support setbacklog
 #
 # Revision 2.30  2004/08/21 20:29:53  stuart
 # Support option of 11 lines max for mlreply.
 #
 # Revision 2.29  2004/08/21 04:14:29  stuart
 # mlreply support
 #
 # Revision 2.28  2004/08/21 02:45:21  stuart
 # Don't leak int constants if module unloaded.
 #
 # Revision 2.27  2004/04/06 03:19:59  stuart
 # Release 0.6.8
 #
 # Revision 2.26  2004/03/04 21:43:06  stuart
 # Fix memory leak by removing unused dynamic template buffer,
 # thanks again to Alexander Kourakos.
 #
 # Revision 2.25  2004/03/01 19:45:03  stuart
 # Release 0.6.5
 #
 # Revision 2.24  2004/03/01 18:56:50  stuart
 # Support progress reporting.
 #
 # Revision 2.23  2004/03/01 18:36:09  stuart
 # Plug memory leak.  Thanks to Alexander Kourakos.
 #
 # Revision 2.22  2003/11/02 03:01:46  stuart
 # Adjust SMTP error codes after careful reading of standard.
 #
 # Revision 2.21  2003/06/24 19:57:04  stuart
 # Allow removing a python milter callback by setting to None.
 #
 # Revision 2.20  2003/02/13 17:08:57  stuart
 # IPV6 support
 #
 # Revision 2.19  2003/02/13 16:58:29  stuart
 # Support passing None to setreply and chgheader.
 #
 # Revision 2.18  2002/12/11 16:44:06  stuart
 # Support QUARANTINE if supported by libmilter.
 #
 # Revision 2.17  2002/04/18 20:20:35  stuart
 # Fix for NULL hostaddr in connect callback from Jason Erickson.
 #
 # Revision 2.16  2001/09/26 13:29:09  stuart
 # sa_len not supported by linux.
 #
 # Revision 2.15  2001/09/25 17:28:40  stuart
 # Copyrights, documentation, release 0.3.1
 #
 # Revision 2.14  2001/09/25 00:36:57  stuart
 # Pass hostaddr to python code in format used by standard socket module.
 #
 # Revision 2.13  2001/09/24 23:44:55  stuart
 # Return old callback from setcallback functions.
 #
 # Revision 2.12  2001/09/24 20:02:30  stuart
 # Remove redundant setpriv
 #
 # Revision 2.11  2001/09/23 22:26:35  stuart
 # Update docs.  Streamline Milter.py
 # update testbms.py to reflect actual sendmail behaviour with multiple
 # messages per connection.
 #
 # Revision 2.10  2001/09/22 15:33:42  stuart
 # More doc comment updates.
 #
 # Revision 2.9  2001/09/22 14:52:27  stuart
 # Actually return retval in _generic_return.
 # Go over doc comments.
 #
 # Revision 2.8  2001/09/22 01:59:32  stuart
 # Prevent reentrant call of milter_main, which libmilter doesn't support.
 #
 # Revision 2.7  2001/09/22 01:47:37  stuart
 # Forgot to set milter interp.
 #
 # Revision 2.6  2001/09/22 01:23:53  stuart
 # Added proper threading after research in python docs.
 #
 # Revision 2.5  2001/09/21 20:08:51  stuart
 # Release 0.2.3
 #
 # Revision 2.4  2001/09/20 16:18:16  stuart
 # libmilter checks in_eom state, so we don't have to.
 #
 # Revision 2.3  2001/09/19 06:02:33  stuart
 # Make more stuff static.
 #
 # Revision 2.1  2001/09/19 04:24:13  stuart
 # Use extension type to track context in python.
 #
 # Revision 1.4  2001/09/18 18:48:28  stuart
 # clear private data reference in _clear_context
 #
 # Revision 1.3  2001/09/15  04:19:37  stuart
 # nasty off by 1 mem overwrite bugs in wrap_env
 # generic_set_callback
 #
 # Revision 1.2  2001/09/15  03:15:39  stuart
 # several bugs fixed, works smoothly
 #
 # Revision 1.69  2006/11/04 22:09:39  customdesigned
 # Another lame DSN heuristic.  Block PTR cache poisoning attack.
 #
@@ -1,33 +1,22 @@
-## @package Milter
+# Author: Stuart D. Gathman <stuart@bmsi.com>
-# A thin OO wrapper for the milter module.
+# Copyright 2001 Business Management Systems, Inc.
 #
 # Clients generally subclass Milter.Base and define callback
 # methods.
 #
 # @author Stuart D. Gathman <stuart@bmsi.com>
 # Copyright 2001,2009 Business Management Systems, Inc.
 # This code is under the GNU General Public License.  See COPYING for details.
-from __future__ import print_function
+# A thin OO wrapper for the milter module
-__version__ = '1.0.4'
+
 __version__ = '0.9.2'
 import os
 import re
 import milter
-try:
+import thread
  import thread
 except:
  # libmilter uses posix threads
  import _thread as thread
 from milter import *
 from functools import wraps
 _seq_lock = thread.allocate_lock()
 _seq = 0
 def uniqueID():
-  """Return a unique sequence number (incremented on each call).
+  """Return a sequence number unique to this process.
  """
  global _seq
  _seq_lock.acquire()
@@ -35,7 +24,6 @@ def uniqueID():
  _seq_lock.release()
  return seqno
 ## @private
 OPTIONAL_CALLBACKS = {
  'connect':(P_NR_CONN,P_NOCONNECT),
  'hello':(P_NR_HELO,P_NOHELO),
@@ -48,576 +36,155 @@ OPTIONAL_CALLBACKS = {
  'header':(P_NR_HDR,P_NOHDRS)
 }
 MACRO_CALLBACKS = {
  'connect': M_CONNECT,
  'hello': M_HELO, 'envfrom': M_ENVFROM, 'envrcpt': M_ENVRCPT,
  'data': M_DATA, 'eom': M_EOM, 'eoh': M_EOH
 }
 ## @private
 R = re.compile(r'%+')
 ## @private
 def decode_mask(bits,names):
  t = [ (s,getattr(milter,s)) for s in names]
  nms = [s for s,m in t if bits & m]
  for s,m in t: bits &= ~m
  if bits: nms += hex(bits)
  return nms
 ## Class decorator to enable optional protocol steps.
 # P_SKIP is enabled by default when supported, but
 # applications may wish to enable P_HDR_LEADSPC
 # to send and receive the leading space of header continuation
 # lines unchanged, and/or P_RCPT_REJ to have recipients 
 # detected as invalid by the MTA passed to the envcrpt callback.
 #
 # Applications may want to check whether the protocol is actually
 # supported by the MTA in use.  Base._protocol
 # is a bitmask of protocol options negotiated.  So,
 # for instance, if <code>self._protocol & Milter.P_RCPT_REJ</code>
 # is true, then that feature was successfully negotiated with the MTA
 # and the application will see recipients the MTA has flagged as invalid.
 # 
 # Sample use:
 # <pre>
 # class myMilter(Milter.Base):
 #   def envrcpt(self,to,*params):
 #     return Milter.CONTINUE
 # myMilter = Milter.enable_protocols(myMilter,Milter.P_RCPT_REJ)
 # </pre>
 # @since 0.9.3
 # @param klass the %milter application class to modify
 # @param mask a bitmask of protocol steps to enable
 # @return the modified %milter class
 def enable_protocols(klass,mask):
  klass._protocol_mask = klass.protocol_mask() & ~mask
  return klass
 ## Milter rejected recipients. A class decorator that calls
 # enable_protocols() with the P_RCPT_REJ flag.  By default, the MTA
 # does not pass recipients that it knows are invalid on to the milter.
 # This decorator enables a %milter app to see all recipients if supported
 # by the MTA.  Use like this with python-2.6 and later:
 # <pre>
 # @@Milter.rejected_recipients
 # class myMilter(Milter.Base):
 #   def envrcpt(self,to,*params):
 #     return Milter.CONTINUE
 # </pre>
 # @since 0.9.5
 # @param klass the %milter application class to modify
 # @return the modified %milter class
 def rejected_recipients(klass):
  return enable_protocols(klass,P_RCPT_REJ)
 ## Milter leading space on headers. A class decorator that calls
 # enable_protocols() with the P_HDR_LEADSPC flag.  By default,
 # header continuation lines are collected and joined before getting
 # sent to a milter.  Headers modified or added by the milter are
 # folded by the MTA as necessary according to its own standards.
 # With this flag, header continuation lines are preserved
 # with their newlines and leading space.  In addition, header folding
 # done by the milter is preserved as well.
 # Use like this with python-2.6 and later:
 # <pre>
 # @@Milter.header_leading_space
 # class myMilter(Milter.Base):
 #   def header(self,hname,value):
 #     return Milter.CONTINUE
 # </pre>
 # @since 0.9.5
 # @param klass the %milter application class to modify
 # @return the modified %milter class
 def header_leading_space(klass):
  return enable_protocols(klass,P_HDR_LEADSPC)
 ## Function decorator to disable callback methods.
 # If the MTA supports it, tells the MTA not to invoke this callback,
 # increasing efficiency.  All the callbacks (except negotiate)
 # are disabled in Milter.Base, and overriding them reenables the
 # callback.  An application may need to use @@nocallback when it extends
 # another %milter and wants to disable a callback again.
 # The disabled method should still return Milter.CONTINUE, in case the MTA does
 # not support protocol negotiation, and for when called from a test harness.
 # @since 0.9.2
 def nocallback(func):
  try:
    func.milter_protocol = OPTIONAL_CALLBACKS[func.__name__][1]
  except KeyError:
    raise ValueError(
      '@nocallback applied to non-optional method: '+func.__name__)
-  @wraps(func)
+  return func
  def wrapper(self,*args):
    if func(self,*args) != CONTINUE:
      raise RuntimeError('%s return code must be CONTINUE with @nocallback'
        % func.__name__)
    return CONTINUE
  return wrapper
 ## Function decorator to disable callback reply.
 # If the MTA supports it, tells the MTA not to wait for a reply from
 # this callback, and assume CONTINUE.  The method should still return
 # CONTINUE in case the MTA does not support protocol negotiation.
 # The decorator arranges to change the return code to NOREPLY 
 # when supported by the MTA.
 # @since 0.9.2
 def noreply(func):
  try:
    nr_mask = OPTIONAL_CALLBACKS[func.__name__][0]
-  except KeyError:
+  except KeyErro:
    raise ValueError(
      '@noreply applied to non-optional method: '+func.__name__)
  @wraps(func)
  def wrapper(self,*args):
    rc = func(self,*args)
-    if self._protocol & nr_mask:
+    if self._protocol & nr_mask: return NOREPLY
      if rc != CONTINUE:
        raise RuntimeError('%s return code must be CONTINUE with @noreply'
 	  % func.__name__)
      return NOREPLY
    return rc
  wrapper.milter_protocol = nr_mask
  return wrapper
 ## Function decorator to set macros used in a callback.
 # By default, the MTA sends all macros defined for a callback.
 # If some or all of these are unused, the bandwidth can be saved
 # by listing the ones that are used.
 # @since 1.0.2
 def symlist(*syms):
  if len(syms) > 5:
    raise ValueError('@symlist limited to 5 macros by MTA: '+func.__name__)
  def setsyms(func):
    if func.__name__ not in MACRO_CALLBACKS:
      raise ValueError('@symlist applied to non-symlist method: '+func.__name__)
    func._symlist = syms
    return func
  return setsyms
 ## Disabled action exception.
 # set_flags() can tell the MTA that this application will not use certain
 # features (such as CHGFROM).  This can also be negotiated for each
 # connection in the negotiate callback.  If the application then calls
 # the feature anyway via an instance method, this exception is
 # thrown.
 # @since 0.9.2
 class DisabledAction(RuntimeError):
  pass
-## A do "nothing" Milter base class representing an SMTP connection.
+# A do nothing Milter base class from which python milters should derive
-#
+# unless they are using the milter C module directly.
 # Python milters should derive from this class
 # unless they are using the low level milter module directly.  
 #
 # Most of the methods are either "actions" or "callbacks".  Callbacks
 # are invoked by the MTA at certain points in the SMTP protocol.  For
 # instance when the HELO command is seen, the MTA calls the helo
 # callback before returning a response code.  All callbacks must
 # return one of these constants: CONTINUE, TEMPFAIL, REJECT, ACCEPT,
 # DISCARD, SKIP.  The NOREPLY response is supplied automatically by
 # the @@noreply decorator if negotiation with the MTA is successful.
 # @@noreply and @@nocallback methods should return CONTINUE for two reasons:
 # the MTA may not support negotiation, and the class may be running in a test
 # harness.
 # 
 # Optional callbacks are disabled with the @@nocallback decorator, and
 # automatically reenabled when overridden.  Disabled callbacks should
 # still return CONTINUE for testing and MTAs that do not support
 # negotiation.  
 # Each SMTP connection to the MTA calls the factory method you provide to
 # create an instance derived from this class.  This is typically the
 # constructor for a class derived from Base.  The _setctx() method attaches
 # the instance to the low level milter.milterContext object.  When the SMTP
 # connection terminates, the close callback is called, the low level connection
 # object is destroyed, and this normally causes instances of this class to be
 # garbage collected as well.  The close() method should release any global
 # resources held by instances.
 # @since 0.9.2
 class Base(object):
-  "The core class interface to the %milter module."
+  "The core class interface to the milter module."
  ## Attach this Milter to the low level milter.milterContext object.
  def _setctx(self,ctx):
    ## The low level @ref milter.milterContext object.
    self._ctx = ctx
    ## A bitmask of actions this connection has negotiated to use.
    # By default, all actions are enabled.  High throughput milters
    # may want to disable unused actions to increase efficiency.
    # Some optional actions may be disabled by calling milter.set_flags(), or
    # by overriding the negotiate callback.  The bits include:
    # <code>ADDHDRS,CHGBODY,MODBODY,ADDRCPT,ADDRCPT_PAR,DELRCPT
    #  CHGHDRS,QUARANTINE,CHGFROM,SETSYMLIST</code>.
    # The <code>Milter.CURR_ACTS</code> bitmask is all actions
    # known when the milter module was compiled.
    # Application code can also inspect this field to determine
    # which actions are available.  This is especially useful in
    # generic library code designed to work in multiple milters.
    # @since 0.9.2
    #
    self._actions = CURR_ACTS         # all actions enabled by default
    ## A bitmask of protocol options this connection has negotiated.
    # An application may inspect this
    # variable to determine which protocol steps are supported.  Options
    # of interest to applications: the SKIP result code is allowed
    # only if the P_SKIP bit is set, rejected recipients are passed to the
    # %milter application only if the P_RCPT_REJ bit is set, and
    # header values are sent and received with leading spaces (in the
    # continuation lines) intact if the P_HDR_LEADSPC bit is set (so
    # that the application can customize indenting).  
    #
    # The P_N* bits should be negotiated via the @@noreply and @@nocallback
    # method decorators, and P_RCPT_REJ, P_HDR_LEADSPC should
    # be enabled using the enable_protocols class decorator.
    #
    # The bits include: <code>
    # P_RCPT_REJ P_NR_CONN P_NR_HELO P_NR_MAIL P_NR_RCPT P_NR_DATA P_NR_UNKN
    # P_NR_EOH P_NR_BODY P_NR_HDR P_NOCONNECT P_NOHELO P_NOMAIL P_NORCPT
    # P_NODATA P_NOUNKNOWN P_NOEOH P_NOBODY P_NOHDRS P_HDR_LEADSPC P_SKIP
    # </code> (all under the Milter namespace).
    # @since 0.9.2
    self._protocol = 0                # no protocol options by default
    if ctx:
      ctx.setpriv(self)
  ## Defined by subclasses to write log messages.
  def log(self,*msg): pass
  ## Called for each connection to the MTA.  Called by the
  # <a href="milter_api/xxfi_connect.html">
  # xxfi_connect</a> callback.  
  # The <code>hostname</code> provided by the local MTA is either
  # the PTR name or the IP in the form "[1.2.3.4]" if no PTR is available.
  # The format of hostaddr depends on the socket family:
  # <dl>
  # <dt><code>socket.AF_INET</code>
  # <dd>A tuple of (IP as string in dotted quad form, integer port)
  # <dt><code>socket.AF_INET6</code>
  # <dd>A tuple of (IP as a string in standard representation,
  # integer port, integer flow info, integer scope id)
  # <dt><code>socket.AF_UNIX</code>
  # <dd>A string with the socketname
  # </dl>
  # To vary behavior based on what port the client connected to,
  # for example skipping blacklist checks for port 587 (which must 
  # be authenticated), use @link #getsymval getsymval('{daemon_port}') @endlink.
  # The <code>{daemon_port}</code> macro must be enabled in sendmail.cf
  # <pre>
  # O Milter.macros.connect=j, _, {daemon_name}, {daemon_port}, {if_name}, {if_addr}
  # </pre>
  # or sendmail.mc
  # <pre>
  # define(`confMILTER_MACROS_CONNECT', ``j, _, {daemon_name}, {daemon_port}, {if_name}, {if_addr}'')dnl
  # </pre>
  # @param hostname the PTR name or bracketed IP of the SMTP client
  # @param family <code>socket.AF_INET</code>, <code>socket.AF_INET6</code>,
  #     or <code>socket.AF_UNIX</code>
  # @param hostaddr a tuple or string with peer IP or socketname
  @nocallback
  def connect(self,hostname,family,hostaddr): return CONTINUE
  ## Called when the SMTP client says HELO.
  # Returning REJECT prevents progress until a valid HELO is provided;
  # this almost always results in terminating the connection.
  @nocallback
  def hello(self,hostname): return CONTINUE
  ## Called when the SMTP client says MAIL FROM. Called by the
  # <a href="milter_api/xxfi_envfrom.html">
  # xxfi_envfrom</a> callback.  
  # Returning REJECT rejects the message, but not the connection.
  # The sender is the "envelope" from as defined by
  # <a href="http://tools.ietf.org/html/rfc5321">RFC 5321</a>.
  # For the From: header (author) defined in 
  # <a href="http://tools.ietf.org/html/rfc5322">RFC 5322</a>,
  # see @link #header the header callback @endlink.
  @nocallback
  def envfrom(self,f,*str): return CONTINUE
  ## Called when the SMTP client says RCPT TO. Called by the
  # <a href="milter_api/xxfi_envrcpt.html">
  # xxfi_envrcpt</a> callback.
  # Returning REJECT rejects the current recipient, not the entire message.
  # The recipient is the "envelope" recipient as defined by 
  # <a href="http://tools.ietf.org/html/rfc5321">RFC 5321</a>.
  # For recipients defined in 
  # <a href="http://tools.ietf.org/html/rfc5322">RFC 5322</a>, 
  # for example To: or Cc:, see @link #header the header callback @endlink.
  @nocallback
  def envrcpt(self,to,*str): return CONTINUE
  ## Called when the SMTP client says DATA.
  # Returning REJECT rejects the message without wasting bandwidth
  # on the unwanted message.
  # @since 0.9.2
  @nocallback
  def data(self): return CONTINUE
  ## Called for each header field in the message body.
  @nocallback
  def header(self,field,value): return CONTINUE
  ## Called at the blank line that terminates the header fields.
  @nocallback
  def eoh(self): return CONTINUE
  ## Called to supply the body of the message to the Milter by chunks.
  # @param blk a block of message bytes
  @nocallback
-  def body(self,blk): return CONTINUE
+  def body(self,unused): return CONTINUE
  ## Called when the SMTP client issues an unknown command.
  # @param cmd the unknown command
  # @since 0.9.2
  @nocallback
  def unknown(self,cmd): return CONTINUE
  ## Called at the end of the message body.
  # Most of the message manipulation actions can only take place from
  # the eom callback.
  def eom(self): return CONTINUE
  ## Called when the connection is abnormally terminated.
  # The close callback is still called also.
  def abort(self): return CONTINUE
  ## Called when the connection is closed.
  def close(self): return CONTINUE
-  ## Return mask of SMFIP_N* protocol option bits to clear for this class
+  # Return mask of SMFIP_N.. protocol option bits to clear for this class
  # The @@nocallback and @@noreply decorators set the
  # <code>milter_protocol</code> function attribute to the protocol mask bit to
  # pass to libmilter, causing that callback or its reply to be skipped.
  # Overriding a method creates a new function object, so that 
  # <code>milter_protocol</code> defaults to 0.
  # Libmilter passes the protocol bits that the current MTA knows
  # how to skip.  We clear the ones we don't want to skip.
  # The negation is somewhat mind bending, but it is simple.
  # @since 0.9.2
  @classmethod
  def protocol_mask(klass):
    try:
      return klass._protocol_mask
    except AttributeError:
-      p = P_RCPT_REJ | P_HDR_LEADSPC    # turn these new features off by default
+      p = 0
      for func,(nr,nc) in OPTIONAL_CALLBACKS.items():
        func = getattr(klass,func)
        ca = getattr(func,'milter_protocol',0)
-        #print(func,hex(nr),hex(nc),hex(ca))
+        #print func,hex(nr),hex(nc),hex(ca)
        p |= (nr|nc) & ~ca
      klass._protocol_mask = p
      return p
  ## Negotiate milter protocol options.  Called by the
  # <a href="milter_api/xxfi_negotiate.html">
  # xffi_negotiate</a> callback.  This is an advanced callback,
  # do not override unless you know what you are doing.  Most
  # negotiation can be done simply by using the supplied 
  # class and function decorators.
  # Options are passed as 
  # a list of 4 32-bit ints which can be modified and are passed
  # back to libmilter on return.
  # Default negotiation sets P_NO* and P_NR* for callbacks
-  # marked @@nocallback and @@noreply respectively, leaves all
+  # marked @nocallback and @noreply respectively
  # actions enabled, and enables Milter.SKIP.  The @@enable_protocols
  # class decorator can customize which protocol steps are implemented.
  # @param opts a modifiable list of 4 ints with negotiated options
  # @since 0.9.2
  def negotiate(self,opts):
    try:
      self._actions,p,f1,f2 = opts
-      for func,stage in MACRO_CALLBACKS.items():
+      opts[1] = self._protocol = \
-        func = getattr(self,func)
+              p & ~self.protocol_mask() & ~P_RCPT_REJ & ~P_HDR_LEADSPC
        syms = getattr(func,'_symlist',None)
        if syms is not None:
          self.setsymlist(stage,*syms)
      opts[1] = self._protocol = p & ~self.protocol_mask()
      opts[2] = 0
      opts[3] = 0
      #self.log("Negotiated:",opts)
-    except Exception as x:
+    except:
      # don't change anything if something went wrong
      return ALL_OPTS 
    return CONTINUE
  # Milter methods which can be invoked from most callbacks
  ## Return the value of an MTA macro.  Sendmail macro names
  # are either single chars (e.g. "j") or multiple chars enclosed
  # in braces (e.g. "{auth_type}").  Macro names are MTA dependent.
  # See <a href="milter_api/smfi_getsymval.html">
  # smfi_getsymval</a> for default sendmail macros.
  # @param sym the macro name
  def getsymval(self,sym):
    return self._ctx.getsymval(sym)
-  ## Set the SMTP reply code and message.
+  # If sendmail does not support setmlreply, then only the
-  # If the MTA does not support setmlreply, then only the
+  # first msg line is used.
  # first msg line is used.  Any '%%' in a message line
  # must be doubled, or libmilter will silently ignore the setreply.
  # Beginning with 0.9.6, we test for that case and throw ValueError to avoid
  # head scratching.  What will <i>really</i> irritate you, however,
  # is that if you carefully double any '%%', your message will be
  # sent - but with the '%%' still doubled!
  # See <a href="milter_api/smfi_setreply.html">
  # smfi_setreply</a> for more information.
  # @param rcode The three-digit (RFC 821/2821) SMTP reply code as a string. 
  # rcode cannot be None, and <b>must be a valid 4XX or 5XX reply code</b>.
  # @param xcode The extended (RFC 1893/2034) reply code. If xcode is None,
  # no extended code is used. Otherwise, xcode must conform to RFC 1893/2034.
  # @param msg The text part of the SMTP reply. If msg is None,
  # an empty message is used.
  # @param ml  Optional additional message lines.
  def setreply(self,rcode,xcode=None,msg=None,*ml):
    for m in (msg,)+ml:
      if 1 in [len(s)&1 for s in R.findall(m)]:
        raise ValueError("'%' must be doubled: "+m)
    return self._ctx.setreply(rcode,xcode,msg,*ml)
-  ## Tell the MTA which macro names will be used.
+  # may only be called from negotiate callback
-  # This information can reduce the size of messages received from sendmail,
+  def setsmlist(self,stage,macros):
-  # and hence could reduce bandwidth between sendmail and your milter where
+    if not self._actions & SETSMLIST: raise DisabledAction("SETSMLIST")
-  # that is a factor.  The <code>Milter.SETSYMLIST</code> action flag must be
+    if type(macros) in (list,tuple):
-  # set.  The protocol stages are M_CONNECT, M_HELO, M_ENVFROM, M_ENVRCPT,
+      macros = ' '.join(macros)
-  # M_DATA, M_EOM, M_EOH.
+    return self._ctx.setsmlist(stage,macros)
  #
  # May only be called from negotiate callback.  Hence, this is an advanced
  # feature.  Use the @@symlist function decorator to conviently set
  # the macros used by a callback.
  # @since 0.9.8, previous version was misspelled!
  # @param stage the protocol stage to set to macro list for, 
  # one of the M_* constants defined in Milter
  # @param macros space separated and/or lists of strings
  def setsymlist(self,stage,*macros):
    if not self._actions & SETSYMLIST: raise DisabledAction("SETSYMLIST")
    if len(macros) > 5:
      raise ValueError('setsymlist limited to 5 macros by MTA')
    a = []
    for m in macros:
      try:
        m = m.encode('utf8')
      except: pass
      try:
        m = m.split(b' ')
        a += m
      except: pass
    return self._ctx.setsymlist(stage,b' '.join(a))
  # Milter methods which can only be called from eom callback.
  ## Add a mail header field.
  # Calls <a href="milter_api/smfi_addheader.html">
  # smfi_addheader</a>.  
  # The <code>Milter.ADDHDRS</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param field        the header field name
  # @param value        the header field value
  # @param idx header field index from the top of the message to insert at
  # @throws DisabledAction if ADDHDRS is not enabled
  def addheader(self,field,value,idx=-1):
    if not self._actions & ADDHDRS: raise DisabledAction("ADDHDRS")
    return self._ctx.addheader(field,value,idx)
  ## Change the value of a mail header field.
  # Calls <a href="milter_api/smfi_chgheader.html">
  # smfi_chgheader</a>.  
  # The <code>Milter.CHGHDRS</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param field the name of the field to change
  # @param idx index of the field to change when there are multiple instances
  # @param value the new value of the field
  # @throws DisabledAction if CHGHDRS is not enabled
  def chgheader(self,field,idx,value):
    if not self._actions & CHGHDRS: raise DisabledAction("CHGHDRS")
    return self._ctx.chgheader(field,idx,value)
  ## Add a recipient to the message.  
  # Calls <a href="milter_api/smfi_addrcpt.html">
  # smfi_addrcpt</a>.  
  # If no corresponding mail header is added, this is like a Bcc.
  # The syntax of the recipient is the same as used in the SMTP
  # RCPT TO command (and as delivered to the envrcpt callback), for example
  # "self.addrcpt('<foo@example.com>')".  
  # The <code>Milter.ADDRCPT</code> action flag must be set.
  # If the optional <code>params</code> argument is used, then
  # the <code>Milter.ADDRCPT_PAR</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param rcpt the message recipient 
  # @param params an optional list of ESMTP parameters
  # @throws DisabledAction if ADDRCPT or ADDRCPT_PAR is not enabled 
  def addrcpt(self,rcpt,params=None):
    if not self._actions & ADDRCPT: raise DisabledAction("ADDRCPT")
    if params and not self._actions & ADDRCPT_PAR:
        raise DisabledAction("ADDRCPT_PAR")
    return self._ctx.addrcpt(rcpt,params)
-  ## Delete a recipient from the message.
+
  # Calls <a href="milter_api/smfi_delrcpt.html">
  # smfi_delrcpt</a>.  
  # The recipient should match one passed to the envrcpt callback.
  # The <code>Milter.DELRCPT</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param rcpt the message recipient to delete
  # @throws DisabledAction if DELRCPT is not enabled
  def delrcpt(self,rcpt):
    if not self._actions & DELRCPT: raise DisabledAction("DELRCPT")
    return self._ctx.delrcpt(rcpt)
  ## Replace the message body.
  # Calls <a href="milter_api/smfi_replacebody.html">
  # smfi_replacebody</a>.  
  # The entire message body must be replaced.  
  # Call repeatedly with blocks of data until the entire body is transferred.
  # The <code>Milter.MODBODY</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param body a chunk of body data
  # @throws DisabledAction if MODBODY is not enabled
  def replacebody(self,body):
    if not self._actions & MODBODY: raise DisabledAction("MODBODY")
    return self._ctx.replacebody(body)
  ## Change the SMTP envelope sender address.
  # Calls <a href="milter_api/smfi_chgfrom.html">
  # smfi_chgfrom</a>.  
  # The syntax of the sender is that same as used in the SMTP
  # MAIL FROM command (and as delivered to the envfrom callback),
  # for example <code>self.chgfrom('<bar@example.com>')</code>.
  # The <code>Milter.CHGFROM</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @since 0.9.1
  # @param sender the new sender address
  # @param params an optional list of ESMTP parameters
  # @throws DisabledAction if CHGFROM is not enabled
  def chgfrom(self,sender,params=None):
    if not self._actions & CHGFROM: raise DisabledAction("CHGFROM")
    return self._ctx.chgfrom(sender,params)
  ## Quarantine the message.
  # Calls <a href="milter_api/smfi_quarantine.html">
  # smfi_quarantine</a>.  
  # When quarantined, a message goes into the mailq as if to be delivered,
  # but delivery is deferred until the message is unquarantined.
  # The <code>Milter.QUARANTINE</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param reason a string describing the reason for quarantine
  # @throws DisabledAction if QUARANTINE is not enabled
  def quarantine(self,reason):
    if not self._actions & QUARANTINE: raise DisabledAction("QUARANTINE")
    return self._ctx.quarantine(reason)
  ## Tell the MTA to wait a bit longer.
  # Calls <a href="milter_api/smfi_progress.html">
  # smfi_progress</a>.  
  # Resets timeouts in the MTA that detect a "hung" milter.
  def progress(self):
    return self._ctx.progress()
-## A logging but otherwise do nothing Milter base class.
+# A logging but otherwise do nothing Milter base class included
-# This is included for compatibility with previous versions of pymilter.
+# for compatibility with previous versions of pymilter.
-# The logging callbacks are marked @@noreply.
+
 class Milter(Base):
  "A simple class interface to the milter module."
  ## Provide simple logging to sys.stdout
  def log(self,*msg):
-    print('Milter:',end=None)
+    print 'Milter:',
-    for i in msg: print(i,end=None)
+    for i in msg: print i,
-    print()
+    print
  @noreply
  def connect(self,hostname,family,hostaddr):
@@ -673,25 +240,13 @@ class Milter(Base):
    self.log("close")
    return CONTINUE
 ## The milter connection factory
 # This factory method is called for each connection to create the
 # python object that tracks the connection.  It should return
 # an object derived from Milter.Base.
 #
 # Note that since python is dynamic, this variable can be changed while
 # the milter is running: for instance, to a new subclass based on a 
 # change in configuration.
 factory = Milter
 ## @private
 # @brief Connect context to connection instance and return enabled callbacks.
 def negotiate_callback(ctx,opts):
  m = factory()
  m._setctx(ctx)
  return m.negotiate(opts)
 ## @private
 # @brief Connect context if needed and invoke connect method.
 def connect_callback(ctx,hostname,family,hostaddr,nr_mask=P_NR_CONN):
  m = ctx.getpriv()
  if not m:     
@@ -701,8 +256,6 @@ def connect_callback(ctx,hostname,family,hostaddr,nr_mask=P_NR_CONN):
    m._setctx(ctx)
  return m.connect(hostname,family,hostaddr)
 ## @private
 # @brief Disconnect milterContext and call close method.
 def close_callback(ctx):
  m = ctx.getpriv()
  if not m: return CONTINUE
@@ -712,10 +265,8 @@ def close_callback(ctx):
    m._setctx(None)	# release milterContext
  return rc
 ## Convert ESMTP parameters with values to a keyword dictionary.
 # @deprecated You probably want Milter.param2dict instead.
 def dictfromlist(args):
-  "Convert ESMTP parms with values to keyword dictionary."
+  "Convert ESMTP parm list to keyword dictionary."
  kw = {}
  for s in args:
    pos = s.find('=')
@@ -723,18 +274,6 @@ def dictfromlist(args):
      kw[s[:pos].upper()] = s[pos+1:]
  return kw
 ## Convert ESMTP parm list to keyword dictionary.
 # Params with no value are set to None in the dictionary.
 # @since 0.9.3
 # @param str list of param strings of the form "NAME" or "NAME=VALUE"
 # @return a dictionary of ESMTP param names and values
 def param2dict(str): 
  "Convert ESMTP parm list to keyword dictionary."
  pairs = [x.split('=',1) for x in str]
  for e in pairs:
    if len(e) < 2: e.append(None)
  return dict([(k.upper(),v) for k,v in pairs])
 def envcallback(c,args):
  """Call function c with ESMTP parms converted to keyword parameters.
  Can be used in the envfrom and/or envrcpt callbacks to process
@@ -749,12 +288,28 @@ def envcallback(c,args):
      pargs.append(s)
  return c(*pargs,**kw)
-## Run the %milter.
+def runmilter(name,socketname,timeout = 0):
-# @param name the name of the %milter known to the MTA
+  # This bit is here on the assumption that you will be starting this filter
-# @param socketname the socket to be passed to milter.setconn()
+  # before sendmail.  If sendmail is not running and the socket already exists,
-# @param timeout the time in secs the MTA should wait for a response before 
+  # libmilter will throw a warning.  If sendmail is running, this is still
-#	considering this %milter dead
+  # safe if there are no messages currently being processed.  It's safer to
-def runmilter(name,socketname,timeout = 0,rmsock=True):
+  # shutdown sendmail, kill the filter process, restart the filter, and then
  # restart sendmail.
  pos = socketname.find(':')
  if pos > 1:
    s = socketname[:pos]
    fname = socketname[pos+1:]
  else:
    s = "unix"
    fname = socketname
  if s == "unix" or s == "local":
    print "Removing %s" % fname
    try:
      os.unlink(fname)
    except os.error, x:
      import errno
      if x.errno != errno.ENOENT:
        raise milter.error(x)
  # The default flags set include everything
  # milter.set_flags(milter.ADDHDRS)
@@ -775,24 +330,12 @@ def runmilter(name,socketname,timeout = 0,rmsock=True):
  milter.setconn(socketname)
  if timeout > 0: milter.settimeout(timeout)
  # disable negotiate callback if runtime version < (1,0,1)
  ncb = negotiate_callback
  if milter.getversion() < (1,0,1):
    ncb = None
  # The name *must* match the X line in sendmail.cf (supposedly)
  milter.register(name,
        data=lambda ctx: ctx.getpriv().data(),
        unknown=lambda ctx,cmd: ctx.getpriv().unknown(cmd),
-        negotiate=ncb
+        negotiate=negotiate_callback
  )
  # We remove the socket here by default on the assumption that you will be
  # starting this filter before sendmail.  If sendmail is not running and the
  # socket already exists, libmilter will throw a warning.  If sendmail is
  # running, this is still safe if there are no messages currently being
  # processed.  It's safer to shutdown sendmail, kill the filter process,
  # restart the filter, and then restart sendmail.
  milter.opensocket(rmsock)
  start_seq = _seq
  try:
    milter.main()
@@ -805,7 +348,3 @@ __all__ = globals().copy()
 for priv in ('os','milter','thread','factory','_seq','_seq_lock','__version__'):
  del __all__[priv]
 __all__ = __all__.keys()
 ## @example milter-template.py
 ## @example milter-nomix.py
 #
@@ -10,9 +10,6 @@
 # CBV results.
 #
 # $Log$
 # Revision 1.9  2008/05/08 21:35:57  customdesigned
 # Allow explicitly whitelisted email from banned_users.
 #
 # Revision 1.8  2007/09/03 16:18:45  customdesigned
 # Delete unparseable timestamps when loading address cache.  These have
 # arisen because of failure to parse MAIL FROM properly.   Will have to
@@ -46,9 +43,8 @@
 # Copyright 2001,2002,2003,2004,2005 Business Management Systems, Inc.
 # This code is under the GNU General Public License.  See COPYING for details.
 from __future__ import print_function
 import time
-from Milter.plock import PLock
+from plock import PLock
 class AddrCache(object):
  time_format = '%Y%b%d %H:%M:%S %Z'
@@ -132,8 +128,8 @@ class AddrCache(object):
      if not ts or ts > too_old:
 	return res
      del self.cache[lsender]
-      raise KeyError(sender)
+      raise KeyError, sender
-    except KeyError as x:
+    except KeyError,x:
      try:
 	user,host = sender.split('@',1)
 	return self.__getitem__(host)
@@ -148,8 +144,7 @@ class AddrCache(object):
      if not ts: return		# already permanent
    self.cache[lsender] = (None,res)
    if not res:
-      with open(self.fname,'a') as fp:
+      print >>open(self.fname,'a'),sender
        print(sender,file=fp)
  def __setitem__(self,sender,res):
    lsender = sender.lower()
@@ -157,8 +152,7 @@ class AddrCache(object):
    self.cache[lsender] = (now,res)
    if not res and self.fname:
      s = time.strftime(AddrCache.time_format,time.localtime(now))
-      with open(self.fname,'a') as fp:
+      print >>open(self.fname,'a'),sender,s # log refreshed senders
        print(sender,s,file=fp) # log refreshed senders
  def __len__(self):
    return len(self.cache)
@@ -1,5 +1,4 @@
 from ConfigParser import ConfigParser
 import os.path
 class MilterConfigParser(ConfigParser):
@@ -21,7 +20,7 @@ class MilterConfigParser(ConfigParser):
      return [q.strip() for q in self.get(sect,opt).split(',')]
    return []
-  def getaddrset(self,sect,opt,dir=''):
+  def getaddrset(self,sect,opt):
    if not self.has_option(sect,opt):
      return {}
    s = self.get(sect,opt)
@@ -30,14 +29,13 @@ class MilterConfigParser(ConfigParser):
      q = q.strip()
      if q.startswith('file:'):
        domain = q[5:].lower()
-        fname = os.path.join(dir,domain)
+	d[domain] = d.setdefault(domain,[]) + open(domain,'r').read().split()
        d[domain] = d.setdefault(domain,[]) + open(fname,'r').read().split()
      else:
 	user,domain = q.split('@')
 	d.setdefault(domain.lower(),[]).append(user)
    return d
-  def getaddrdict(self,sect,opt,dir=''):
+  def getaddrdict(self,sect,opt):
    if not self.has_option(sect,opt):
      return {}
    d = {}
@@ -48,7 +46,7 @@ class MilterConfigParser(ConfigParser):
 	for addr in l.split(','):
 	  addr = addr.strip()
 	  if addr.startswith('file:'):
-            fname = os.path.join(dir,addr[5:])
+	    fname = addr[5:]
 	    for a in open(fname,'r').read().split():
 	      d[a] = q
 	  else:
@@ -1,23 +1,12 @@
-## @package Milter.dns
+# provide a higher level interface to pydns
 # Provide a higher level interface to pydns.
 from __future__ import print_function
 import DNS
 from DNS import DNSError
 MAX_CNAME = 10
 ## Lookup DNS records by label and RR type.
 # The response can include records of other types that the DNS
 # server thinks we might need.
 # @param name the DNS label to lookup
 # @param qtype the name of the DNS RR type to lookup
 # @return a list of ((name,type),data) tuples
 def DNSLookup(name, qtype):
    try:
        # To be thread safe, we create a fresh DnsRequest with
        # each call.  It would be more efficient to reuse
        # a req object stored in a Session.
        req = DNS.DnsRequest(name, qtype=qtype)
        resp = req.req()
        #resp.show()
@@ -26,8 +15,8 @@ def DNSLookup(name, qtype):
        # A RR as dotted quad.  For consistency, this driver should
        # return both as binary string.
        return [((a['name'], a['typename']), a['data']) for a in resp.answers]
-    except IOError as x:
+    except IOError, x:
-        raise DNSError(str(x))
+        raise DNSError, str(x)
 class Session(object):
  """A Session object has a simple cache with no TTL that is valid
@@ -35,28 +24,25 @@ class Session(object):
  def __init__(self):
    self.cache = {}
  ## Additional DNS RRs we can safely cache.
  # We have to be careful which additional DNS RRs we cache.  For
  # instance, PTR records are controlled by the connecting IP, and they
  # could poison our local cache with bogus A and MX records.  
  # Each entry is a tuple of (query_type,rr_type).  So for instance,
  # the entry ('MX','A') says it is safe (for milter purposes) to cache
  # any 'A' RRs found in an 'MX' query.
  SAFE2CACHE = frozenset((
    ('MX','MX'), ('MX','A'),
    ('CNAME','CNAME'), ('CNAME','A'),
    ('A','A'),
    ('AAAA','AAAA'),
    ('PTR','PTR'),
    ('NS','NS'), ('NS','A'),
    ('TXT','TXT'),
    ('SPF','SPF')
  ))
-  ## Cached DNS lookup.
+  SAFE2CACHE = {
-  # @param name the DNS label to query
+    ('MX','A'): None,
-  # @param qtype the query type, e.g. 'A'
+    ('MX','MX'): None,
-  # @param cnames tracks CNAMES already followed in recursive calls
+    ('CNAME','A'): None,
    ('CNAME','CNAME'): None,
    ('A','A'): None,
    ('AAAA','AAAA'): None,
    ('PTR','PTR'): None,
    ('NS','NS'): None,
    ('NS','A'): None,
    ('TXT','TXT'): None,
    ('SPF','SPF'): None
  }
  def dns(self, name, qtype, cnames=None):
    """DNS query.
@@ -71,24 +57,15 @@ class Session(object):
    pre: qtype in ['A', 'AAAA', 'MX', 'PTR', 'TXT', 'SPF']
    post: isinstance(__return__, types.ListType)
    """
    if name.endswith('.'): name = name[:-1]
    if not reduce(lambda x,y:x and 0 < len(y) < 64, name.split('.'),True):
        return []   # invalid DNS name (too long or empty)
    name = name.lower()
    result = self.cache.get( (name, qtype) )
    cname = None
    if result: return result
    cnamek = (name,'CNAME')
    cname = self.cache.get( cnamek )
-    if cname:
+    if not result:
        cname = cname[0]
    else:
        safe2cache = Session.SAFE2CACHE
        for k, v in DNSLookup(name, qtype):
-            if k == cnamek:
+            if k == (name, 'CNAME'):
                cname = v
-            if k[1] == 'CNAME' or (qtype,k[1]) in safe2cache:
+            if (qtype,k[1]) in safe2cache:
                self.cache.setdefault(k, []).append(v)
        result = self.cache.get( (name, qtype), [])
    if not result and cname:
@@ -98,28 +75,16 @@ class Session(object):
            #return result    # if too many == NX_DOMAIN
            raise DNSError('Length of CNAME chain exceeds %d' % MAX_CNAME)
        cnames[name] = cname
-        if cname.lower().rstrip('.') in cnames:
+        if cname in cnames:
-            raise DNSError('CNAME loop')
+            raise DNSError, 'CNAME loop'
        result = self.dns(cname, qtype, cnames=cnames)
        if result:
            self.cache[(name,qtype)] = result
    return result
  def dns_txt(self, domainname, enc='ascii'):
    "Get a list of TXT records for a domain name."
    if domainname:
        try:
            return [''.join(s.decode(enc) for s in a)
                for a in self.dns(domainname, 'TXT')]
        except UnicodeEncodeError:
            raise DNSError('Non-ascii character in SPF TXT record.')
    return []
 DNS.DiscoverNameServers()
 if __name__ == '__main__':
  import sys
  s = Session()
  for n,t in zip(*[iter(sys.argv[1:])]*2):
-    print(n,t)
+    print n,t
-    print(s.dns(n,t))
+    print s.dns(n,t)
@@ -5,24 +5,6 @@
 # Send DSNs, do call back verification,
 # and generate DSN messages from a template
 # $Log$
 # Revision 1.22  2011/03/18 20:41:31  customdesigned
 # Python2.6 SMTP.close() fails when instance never connected.
 #
 # Revision 1.21  2011/03/03 05:11:58  customdesigned
 # Release 0.9.4
 #
 # Revision 1.20  2010/10/11 00:29:47  customdesigned
 # Handle multiple recipients.  For CBV or auto whitelist of multiple emails.
 #
 # Revision 1.19  2009/07/02 19:41:12  customdesigned
 # Handle @ in localpart.
 #
 # Revision 1.18  2009/06/10 18:01:59  customdesigned
 # Doxygen updates
 #
 # Revision 1.17  2009/05/20 20:08:44  customdesigned
 # Support non-DSN CBV (non-empty MAIL FROM)
 #
 # Revision 1.16  2007/09/25 01:24:59  customdesigned
 # Allow arbitrary object, not just spf.query like, to provide data for create_msg
 #
@@ -44,32 +26,7 @@
 # Revision 1.10  2006/05/24 20:56:35  customdesigned
 # Remove default templates.  Scrub test.
 #
-## @package Milter.dsn
+
 # Support DSNs and CallBackValidations (CBV).
 #
 # A Delivery Status Notification (bounce) is sent to the envelope
 # sender (original MAIL FROM) with a null MAIL FROM (<>) to notify the
 # original sender # of delays or problems with delivery.  A Callback Validation
 # starts the DSN process, but stops before issuing the DATA command.  The
 # purpose is to check whether the envelope recipient is accepted (and is
 # therefore a valid email).  The null MAIL FROM tells the remote
 # MTA to never reply according to RFC2821 (but some braindead MTAs
 # reply anyway, of course).
 #
 # Milters should cache CBV results and should avoid sending DSNs
 # unless the sender is authenticated somehow (e.g. SPF Pass).  However,
 # when email is quarantined, and is not known to be a forgery, sending a DSN 
 # is better than silently disappearing, and a DSN is better than sending
 # a normal message as notification - because MAIL FROM signing schemes
 # can reject bounces of forged emails.   Whatever you do, don't copy those
 # assinine commercial filters that send a normal message to notify you
 # that some virus is forging your email.
 #
 # <b>DSNs should *only* be sent to MAIL FROM addresses.</b>  Never send
 # a DSN or use a null MAIL FROM with an email address obtained from
 # anywhere else.
 #
 from __future__ import print_function
 import smtplib
 import socket
 from email.Message import Message
@@ -77,25 +34,12 @@ import Milter
 import time
 import dns
 ## Send DSN.
 # Try the published MX names in order, rejecting obviously bogus entries
 # (like <code>localhost</code>).
 # @param mailfrom the original sender we are notifying or validating
 # @param receiver the HELO name of the MTA we are sending the DSN on behalf of.
 #	Be sure to send from an IP that matches the HELO.
 # @param msg the DSN message in RFC2822 format, or None for CBV.
 # @param timeout total seconds to wait for a response from an MX
 # @param session Milter.dns.Session object from current incoming mail
 #	session to reuse its cache, or None to create a fresh one.
 # @param ourfrom set to a valid email to send a normal notification from, or
 #	to validate emails not obtained from MAIL FROM.
 # @return None on success or (status_code,msg) on failure.
 def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
  """Send DSN.  If msg is None, do callback verification.
     Mailfrom is original sender we are sending DSN or CBV to.
     Receiver is the MTA sending the DSN.
     Return None for success or (code,msg) for failure."""
-  user,domain = mailfrom.rsplit('@',1)
+  user,domain = mailfrom.split('@')
  if not session: session = dns.Session()
  try:
    mxlist = session.dns(domain,'MX')
@@ -129,26 +73,16 @@ def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
 	code,resp = smtp.docmd('MAIL FROM: <%s>'%ourfrom)
 	if code != 250:
 	  raise smtplib.SMTPSenderRefused(code, resp, '<%s>'%ourfrom)
-        if isinstance(mailfrom,basestring):
+	code,resp = smtp.rcpt(mailfrom)
          mailfrom = [mailfrom]
        badrcpts = {}
        for rcpt in mailfrom:
          code,resp = smtp.rcpt(rcpt)
 	if code not in (250,251):
-            badrcpts[rcpt] = (code,resp)# permanent error
+	  return (code,resp)		# permanent error
 	smtp.quit()
        if len(badrcpts) == 1:
          return badrcpts.values()[0]	# permanent error
        if badrcpts:
          return badrcpts
      return None			# success
-    except smtplib.SMTPRecipientsRefused as x:
+    except smtplib.SMTPRecipientsRefused,x:
-      if len(x.recipients) == 1:
+      return x.recipients[mailfrom]	# permanent error
-        return x.recipients.values()[0]	# permanent error
+    except smtplib.SMTPSenderRefused,x:
      return x.recipients
    except smtplib.SMTPSenderRefused as x:
      return x.args[:2]			# does not accept DSN
-    except smtplib.SMTPDataError as x:
+    except smtplib.SMTPDataError,x:
      return x.args			# permanent error
    except smtplib.SMTPException:
      pass		# any other error, try next MX
@@ -156,7 +90,7 @@ def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
      pass		# MX didn't accept connections, try next one
    except socket.timeout:
      pass		# MX too slow, try next one
-    if hasattr(smtp,'sock'): smtp.close()
+    smtp.close()
    if time.time() > toolate:
      return (450,'No MX response within %f minutes'%(timeout/60.0))
  return (450,'No MX servers available')	# temp error
@@ -231,6 +165,6 @@ Subject: Test
 Test DSN template
 """
  )
-  print(msg.as_string())
+  print msg.as_string()
-  # print(send_dsn(f,msg.as_string()))
+  # print send_dsn(f,msg.as_string())
-  # print(send_dsn(q.s,'mail.example.com',msg.as_string()))
+  # print send_dsn(q.s,'mail.example.com',msg.as_string())
@@ -9,7 +9,6 @@
 # wiley-268-8196.roadrunner.nf.net at ('205.251.174.46', 4810)
 # cbl-sd-02-79.aster.com.do at ('200.88.62.79', 4153)
 from __future__ import print_function
 import re
 ip3 = re.compile('[0-9]{1,3}')
@@ -49,16 +48,15 @@ def is_dynip(host,addr):
  True
  """
  if host.startswith('[') and host.endswith(']'):
-    return True                                 # no ptr
+    return True
  if addr:
    if host.find(addr) >= 0: return True
    if addr.find(':') >= 0: return False        # IP6
    a = addr.split('.')
-    ia = list(map(int,a))
+    ia = map(int,a)
    h = host
    m = ip3.findall(host)
    if m:
-      g = list(map(int,m))[:4]
+      g = map(int,m)[:4]
      ia3 = (ia[1:],ia[:3])
      if g[-3:] in ia3: return True
      if g[0] == ia[3] and g[1:3] == ia[:2]: return True
@@ -92,6 +90,6 @@ if __name__ == '__main__':
      if ip in seen: continue
      seen.add(ip)
      if is_dynip(host,ip):
-        print('%s\t%s DYN' % (ip,host))
+        print '%s\t%s DYN' % (ip,host)
      else:
-        print('%s\t%s' % (ip,host))
+        print '%s\t%s' % (ip,host)
@@ -1,4 +1,3 @@
 from __future__ import print_function
 import time
 import shelve
 import thread
@@ -19,19 +18,13 @@ def quoteAddress(s):
 class Record(object):
  __slots__ = ( 'firstseen', 'lastseen', 'umis', 'cnt' )
-  def __init__(self,timeinc=0):
+  def __init__(self):
-    now = time.time() + timeinc
+    now = time.time()
    self.firstseen = now
    self.lastseen = now
    self.cnt = 0
    self.umis = None
  def __str__(self):
    return "Grey[%s:%s:%s:%d]" % (
        time.ctime(self.firstseen),time.ctime(self.lastseen),
        self.umis,self.cnt
    )
 class Greylist(object):
  def __init__(self,dbname,grey_time=10,grey_expire=4,grey_retain=36):
@@ -42,37 +35,7 @@ class Greylist(object):
    self.dbp = shelve.open(dbname,'c',protocol=2)
    self.lock = thread.allocate_lock()
-  def export_csv(self,fp,timeinc=0):
+  def check(self,ip,sender,recipient):
    "Export records to csv."
    import csv
    dbp = self.dbp
    w = csv.writer(fp)
    now = time.time() + timeinc
    for key, r in dbp.iteritems():
      if now > r.lastseen + self.greylist_retain: continue
      ip,sender,recipient = key.rsplit(':',2)
      w.writerow([ip,sender,recipient,r.firstseen,r.lastseen,r.cnt,r.umis])
  def clean(self,timeinc=0):
    "Delete records past the retention limit."
    now = time.time() + timeinc
    cnt = 0
    dbp = self.dbp
    for key, r in dbp.iteritems():
      #print(key,r,time.ctime(now))
      if now > r.lastseen + self.greylist_retain:
        self.lock.acquire()
        try:
          r = dbp[key]
          now = time.time() + timeinc
          if now > r.lastseen + self.greylist_retain:
            del dbp[key]
            cnt += 1
        finally:
          self.lock.release()
    return cnt
  def check(self,ip,sender,recipient,timeinc=0):
    "Return number of allowed messages for greylist triple."
    sender = quoteAddress(sender)
    recipient = quoteAddress(recipient)
@@ -82,15 +45,15 @@ class Greylist(object):
      dbp = self.dbp
      try:
        r = dbp[key]
-        now = time.time() + timeinc
+        now = time.time()
        if now > r.lastseen + self.greylist_retain:
          # expired
          log.debug('Expired greylist: %s',key)
-          r = Record(timeinc)
+          r = Record()
-        elif now < r.firstseen + self.greylist_time + 5:
+        elif now < r.firstseen + self.greylist_time:
          # still greylisted
          log.debug('Early greylist: %s',key)
-          #r = Record(timeinc)
+          #r = Record()
          r.lastseen = now
        elif r.cnt or now < r.firstseen + self.greylist_expire:
          # in greylist window or active
@@ -100,22 +63,12 @@ class Greylist(object):
        else:
          # passed greylist window
          log.debug('Late greylist: %s',key)
-          r = Record(timeinc)
+          r = Record()
        dbp[key] = r
      except:
-        r = Record(timeinc)
+        r = Record()
        dbp[key] = r
      dbp.sync()
    finally:
      self.lock.release()
    return r.cnt
  def close(self):
    self.dbp.close()
 if __name__ == '__main__':
  import sys
  g = Greylist(sys.argv[1],5,24,36)
  try:
    g.export_csv(sys.stdout)
  finally: g.close()
@@ -1,109 +0,0 @@
 import time
 import logging
 import urllib
 import sqlite3
 try:
  import thread
 except:
  import _thread as thread
 from datetime import datetime
 log = logging.getLogger('milter.greylist')
 _db_lock = thread.allocate_lock()
 class Greylist(object):
  def __init__(self,dbname,grey_time=10,grey_expire=4,grey_retain=36):
    self.ignoreLastByte = False
    self.greylist_time = grey_time * 60         # minutes
    self.greylist_expire = grey_expire * 3600   # hours
    self.greylist_retain = grey_retain * 24 * 3600   # days
    self.conn = sqlite3.connect(dbname)
    self.conn.row_factory = sqlite3.Row
    try:
      self.conn.execute('''create table greylist(
        ip text , sender text, recipient text,
        firstseen timestamp, lastseen timestamp, cnt integer, umis text,
        primary key (ip,sender,recipient))''')
    except: pass
  def import_csv(self,fp):
    import csv
    rdr = csv.reader(fp)
    cur = self.conn.execute('begin immediate')
    try:
      for r in rdr:
        cur.execute('''insert into 
          greylist(ip,sender,recipient,firstseen,lastseen,cnt,umis)
          values(?,?,?,?,?,?,?)''', r)
      self.conn.commit()
    finally:
      cur.close();
  def clean(self,timeinc=0):
    "Delete records past the retention limit."
    now = time.time() + timeinc - self.greylist_retain
    cur = self.conn.cursor()
    try:
      cur.execute('delete from greylist where lastseen < ?',(now,))
      cnt = cur.rowcount
      self.conn.commit()
    finally: cur.close()
    return cnt
  def check(self,ip,sender,recipient,timeinc=0):
    "Return number of allowed messages for greylist triple."
    _db_lock.acquire()
    cur = self.conn.execute('begin immediate')
    try:
      cur.execute('''select firstseen,lastseen,cnt,umis from greylist where
        ip=? and sender=? and recipient=?''',(ip,sender,recipient))
      r = cur.fetchone()
      now = time.time() + timeinc
      cnt = 0
      if not r:
        cur.execute('''insert into 
          greylist(ip,sender,recipient,firstseen,lastseen,cnt,umis)
          values(?,?,?,?,?,?,?)''', (ip,sender,recipient,now,now,0,None))
      elif now > r['lastseen'] + self.greylist_retain:
        # expired
        log.debug('Expired greylist: %s:%s:%s',ip,sender,recipient)
        cur.execute('''update greylist set firstseen=?,lastseen=?,cnt=?,umis=?
          where ip=? and sender=? and recipient=?''',
          (now,now,0,None,ip,sender,recipient))
      elif now < r['firstseen'] + self.greylist_time + 5:
        # still greylisted
        log.debug('Early greylist: %s:%s:%s',ip,sender,recipient)
        #r = Record()
        cur.execute('''update greylist set lastseen=?
          where ip=? and sender=? and recipient=?''',
          (now,ip,sender,recipient))
      elif r['cnt'] or now < r['firstseen'] + self.greylist_expire:
        # in greylist window or active
        cnt = r['cnt'] + 1
        cur.execute('''update greylist set lastseen=?,cnt=?
          where ip=? and sender=? and recipient=?''',
          (now,cnt,ip,sender,recipient))
        log.debug('Active greylist(%d): %s:%s:%s',cnt,ip,sender,recipient)
      else:
        # passed greylist window
        log.debug('Late greylist: %s:%s:%s',ip,sender,recipient)
        cur.execute('''update greylist set firstseen=?,lastseen=?,cnt=?,umis=?
          where ip=? and sender=? and recipient=?''',
          (now,now,0,None,ip,sender,recipient))
      self.conn.commit()
    finally:
      cur.close()
      _db_lock.release()
    return cnt
  def close(self):
    self.conn.close()
 if __name__ == '__main__':
  import sys
  g = Greylist(sys.argv[1])
  try:
    g.import_csv(sys.stdin)
  finally: g.close()
@@ -11,7 +11,7 @@ class PLock(object):
    self.basename = basename
    self.fp = None
-  def lock(self,lockname=None,mode=0o660,strict_perms=False):
+  def lock(self,lockname=None,mode=0660,strict_perms=False):
    "Start an update transaction.  Return FILE to write new version."
    self.unlock()
    if not lockname:
@@ -21,7 +21,7 @@ class PLock(object):
      st = os.stat(self.basename)
      mode |= st.st_mode
    except OSError: pass
-    u = os.umask(0o2)
+    u = os.umask(0002)
    try:
      fd = os.open(lockname,os.O_WRONLY+os.O_CREAT+os.O_EXCL,mode)
    finally:
@@ -46,7 +46,7 @@ class PLock(object):
  def commit(self,backname=None):
    "Commit update transaction with optional backup file."
    if not self.fp:
-      raise IOError("File not locked")
+      raise IOError,"File not locked"
    self.fp.close()
    self.fp = None
    if backname:
@@ -1,118 +0,0 @@
 """Pure Python IP6 parsing and formatting
 Copyright (c) 2006 Stuart Gathman <stuart@bmsi.com>
 This module is free software, and you may redistribute it and/or modify
 it under the same terms as Python itself, so long as this copyright message
 and disclaimer are retained in their original form.
 """
 from __future__ import print_function
 import struct
 #from spf import RE_IP4 
 import re
 PAT_IP4 = r'\.'.join([r'(?:\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])']*4)
 RE_IP4 = re.compile(PAT_IP4+'$')
 def inet_ntop(s):
  """
  Convert ip6 address to standard hex notation.
  Examples:
  >>> inet_ntop(struct.pack("!HHHHHHHH",0,0,0,0,0,0xFFFF,0x0102,0x0304))
  '::FFFF:1.2.3.4'
  >>> inet_ntop(struct.pack("!HHHHHHHH",0x1234,0x5678,0,0,0,0,0x0102,0x0304))
  '1234:5678::102:304'
  >>> inet_ntop(struct.pack("!HHHHHHHH",0,0,0,0x1234,0x5678,0,0x0102,0x0304))
  '::1234:5678:0:102:304'
  >>> inet_ntop(struct.pack("!HHHHHHHH",0x1234,0x5678,0,0x0102,0x0304,0,0,0))
  '1234:5678:0:102:304::'
  >>> inet_ntop(struct.pack("!HHHHHHHH",0,0,0,0,0,0,0,0))
  '::'
  """
  # convert to 8 words
  a = struct.unpack("!HHHHHHHH",s)
  n = (0,0,0,0,0,0,0,0)	# null ip6
  if a == n: return '::'
  # check for ip4 mapped
  if a[:5] == (0,0,0,0,0) and a[5] in (0,0xFFFF):
    ip4 = '.'.join([str(i) for i in struct.unpack("!BBBB",s[12:])])
    if a[5]:
      return "::FFFF:" + ip4
    return "::" + ip4
  # find index of longest sequence of 0
  for l in (7,6,5,4,3,2,1):
    e = n[:l]
    for i in range(9-l):
      if a[i:i+l] == e:
        if i == 0:
          return ':'+':%x'*(8-l) % a[l:]
        if i == 8 - l:
          return '%x:'*(8-l) % a[:-l] + ':'
        return '%x:'*i % a[:i] + ':%x'*(8-l-i) % a[i+l:]
  return "%x:%x:%x:%x:%x:%x:%x:%x" % a
 def inet_pton(p):
  """
  Convert ip6 standard hex notation to ip6 address.
  Examples:
  >>> struct.unpack('!HHHHHHHH',inet_pton('::'))
  (0, 0, 0, 0, 0, 0, 0, 0)
  >>> struct.unpack('!HHHHHHHH',inet_pton('::1234'))
  (0, 0, 0, 0, 0, 0, 0, 4660)
  >>> struct.unpack('!HHHHHHHH',inet_pton('1234::'))
  (4660, 0, 0, 0, 0, 0, 0, 0)
  >>> struct.unpack('!HHHHHHHH',inet_pton('1234::5678'))
  (4660, 0, 0, 0, 0, 0, 0, 22136)
  >>> struct.unpack('!HHHHHHHH',inet_pton('::FFFF:1.2.3.4'))
  (0, 0, 0, 0, 0, 65535, 258, 772)
  >>> struct.unpack('!HHHHHHHH',inet_pton('1.2.3.4'))
  (0, 0, 0, 0, 0, 65535, 258, 772)
  >>> try: inet_pton('::1.2.3.4.5')
  ... except ValueError as x: print(x)
  ::1.2.3.4.5
  """
  if p == '::':
    return b'\0'*16
  s = p
  m = RE_IP4.search(s)
  try:
      if m:
          pos = m.start()
          ip4 = [int(i) for i in s[pos:].split('.')]
          if not pos:
              return struct.pack('!QLBBBB',0,65535,*ip4)
          s = s[:pos]+'%x%02x:%x%02x'%tuple(ip4)
      a = s.split('::')
      if len(a) == 2:
        l,r = a
        if not l:
          r = r.split(':')
          return struct.pack('!HHHHHHHH',
 	    *[0]*(8-len(r)) + [int(s,16) for s in r])
        if not r:
          l = l.split(':')
          return struct.pack('!HHHHHHHH',
 	    *[int(s,16) for s in l] + [0]*(8-len(l)))
        l = l.split(':')
        r = r.split(':')
        return struct.pack('!HHHHHHHH',
 	    *[int(s,16) for s in l] + [0]*(8-len(l)-len(r))
 	    + [int(s,16) for s in r])
      if len(a) == 1:
        return struct.pack('!HHHHHHHH',
 	    *[int(s,16) for s in a[0].split(':')])
  except ValueError: pass
  raise ValueError(p)
@@ -1,553 +0,0 @@
 """A parser for SGML, using the derived class as a static DTD."""
 # XXX This only supports those SGML features used by HTML.
 # XXX There should be a way to distinguish between PCDATA (parsed
 # character data -- the normal case), RCDATA (replaceable character
 # data -- only char and entity references and end tags are special)
 # and CDATA (character data -- only end tags are special).  RCDATA is
 # not supported at all.
 from __future__ import print_function
 try:
  import _markupbase
 except:
  import markupbase as _markupbase
 import re
 __all__ = ["SGMLParser", "SGMLParseError"]
 # Regular expressions used for parsing
 interesting = re.compile('[&<]')
 incomplete = re.compile('&([a-zA-Z][a-zA-Z0-9]*|#[0-9]*)?|'
                           '<([a-zA-Z][^<>]*|'
                              '/([a-zA-Z][^<>]*)?|'
                              '![^<>]*)?')
 entityref = re.compile('&([a-zA-Z][-.a-zA-Z0-9]*)[^a-zA-Z0-9]')
 charref = re.compile('&#([0-9]+)[^0-9]')
 starttagopen = re.compile('<[>a-zA-Z]')
 shorttagopen = re.compile('<[a-zA-Z][-.a-zA-Z0-9]*/')
 shorttag = re.compile('<([a-zA-Z][-.a-zA-Z0-9]*)/([^/]*)/')
 piclose = re.compile('>')
 endbracket = re.compile('[<>]')
 tagfind = re.compile('[a-zA-Z][-_.a-zA-Z0-9]*')
 attrfind = re.compile(
    r'\s*([a-zA-Z_][-:.a-zA-Z_0-9]*)(\s*=\s*'
    r'(\'[^\']*\'|"[^"]*"|[][\-a-zA-Z0-9./,:;+*%?!&$\(\)_#=~\'"@]*))?')
 class SGMLParseError(RuntimeError):
    """Exception raised for all parse errors."""
    pass
 # SGML parser base class -- find tags and call handler functions.
 # Usage: p = SGMLParser(); p.feed(data); ...; p.close().
 # The dtd is defined by deriving a class which defines methods
 # with special names to handle tags: start_foo and end_foo to handle
 # <foo> and </foo>, respectively, or do_foo to handle <foo> by itself.
 # (Tags are converted to lower case for this purpose.)  The data
 # between tags is passed to the parser by calling self.handle_data()
 # with some data as argument (the data may be split up in arbitrary
 # chunks).  Entity references are passed by calling
 # self.handle_entityref() with the entity reference as argument.
 class SGMLParser(_markupbase.ParserBase):
    # Definition of entities -- derived classes may override
    entity_or_charref = re.compile('&(?:'
      '([a-zA-Z][-.a-zA-Z0-9]*)|#([0-9]+)'
      ')(;?)')
    def __init__(self, verbose=0):
        """Initialize and reset this instance."""
        self.verbose = verbose
        self.reset()
    def reset(self):
        """Reset this instance. Loses all unprocessed data."""
        self.__starttag_text = None
        self.rawdata = ''
        self.stack = []
        self.lasttag = '???'
        self.nomoretags = 0
        self.literal = 0
        _markupbase.ParserBase.reset(self)
    def setnomoretags(self):
        """Enter literal mode (CDATA) till EOF.
        Intended for derived classes only.
        """
        self.nomoretags = self.literal = 1
    def setliteral(self, *args):
        """Enter literal mode (CDATA).
        Intended for derived classes only.
        """
        self.literal = 1
    def feed(self, data):
        """Feed some data to the parser.
        Call this as often as you want, with as little or as much text
        as you want (may include '\n').  (This just saves the text,
        all the processing is done by goahead().)
        """
        self.rawdata = self.rawdata + data
        self.goahead(0)
    def close(self):
        """Handle the remaining data."""
        self.goahead(1)
    def error(self, message):
        raise SGMLParseError(message)
    # Internal -- handle data as far as reasonable.  May leave state
    # and data to be processed by a subsequent call.  If 'end' is
    # true, force handling all data as if followed by EOF marker.
    def goahead(self, end):
        rawdata = self.rawdata
        i = 0
        n = len(rawdata)
        while i < n:
            if self.nomoretags:
                self.handle_data(rawdata[i:n])
                i = n
                break
            match = interesting.search(rawdata, i)
            if match: j = match.start()
            else: j = n
            if i < j:
                self.handle_data(rawdata[i:j])
            i = j
            if i == n: break
            if rawdata[i] == '<':
                if starttagopen.match(rawdata, i):
                    if self.literal:
                        self.handle_data(rawdata[i])
                        i = i+1
                        continue
                    k = self.parse_starttag(i)
                    if k < 0: break
                    i = k
                    continue
                if rawdata.startswith("</", i):
                    k = self.parse_endtag(i)
                    if k < 0: break
                    i = k
                    self.literal = 0
                    continue
                if self.literal:
                    if n > (i + 1):
                        self.handle_data("<")
                        i = i+1
                    else:
                        # incomplete
                        break
                    continue
                if rawdata.startswith("<!--", i):
                        # Strictly speaking, a comment is --.*--
                        # within a declaration tag <!...>.
                        # This should be removed,
                        # and comments handled only in parse_declaration.
                    k = self.parse_comment(i)
                    if k < 0: break
                    i = k
                    continue
                if rawdata.startswith("<?", i):
                    k = self.parse_pi(i)
                    if k < 0: break
                    i = i+k
                    continue
                if rawdata.startswith("<!", i):
                    # This is some sort of declaration; in "HTML as
                    # deployed," this should only be the document type
                    # declaration ("<!DOCTYPE html...>").
                    k = self.parse_declaration(i)
                    if k < 0: break
                    i = k
                    continue
            elif rawdata[i] == '&':
                if self.literal:
                    self.handle_data(rawdata[i])
                    i = i+1
                    continue
                match = charref.match(rawdata, i)
                if match:
                    name = match.group(1)
                    self.handle_charref(name)
                    i = match.end(0)
                    if rawdata[i-1] != ';': i = i-1
                    continue
                match = entityref.match(rawdata, i)
                if match:
                    name = match.group(1)
                    self.handle_entityref(name)
                    i = match.end(0)
                    if rawdata[i-1] != ';': i = i-1
                    continue
            else:
                self.error('neither < nor & ??')
            # We get here only if incomplete matches but
            # nothing else
            match = incomplete.match(rawdata, i)
            if not match:
                self.handle_data(rawdata[i])
                i = i+1
                continue
            j = match.end(0)
            if j == n:
                break # Really incomplete
            self.handle_data(rawdata[i:j])
            i = j
        # end while
        if end and i < n:
            self.handle_data(rawdata[i:n])
            i = n
        self.rawdata = rawdata[i:]
        # XXX if end: check for empty stack
    # Extensions for the DOCTYPE scanner:
    _decl_otherchars = '='
    # Internal -- parse processing instr, return length or -1 if not terminated
    def parse_pi(self, i):
        rawdata = self.rawdata
        if rawdata[i:i+2] != '<?':
            self.error('unexpected call to parse_pi()')
        match = piclose.search(rawdata, i+2)
        if not match:
            return -1
        j = match.start(0)
        self.handle_pi(rawdata[i+2: j])
        j = match.end(0)
        return j-i
    def get_starttag_text(self):
        return self.__starttag_text
    # Internal -- handle starttag, return length or -1 if not terminated
    def parse_starttag(self, i):
        self.__starttag_text = None
        start_pos = i
        rawdata = self.rawdata
        if shorttagopen.match(rawdata, i):
            # SGML shorthand: <tag/data/ == <tag>data</tag>
            # XXX Can data contain &... (entity or char refs)?
            # XXX Can data contain < or > (tag characters)?
            # XXX Can there be whitespace before the first /?
            match = shorttag.match(rawdata, i)
            if not match:
                return -1
            tag, data = match.group(1, 2)
            self.__starttag_text = '<%s/' % tag
            tag = tag.lower()
            k = match.end(0)
            self.finish_shorttag(tag, data)
            self.__starttag_text = rawdata[start_pos:match.end(1) + 1]
            return k
        # XXX The following should skip matching quotes (' or ")
        # As a shortcut way to exit, this isn't so bad, but shouldn't
        # be used to locate the actual end of the start tag since the
        # < or > characters may be embedded in an attribute value.
        match = endbracket.search(rawdata, i+1)
        if not match:
            return -1
        j = match.start(0)
        # Now parse the data between i+1 and j into a tag and attrs
        attrs = []
        if rawdata[i:i+2] == '<>':
            # SGML shorthand: <> == <last open tag seen>
            k = j
            tag = self.lasttag
        else:
            match = tagfind.match(rawdata, i+1)
            if not match:
                self.error('unexpected call to parse_starttag')
            k = match.end(0)
            tag = rawdata[i+1:k].lower()
            self.lasttag = tag
        while k < j:
            match = attrfind.match(rawdata, k)
            if not match: break
            attrname, rest, attrvalue = match.group(1, 2, 3)
            if not rest:
                attrvalue = attrname
            else:
                if (attrvalue[:1] == "'" == attrvalue[-1:] or
                    attrvalue[:1] == '"' == attrvalue[-1:]):
                    # strip quotes
                    attrvalue = attrvalue[1:-1]
                attrvalue = self.entity_or_charref.sub(
                    self._convert_ref, attrvalue)
            attrs.append((attrname.lower(), attrvalue))
            k = match.end(0)
        if rawdata[j] == '>':
            j = j+1
        self.__starttag_text = rawdata[start_pos:j]
        self.finish_starttag(tag, attrs)
        return j
    # Internal -- convert entity or character reference
    def _convert_ref(self, match):
        if match.group(2):
            return self.convert_charref(match.group(2)) or \
                '&#%s%s' % match.groups()[1:]
        elif match.group(3):
            return self.convert_entityref(match.group(1)) or \
                '&%s;' % match.group(1)
        else:
            return '&%s' % match.group(1)
    # Internal -- parse endtag
    def parse_endtag(self, i):
        rawdata = self.rawdata
        match = endbracket.search(rawdata, i+1)
        if not match:
            return -1
        j = match.start(0)
        tag = rawdata[i+2:j].strip().lower()
        if rawdata[j] == '>':
            j = j+1
        self.finish_endtag(tag)
        return j
    # Internal -- finish parsing of <tag/data/ (same as <tag>data</tag>)
    def finish_shorttag(self, tag, data):
        self.finish_starttag(tag, [])
        self.handle_data(data)
        self.finish_endtag(tag)
    # Internal -- finish processing of start tag
    # Return -1 for unknown tag, 0 for open-only tag, 1 for balanced tag
    def finish_starttag(self, tag, attrs):
        try:
            method = getattr(self, 'start_' + tag)
        except AttributeError:
            try:
                method = getattr(self, 'do_' + tag)
            except AttributeError:
                self.unknown_starttag(tag, attrs)
                return -1
            else:
                self.handle_starttag(tag, method, attrs)
                return 0
        else:
            self.stack.append(tag)
            self.handle_starttag(tag, method, attrs)
            return 1
    # Internal -- finish processing of end tag
    def finish_endtag(self, tag):
        if not tag:
            found = len(self.stack) - 1
            if found < 0:
                self.unknown_endtag(tag)
                return
        else:
            if tag not in self.stack:
                try:
                    method = getattr(self, 'end_' + tag)
                except AttributeError:
                    self.unknown_endtag(tag)
                else:
                    self.report_unbalanced(tag)
                return
            found = len(self.stack)
            for i in range(found):
                if self.stack[i] == tag: found = i
        while len(self.stack) > found:
            tag = self.stack[-1]
            try:
                method = getattr(self, 'end_' + tag)
            except AttributeError:
                method = None
            if method:
                self.handle_endtag(tag, method)
            else:
                self.unknown_endtag(tag)
            del self.stack[-1]
    # Overridable -- handle start tag
    def handle_starttag(self, tag, method, attrs):
        method(attrs)
    # Overridable -- handle end tag
    def handle_endtag(self, tag, method):
        method()
    # Example -- report an unbalanced </...> tag.
    def report_unbalanced(self, tag):
        if self.verbose:
            print('*** Unbalanced </' + tag + '>')
            print('*** Stack:', self.stack)
    def convert_charref(self, name):
        """Convert character reference, may be overridden."""
        try:
            n = int(name)
        except ValueError:
            return
        if not 0 <= n <= 127:
            return
        return self.convert_codepoint(n)
    def convert_codepoint(self, codepoint):
        return chr(codepoint)
    def handle_charref(self, name):
        """Handle character reference, no need to override."""
        replacement = self.convert_charref(name)
        if replacement is None:
            self.unknown_charref(name)
        else:
            self.handle_data(replacement)
    # Definition of entities -- derived classes may override
    entitydefs = \
            {'lt': '<', 'gt': '>', 'amp': '&', 'quot': '"', 'apos': '\''}
    def convert_entityref(self, name):
        """Convert entity references.
        As an alternative to overriding this method; one can tailor the
        results by setting up the self.entitydefs mapping appropriately.
        """
        table = self.entitydefs
        if name in table:
            return table[name]
        else:
            return
    def handle_entityref(self, name):
        """Handle entity references, no need to override."""
        replacement = self.convert_entityref(name)
        if replacement is None:
            self.unknown_entityref(name)
        else:
            self.handle_data(replacement)
    # Example -- handle data, should be overridden
    def handle_data(self, data):
        pass
    # Example -- handle comment, could be overridden
    def handle_comment(self, data):
        pass
    # Example -- handle declaration, could be overridden
    def handle_decl(self, decl):
        pass
    # Example -- handle processing instruction, could be overridden
    def handle_pi(self, data):
        pass
    # To be overridden -- handlers for unknown objects
    def unknown_starttag(self, tag, attrs): pass
    def unknown_endtag(self, tag): pass
    def unknown_charref(self, ref): pass
    def unknown_entityref(self, ref): pass
 class TestSGMLParser(SGMLParser):
    def __init__(self, verbose=0):
        self.testdata = ""
        SGMLParser.__init__(self, verbose)
    def handle_data(self, data):
        self.testdata = self.testdata + data
        if len(repr(self.testdata)) >= 70:
            self.flush()
    def flush(self):
        data = self.testdata
        if data:
            self.testdata = ""
            print('data:', repr(data))
    def handle_comment(self, data):
        self.flush()
        r = repr(data)
        if len(r) > 68:
            r = r[:32] + '...' + r[-32:]
        print('comment:', r)
    def unknown_starttag(self, tag, attrs):
        self.flush()
        if not attrs:
            print('start tag: <' + tag + '>')
        else:
            print('start tag: <' + tag, end=' ')
            for name, value in attrs:
                print(name + '=' + '"' + value + '"', end=' ')
            print('>')
    def unknown_endtag(self, tag):
        self.flush()
        print('end tag: </' + tag + '>')
    def unknown_entityref(self, ref):
        self.flush()
        print('*** unknown entity ref: &' + ref + ';')
    def unknown_charref(self, ref):
        self.flush()
        print('*** unknown char ref: &#' + ref + ';')
    def unknown_decl(self, data):
        self.flush()
        print('*** unknown decl: [' + data + ']')
    def close(self):
        SGMLParser.close(self)
        self.flush()
 def test(args = None):
    import sys
    if args is None:
        args = sys.argv[1:]
    if args and args[0] == '-s':
        args = args[1:]
        klass = SGMLParser
    else:
        klass = TestSGMLParser
    if args:
        file = args[0]
    else:
        file = 'test.html'
    if file == '-':
        f = sys.stdin
    else:
        try:
            f = open(file, 'r')
        except IOError as msg:
            print(file, ":", msg)
            sys.exit(1)
    data = f.read()
    if f is not sys.stdin:
        f.close()
    x = klass()
    for c in data:
        x.feed(c)
    x.close()
 if __name__ == '__main__':
    test()
@@ -1,240 +0,0 @@
 ## @package Milter.test
 # A test framework for milters
 from __future__ import print_function
 import mime
 try:
  from io import BytesIO
 except:
  from StringIO import StringIO as BytesIO
 import Milter
 Milter.NOREPLY = Milter.CONTINUE
 ## Test mixin for unit testing %milter applications.
 # This mixin overrides many Milter.MilterBase methods
 # with stub versions that simply record what was done.
 # @deprecated Use Milter.test.TestCtx
 # @since 0.9.8
 class TestBase(object):
  def __init__(self,logfile='test/milter.log'):
    self._protocol = 0
    self.logfp = open(logfile,"a")
    ## The MAIL FROM for the current email being fed to the %milter
    self._sender = None
    ## List of recipients deleted
    self._delrcpt = []
    ## List of recipients added
    self._addrcpt = []
    ## Macros defined
    self._macros = { }
    ## The message body.
    self._body = None
    ## True if the %milter replaced the message body.
    self._bodyreplaced = False
    ## True if the %milter changed any headers.
    self._headerschanged = False
    ## True if the %milter changed the envelope from.
    self._envfromchanged = False
    ## Reply codes and messages set by the %milter
    self._reply = None
    ## The rfc822 message object for the current email being fed to the %milter.
    self._msg = None
    ## The protocol stage for macros returned
    self._stage = None
    ## The macros returned by protocol stage
    self._symlist = [ None, None, None, None, None, None, None ]
  def log(self,*msg):
    for i in msg: print(i,file=self.logfp,end=None)
    print(file=self.logfp)
  ## Set a macro value.
  # These are retrieved by the %milter with getsymval.
  # @param name the macro name, as passed to getsymval
  # @param val the macro value
  def setsymval(self,name,val):
    self._macros[name] = val
  def getsymval(self,name):
    stage = self._stage
    if stage >= 0:
      syms = self._symlist[stage]
      if syms is not None and name not in syms:
        return None
    return self._macros.get(name,None)
  def replacebody(self,chunk):
    if self._body:
      self._body.write(chunk)
      self._bodyreplaced = True
    else:
      raise IOError("replacebody not called from eom()")
  def chgfrom(self,sender,params=None):
    if not self._body:
      raise IOError("chgfrom not called from eom()")
    self.log('chgfrom: sender=%s' % (sender))
    self._envfromchanged = True
    self._sender = sender
  # TODO: write implement quarantine()
  def quarantine(self,reason):
    raise NotImplemented
  # TODO: measure time between milter calls
  def progress(self):
    pass
  # FIXME: rfc822 indexing does not really reflect the way chg/add header
  # work for a %milter
  def chgheader(self,field,idx,value):
    if not self._body:
      raise IOError("chgheader not called from eom()")
    self.log('chgheader: %s[%d]=%s' % (field,idx,value))
    if value == '':
      del self._msg[field]
    else:
      self._msg[field] = value
    self._headerschanged = True
  def addheader(self,field,value,idx=-1):
    if not self._body:
      raise IOError("addheader not called from eom()")
    self.log('addheader: %s=%s' % (field,value))
    self._msg[field] = value
    self._headerschanged = True
  def delrcpt(self,rcpt):
    if not self._body:
      raise IOError("delrcpt not called from eom()")
    self._delrcpt.append(rcpt)
  def addrcpt(self,rcpt):
    if not self._body:
      raise IOError("addrcpt not called from eom()")
    self._addrcpt.append(rcpt)
  ## Save the reply codes and messages in self._reply.
  def setreply(self,rcode,xcode,*msg):
    self._reply = (rcode,xcode) + msg
  def setsymlist(self,stage,macros):
    if not self._actions & Milter.SETSYMLIST:
      raise DisabledAction("SETSYMLIST")
    if self._stage != -1:
      raise RuntimeError("setsymlist may only be called from negotiate")
    # not used yet, but just for grins we save the data
    a = []
    for m in macros:
      try:
        m = m.encode('utf8')
      except: pass
      try:
        m = m.split(b' ')
      except: pass
      a += m
    if len(a) > 5:
      raise ValueError('setsymlist limited to 5 macros by MTA')
    if self._symlist[stage] is not None:
      raise ValueError('setsymlist already called for stage:'+stage)
    print('setsymlist',stage,a)
    self._symlist[stage] = set(a)
  ## Feed a file like object to the %milter.  Calls envfrom, envrcpt for
  # each recipient, header for each header field, body for each body 
  # block, and finally eom.  A return code from the %milter other than
  # CONTINUE returns immediately with that return code.
  #
  # This is a convenience method, a test could invoke the callbacks
  # in sequence on its own - and for some complex tests, this may
  # be necessary.
  # @param fp the file with rfc2822 message stream
  # @param sender the MAIL FROM
  # @param rcpt RCPT TO - additional recipients may follow
  def feedFile(self,fp,sender="spam@adv.com",rcpt="victim@lamb.com",*rcpts):
    self._body = None
    self._bodyreplaced = False
    self._headerschanged = False
    self._reply = None
    self._sender = '<%s>'%sender
    msg = mime.message_from_file(fp)
    # envfrom
    self._stage = Milter.M_ENVFROM
    rc = self.envfrom(self._sender)
    self._stage = None
    if rc != Milter.CONTINUE: return rc
    # envrcpt
    for rcpt in (rcpt,) + rcpts:
      self._stage = Milter.M_ENVRCPT
      rc = self.envrcpt('<%s>'%rcpt)
      self._stage = None
      if rc != Milter.CONTINUE: return rc
    # data
    self._stage = Milter.M_DATA
    rc = self.data()
    self._stage = None
    if rc != Milter.CONTINUE: return rc
    # header
    for h,val in msg.items():
      rc = self.header(h,val)
      if rc != Milter.CONTINUE: return rc
    # eoh
    self._stage = Milter.M_EOH
    rc = self.eoh()
    self._stage = None
    if rc != Milter.CONTINUE: return rc
    # body
    header,body = msg.as_bytes().split(b'\n\n',1)
    bfp = BytesIO(body)
    while 1:
      buf = bfp.read(8192)
      if len(buf) == 0: break
      rc = self.body(buf)
      if rc != Milter.CONTINUE: return rc
    self._msg = msg
    self._body = BytesIO()
    self._stage = Milter.M_EOM
    rc = self.eom()
    self._stage = None
    if self._bodyreplaced:
      body = self._body.getvalue()
    self._body = BytesIO()
    self._body.write(header)
    self._body.write(b'\n\n')
    self._body.write(body)
    return rc
  ## Feed an email contained in a file to the %milter.
  # This is a convenience method that invokes @link #feedFile feedFile @endlink.
  # @param sender MAIL FROM
  # @param rcpts RCPT TO, multiple recipients may be supplied
  def feedMsg(self,fname,sender="spam@adv.com",*rcpts):
    with open('test/'+fname,'rb') as fp:
      return self.feedFile(fp,sender,*rcpts)
  ## Call the connect and helo callbacks.
  # The helo callback is not called if connect does not return CONTINUE.
  # @param host the hostname passed to the connect callback
  # @param helo the hostname passed to the helo callback
  # @param ip the IP address passed to the connect callback
  def connect(self,host='localhost',helo='spamrelay',ip='1.2.3.4'):
    self._body = None
    self._bodyreplaced = False
    self._setctx(None)
    opts = [ Milter.CURR_ACTS,~0,0,0 ]
    self._stage = -1
    rc = self.negotiate(opts)
    self._stage = Milter.M_CONNECT
    rc =  super(TestBase,self).connect(host,1,(ip,1234)) 
    if rc != Milter.CONTINUE:
      self._stage = None
      self.close()
      return rc
    self._stage = Milter.M_HELO
    rc = self.hello(helo)
    self._stage = None
    if rc != Milter.CONTINUE:
      self.close()
    return rc
@@ -1,297 +0,0 @@
 ## @package Milter.testctx
 # A test framework for milters that replaces milterContext rather
 # than Milter.Base.  Since miltermodule.c doesn't currently export
 # a way to query callbacks set (and we might want to run without 
 # loading milter), we assume the callbacks set by Milter.runmilter().
 from __future__ import print_function
 from socket import AF_INET,AF_INET6
 import time
 import mime
 try:
  from io import BytesIO
 except:
  from StringIO import StringIO as BytesIO
 import Milter
 from Milter import utils
 import mime
 ## Milter context for unit testing %milter applications.
 # A substitute for milter.milterContext that can be passed to
 # Milter.Base._setctx().
 # @since 1.0.3
 class TestCtx(object):
  default_opts = [Milter.CURR_ACTS,0x1fffff,0,0]
  def __init__(self,logfile='test/milter.log'):
    ## Usually the Milter application derived from Milter.Base
    self._priv = None
    ## List of recipients deleted
    self._delrcpt = []
    ## List of recipients added
    self._addrcpt = []
    ## Macros defined
    self._macros = { }
    ## Reply codes and messages set by the %milter
    self._reply = None
    ## The macros returned by protocol stage
    self._symlist = [ None, None, None, None, None, None, None ]
    ## The message body.
    self._body = None
    ## True if the %milter replaced the message body.
    self._bodyreplaced = False
    ## True if the %milter changed any headers.
    self._headerschanged = False
    ## The rfc822 message object for the current email being fed to the %milter.
    self._msg = None
    ## The MAIL FROM for the current email being fed to the %milter
    self._sender = None
    ## True if the %milter changed the envelope from.
    self._envfromchanged = False
    ## List of recipients added
    self._addrcpt = []
    ## Negotiated options
    self._opts = TestCtx.default_opts
    ## Last activity
    self._activity = time.time()
  def getpriv(self):
    return self._priv
  def setpriv(self,priv):
    self._priv = priv
  def getsymval(self,name):
    stage = self._stage
    if stage >= 0:
      try:
        s = name.encode('utf8')
      except: pass
      syms = self._symlist[stage]
      if syms is not None and s not in syms:
        return None
    return self._macros.get(name,None)
  def _setsymval(self,name,val):
    self._macros[name] = val
  def setreply(self,rcode,xcode,*msg):
    self._reply = (rcode,xcode) + msg
  def setsymlist(self,stage,macros):
    if self._stage != -1:
      raise RuntimeError("setsymlist may only be called from negotiate")
    # Records which macros are available to getsymval()
    m = macros
    try:
      m = m.encode('utf8')
    except: pass
    try:
      m = m.split(b' ')
    except: pass
    if len(m) > 5:
      raise ValueError('setsymlist limited to 5 macros by MTA')
    if self._symlist[stage] is not None:
      raise ValueError('setsymlist already called for stage:'+stage)
    if not m:
      raise ValueError('setsymlist with empty list for stage:'+stage)
    self._symlist[stage] = set(m)
  def addheader(self,field,value,idx):
    if not self._body:
      raise IOError("addheader not called from eom()")
    self._msg[field] = value
    self._headerschanged = True
  def chgheader(self,field,idx,value):
    if not self._body:
      raise IOError("chgheader not called from eom()")
    if value == '':
      del self._msg[field]
    else:
      self._msg[field] = value
    self._headerschanged = True
  def addrcpt(self,rcpt,params):
    if not self._body:
      raise IOError("addrcpt not called from eom()")
    self._addrcpt.append((rcpt,params))
  def delrcpt(self,rcpt):
    if not self._body:
      raise IOError("delrcpt not called from eom()")
    self._delrcpt.append(rcpt)
  def replacebody(self,chunk):
    if self._body:
      self._body.write(chunk)
      self._bodyreplaced = True
    else:
      raise IOError("replacebody not called from eom()")
  def chgfrom(self,sender,params=None):
    if not self._body:
      raise IOError("chgfrom not called from eom()")
    self._envfromchanged = True
    self._sender = sender
  def quarantine(self,reason):
    raise NotImplemented
  ## Reset activity timer.
  def progress(self):
    self._activity = time.time()
  def _abort(self):
    "What Milter sets for abort_callback"
    self._priv.abort()
    self._close()
  def _close(self):
    Milter.close_callback(self)
  def _negotiate(self):
    self._body = None
    self._bodyreplaced = False
    self._priv = None
    self._opts = TestCtx.default_opts
    self._stage = -1
    rc = Milter.negotiate_callback(self,self._opts)
    if rc == Milter.ALL_OPTS:
      self._opts = TestCtx.default_opts
    elif rc != Milter.CONTINUE:
      self._abort()
      self._close()
    self._protocol = self._opts[1]
    return rc
  def _connect(self,host='localhost',helo='spamrelay',ip='1.2.3.4'):
    rc = self._negotiate()
    # FIXME: what if not CONTINUE or ALL_OPTS?
    if self._protocol & Milter.P_NOCONNECT:
      return Milter.CONTINUE
    if utils.ip4re.match(ip):
      af = AF_INET
    elif utils.ip6re.match(ip):
      af = AF_INET6
    else:
      raise ValueError('TestCtx.connect: invalid ip address: '+ip)
    self._stage = Milter.M_CONNECT
    rc = Milter.connect_callback(self,host,af,ip)
    self._stage = None
    if rc != Milter.CONTINUE:
      self._close()
      return rc
    return self._helo(helo)
  def _helo(self,helo):
    if self._protocol & Milter.P_NOHELO:
      return Milter.CONTINUE
    self._stage = Milter.M_HELO
    rc = self._priv.hello(helo)
    self._stage = None
    if rc != Milter.CONTINUE:
      self._close()
    return rc
  def _envfrom(self,*s):
    self._sender = s[0]
    if self._protocol & Milter.P_NOMAIL:
      return Milter.CONTINUE
    self._stage = Milter.M_ENVFROM
    rc = self._priv.envfrom(*s)
    self._stage = None
    return rc
  def _envrcpt(self,s):
    if self._protocol & Milter.P_NORCPT:
      return Milter.CONTINUE
    self._stage = Milter.M_ENVRCPT
    rc = self._priv.envrcpt(s)
    self._stage = None
    return rc
  def _data(self):
    if self._protocol & Milter.P_NODATA:
      return Milter.CONTINUE
    self._stage = Milter.M_DATA
    rc = self._priv.data()
    self._stage = None
    return rc
  def _header(self,fld,val):
    return self._priv.header(fld,val)
  def _eoh(self):
    if self._protocol & Milter.P_NOEOH:
      return Milter.CONTINUE
    self._stage = Milter.M_EOH
    rc = self._priv.eoh()
    self._stage = None
    return rc
  def _feed_body(self,bfp):
    if self._protocol & Milter.P_NOBODY:
      return Milter.CONTINUE
    while True:
      buf = bfp.read(8192)
      if len(buf) == 0: break
      rc = self._priv.body(buf)
      if rc != Milter.CONTINUE: return rc
    return Milter.CONTINUE
  def _eom(self):
    self._body = BytesIO()
    self._stage = Milter.M_EOM
    rc = self._priv.eom()
    self._stage = None
    return rc
  ## Feed a file like object to the ctx.  Calls the callbacks in
  # the same sequence as libmilter.
  # @param fp the file with rfc2822 message stream
  # @param sender the MAIL FROM
  # @param rcpt RCPT TO - additional recipients may follow
  def _feedFile(self,fp,sender="spam@adv.com",rcpt="victim@lamb.com",*rcpts):
    self._body = None
    self._bodyreplaced = False
    self._headerschanged = False
    self._reply = None
    msg = mime.message_from_file(fp)
    self._msg = msg
    # envfrom
    rc = self._envfrom('<%s>'%sender)
    if rc != Milter.CONTINUE: return rc
    # envrcpt
    for rcpt in (rcpt,) + rcpts:
      rc = self._envrcpt('<%s>'%rcpt)
      if rc != Milter.CONTINUE: return rc
    # data
    rc = self._data()
    if rc != Milter.CONTINUE: return rc
    # header
    for h,val in msg.items():
      rc = self._header(h,val)
      if rc != Milter.CONTINUE: return rc
    # eoh
    rc = self._eoh()
    if rc != Milter.CONTINUE: return rc
    # body
    header,body = msg.as_bytes().split(b'\n\n',1)
    rc = self._feed_body(BytesIO(body))
    if rc != Milter.CONTINUE: return rc
    rc = self._eom()
    if self._bodyreplaced:
      body = self._body.getvalue()
    self._body = BytesIO()
    self._body.write(header)
    self._body.write(b'\n\n')
    self._body.write(body)
    return rc
  ## Feed an email contained in a file to the %milter.
  # This is a convenience method that invokes @link #feedFile feedFile @endlink.
  # @param sender MAIL FROM
  # @param rcpts RCPT TO, multiple recipients may be supplied
  def _feedMsg(self,fname,sender="spam@adv.com",*rcpts):
    with open('test/'+fname,'rb') as fp:
      return self._feedFile(fp,sender,*rcpts)
@@ -1,65 +1,23 @@
 ## @package Milter.utils
 # Miscellaneous functions.
 #
 import re
 import struct
 import socket
-import email.errors
+import email.Errors
 from email.header import decode_header
 import email.base64mime
 import email.utils
 from fnmatch import fnmatchcase
-from binascii import a2b_base64
+from email.Header import decode_header
 #import email.Utils
 import rfc822
-dnsre = re.compile(r'^[a-z][-a-z\d.]+$', re.IGNORECASE)
+ip4re = re.compile(r'^[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*$')
 PAT_IP4 = r'\.'.join([r'(?:\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])']*4)
 ip4re = re.compile(PAT_IP4+'$')
 ip6re = re.compile(                 '(?:%(hex4)s:){6}%(ls32)s$'
                   '|::(?:%(hex4)s:){5}%(ls32)s$'
                  '|(?:%(hex4)s)?::(?:%(hex4)s:){4}%(ls32)s$'
    '|(?:(?:%(hex4)s:){0,1}%(hex4)s)?::(?:%(hex4)s:){3}%(ls32)s$'
    '|(?:(?:%(hex4)s:){0,2}%(hex4)s)?::(?:%(hex4)s:){2}%(ls32)s$'
    '|(?:(?:%(hex4)s:){0,3}%(hex4)s)?::%(hex4)s:%(ls32)s$'
    '|(?:(?:%(hex4)s:){0,4}%(hex4)s)?::%(ls32)s$'
    '|(?:(?:%(hex4)s:){0,5}%(hex4)s)?::%(hex4)s$'
    '|(?:(?:%(hex4)s:){0,6}%(hex4)s)?::$'
  % {
    'ls32': r'(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|%s)'%PAT_IP4,
    'hex4': r'[0-9a-f]{1,4}'
    }, re.IGNORECASE)
 # from spf.py
-def addr2bin(s):
+def addr2bin(str):
-  """Convert a string IPv4 address into an unsigned integer."""
+  "Convert a string IPv4 address into an unsigned integer."
-  if s.find(':') >= 0:
+  return struct.unpack("!L", socket.inet_aton(str))[0]
    try:
      return bin2long6(inet_pton(s))
    except:
      raise socket.error("Invalid IP6 address: "+s)
  try:
    return struct.unpack("!L", socket.inet_aton(s))[0]
  except socket.error:
    raise socket.error("Invalid IP4 address: "+s)
-def bin2long6(s):
+MASK = 0xFFFFFFFFL
    """Convert binary IP6 address into an unsigned Python long integer."""
    h, l = struct.unpack("!QQ", s)
    return h << 64 | l
-if hasattr(socket,'has_ipv6') and socket.has_ipv6:
+def cidr(i,n):
-    def inet_ntop(s):
+  return ~(MASK >> n) & MASK & i
        return socket.inet_ntop(socket.AF_INET6,s)
    def inet_pton(s):
        return socket.inet_pton(socket.AF_INET6,s.strip())
 else:
    from pyip6 import inet_ntop, inet_pton
 MASK = 0xFFFFFFFF
 MASK6 = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 def cidr(i,n,mask=MASK):
  return ~(mask >> n) & mask & i
 def iniplist(ipaddr,iplist):
  """Return whether ip is in cidr list
@@ -69,27 +27,8 @@ def iniplist(ipaddr,iplist):
  True
  >>> iniplist('192.168.0.45',['192.168.0.*'])
  True
  >>> iniplist('4.2.2.2',['b.resolvers.Level3.net'])
  True
  >>> iniplist('2606:2800:220:1::',['example.com/40'])
  True
  >>> iniplist('4.2.2.2',['nothing.example.com'])
  False
  >>> iniplist('2001:610:779:0:223:6cff:fe9a:9cf3',['127.0.0.1','172.20.1.0/24','2001:610:779::/48'])
  True
  >>> iniplist('2G01:610:779:0:223:6cff:fe9a:9cf3',['127.0.0.1','172.20.1.0/24','2001:610:779::/48'])
  Traceback (most recent call last):
    ...
  ValueError: Invalid ip syntax:2G01:610:779:0:223:6cff:fe9a:9cf3
  """
  if ip4re.match(ipaddr):
    fam = socket.AF_INET
  ipnum = addr2bin(ipaddr)
  elif ip6re.match(ipaddr):
    fam = socket.AF_INET6
    ipnum = bin2long6(inet_pton(ipaddr))
  else:
    raise ValueError('Invalid ip syntax:'+ipaddr)
  for pat in iplist:
    p = pat.split('/',1)
    if ip4re.match(p[0]):
@@ -99,29 +38,10 @@ def iniplist(ipaddr,iplist):
        n = 32
      if cidr(addr2bin(p[0]),n) == cidr(ipnum,n):
        return True
    elif ip6re.match(p[0]):
      if len(p) > 1:
        n = int(p[1])
      else:
        n = 128
      if cidr(bin2long6(inet_pton(p[0])),n,MASK6) == cidr(ipnum,n,MASK6):
        return True
    elif dnsre.match(p[0]):
      try:
        sfx = '/'.join(['']+p[1:])
        addrlist = [r[4][0]+sfx for r in socket.getaddrinfo(p[0],25,fam)]
        if iniplist(ipaddr,addrlist):
          return True
      except socket.gaierror: pass
    elif fnmatchcase(ipaddr,pat):
      return True
  return False
 ## Split email into Fullname and address.
 # This replaces <code>email.utils.parseaddr</code> but fixes
 # some <a href="http://bugs.python.org/issue1025395">tricky test cases</a>.
 # Additional tricky cases are still broken.  Patches welcome.
 #
 def parseaddr(t):
  """Split email into Fullname and address.
@@ -134,10 +54,12 @@ def parseaddr(t):
  >>> parseaddr('God@heaven <@hop1.org,@hop2.net:jeff@spec.org>')
  ('God@heaven', 'jeff@spec.org')
  >>> parseaddr('Real Name ((comment)) <addr...@example.com>')
-  ('Real Name (comment)', 'addr...@example.com')
+  ('Real Name', 'addr...@example.com')
  >>> parseaddr('a(WRONG)@b')
  ('WRONG', 'a@b')
  """
-  #return email.utils.parseaddr(t)
+  #return email.Utils.parseaddr(t)
-  res = email.utils.parseaddr(t)
+  res = rfc822.parseaddr(t)
  # dirty fix for some broken cases
  if not res[0]:
    pos = t.find('<')
@@ -146,7 +68,7 @@ def parseaddr(t):
      pos1 = addrspec.rfind(':')
      if pos1 > 0:
        addrspec = addrspec[pos1+1:]
-      return email.utils.parseaddr('"%s" <%s>' % (t[:pos].strip(),addrspec))
+      return rfc822.parseaddr('"%s" <%s>' % (t[:pos].strip(),addrspec))
  if not res[1]:
    pos = t.find('<')
    if pos > 0 and t[-1] == '>':
@@ -154,19 +76,9 @@ def parseaddr(t):
      pos1 = addrspec.rfind(':')
      if pos1 > 0:
        addrspec = addrspec[pos1+1:]
-      return email.utils.parseaddr('%s<%s>' % (t[:pos].strip(),addrspec))
+      return rfc822.parseaddr('%s<%s>' % (t[:pos].strip(),addrspec))
  return res
 ## Fix email.base64mime.decode to add any missing padding
 def decode(s, convert_eols=None):
  if not s: return s
  while len(s) % 4: s += '='	# add missing padding
  dec = a2b_base64(s)
  if convert_eols:
      return dec.replace(CRLF, convert_eols)
  return dec
 email.base64mime.decode = decode
 def parse_addr(t):
  """Split email into user,domain.
@@ -179,27 +91,13 @@ def parse_addr(t):
  ['user@bar', 'example.com']
  >>> parse_addr('foo')
  ['foo']
  >>> parse_addr('@mx.example.com:user@example.com')
  ['user', 'example.com']
  >>> parse_addr('@user@example.com')
  ['@user', 'example.com']
  """
  if t.startswith('<') and t.endswith('>'): t = t[1:-1]
  if t.startswith('"'):
    if t.endswith('"'): return [t[1:-1]]
    pos = t.find('"@')
    if pos > 0: return [t[1:pos],t[pos+2:]]
-  if t.startswith('@'):
+  return t.split('@')
    try: t = t.split(':',1)[1]
    except IndexError: pass
  return t.rsplit('@',1)
 ## Decode headers gratuitously encoded to hide the content.
 # Spammers often encode headers to obscure the content from
 # spam filters.  This function decodes gratuitously encoded
 # headers.
 # @param val    the raw header value
 # @return the decoded value or the original raw value
 def parse_header(val):
  """Decode headers gratuitously encoded to hide the content.
@@ -211,18 +109,17 @@ def parse_header(val):
    for s,enc in h:
      if enc:
        try:
-          u.append(s.decode(enc,'replace'))
+	  u.append(unicode(s,enc))
 	except LookupError:
-          u.append(s.decode())
+	  u.append(unicode(s))
      else:
-        u.append(s.decode())
+	u.append(unicode(s))
-    u = u''.join(u)
+    u = ''.join(u)
-    for enc in ('us-ascii','iso-8859-1','utf-8'):
+    for enc in ('us-ascii','iso-8859-1','utf8'):
      try:
 	return u.encode(enc)
      except UnicodeError: continue
  except UnicodeDecodeError: pass
  except LookupError: pass
-  except ValueError: pass
+  except email.Errors.HeaderParseError: pass
  except email.errors.HeaderParseError: pass
  return val
@@ -11,24 +11,25 @@ any point, tell Sendmail to reject, discard, or accept the message.
 Requirements
 ------------
-Python milter extension: http://https://pypi.python.org/pypi/pymilter/
+This python milter extension: http://www.bmsi.com/python/milter.html
 Python: http://www.python.org
 Sendmail: http://www.sendmail.org
 NB: From Sendmail's libmilter/README:
 libmilter requires pthread support in the operating system.  Moreover, it
 requires that the library functions it uses are thread safe; which is true
 for the operating systems libmilter has been developed and tested on.  On
 some operating systems this requires special compile time options (e.g.,
-not just -pthread).  libmilter is currently known to work on (modulo problems
+not just -pthread).  libmilter is currently known to work on (modulo
-in the pthread support of some specific versions):
+problems in the pthread support of some specific versions):
 FreeBSD 3.x, 4.x
 SunOS 5.x (x >= 5)
 AIX 4.3.x
 HP UX 11.x
 Linux (recent versions/distributions)
 OpenBSD
 AIX 4.1.5
 libmilter is currently not supported on:
@@ -68,7 +69,8 @@ Not-so-quick Installation
 First install Sendmail.  Make sure you read libmilter/README in the Sendmail
 source directory, and make sure you enable libmilter before you build.  The
 8.11 series had libmilter marked as FFR (For Future Release); 8.12
-officially supports libmilter, but it's still not built by default.
+officially
 supports libmilter, but it's still not built by default.
 Install Python, and enable threading in Modules/Setup.
@@ -109,9 +111,33 @@ _FFR_MILTER for the cf macros.  For example,
 m4 -D_FFR_MILTER ../m4/cf.m4 myconfig.mc > myconfig.cf
 RedHat 6.2 Notes
 ----------------
 The Redhat 6.2 sendmail RPM does not enable milter.  You can obtain a
 modified spec file at
 http://www.bmsi.com/linux/rh62/sendmail-rhmilter.spec
 use it to rebuild the Redhat 7.2 SRPM.  The RH6.2 SRPM does not have
 recent sendmail security patches.
 RedHat 7.2 Notes
 ----------------
 The Redhat 7.2 sendmail RPM enables milter in sendmail - but does not include
 the headers needed for compiling a milter.  You can obtain a modified spec
 file with a sendmail-devel package that includes the needed static libraries
 and headers at
 http://www.bmsi.com/linux/sendmail-rh72.spec
 IPv6 Notes
 ----------
 IPv6 is still experimental.
 The IPv6 protocol is supported if your operation system supports it
 and if sendmail was compiled with IPv6 support.  To determine if your
 sendmail supports IPv6, run "sendmail -d0" and check for the NETINET6
@@ -169,7 +195,7 @@ Authors
 -------
 Jim Niemira (urmane@urmane.org) wrote the original C module and some quick
-and dirty python to use it.  Stuart D. Gathman (stuart@gathman.org) took that
+and dirty python to use it.  Stuart D. Gathman (stuart@bmsi.com) took that
 kludge and added threading and context objects to it, wrote a proper OO
 wrapper (Milter.py) that handles attachments, did lots of testing, packaged
 it with distutils, and generally transformed it from a quick hack to a
@@ -1,2 +1,6 @@
 Support smfi_negotiate and auto negotiate only those callbacks for which 
 Milter.Milter methods have been overridden.  (Python should be able to
 do that.)
 Lookup exact RFC syntax of real name / email and make 
 Milter.utils.parse_addr() pass all unit tests.
@@ -1,98 +0,0 @@
 ## @mainpage Writing Milters in Python
 #
 # At the lowest level, the <code>milter</code> module provides a thin wrapper
 # around the <a href="milter_api/index.html"> sendmail
 # libmilter API</a>.  This API lets you register callbacks for a number of
 # events in the process of sendmail receiving a message via SMTP.  These
 # events include the initial connection from a MTA, the envelope sender and
 # recipients, the top level mail headers, and the message body.  There are
 # options to mangle all of these components of the message as it passes through
 # the %milter.
 # 
 # At the next level, the <code>Milter</code> module (note the case difference)
 # provides a Python friendly object oriented wrapper for the low level API.  To
 # use the Milter module, an application registers a 'factory' to create an
 # object for each connection from a MTA to sendmail.  These connection objects
 # must provide methods corresponding to the libmilter event callbacks.
 # 
 # Each callback method returns a code to tell sendmail whether to proceed with
 # processing the message.  This is a big advantage of milters over other mail
 # filtering systems.  Unwanted mail can be stopped in its tracks at the
 # earliest possible point.  The callback return codes are
 # milter.CONTINUE, milter.REJECT, milter.DISCARD, milter.ACCEPT, 
 # milter.TEMPFAIL, milter.SKIP, milter.NOREPLY.
 # 
 # The Milter.Base class provides default implementations for
 # event methods that do nothing, and also provides wrappers for the libmilter
 # methods to mutate the message.  It automatically negotiates with MTA
 # which protocol steps need to be processed by the %milter, based on
 # which callback methods are overridden.
 #
 # The Milter.Milter class provides an alternate default
 # implementation that logs the main milter callbacks, but otherwise does
 # nothing.  It is provided for compatibility.
 # 
 # The mime module provides a wrapper for the Python email package
 # that fixes some bugs, and simplifies modifying selected parts of a MIME
 # message.
 #
 # @section threading
 #
 # The libmilter library which pymilter wraps 
 # <a href="milter_overview#SignalHandling">handles
 # all signals</a> itself, and expects to be called from a single main thread.
 # It handles SIGTERM, SIGHUP, and SIGINT, mapping the first two to 
 # <a href="milter_api/smfi_stop.html">smfi_stop</a>
 # and the last to an internal ABORT.
 #
 # If you use python threads or threading modules, then signal handling gets
 # confused.  Threads may still be useful, but you may need to provide an
 # alternate means of causing graceful shutdown.
 #
 # You may find the
 # <a href="http://docs.python.org/release/2.6.6/library/multiprocessing.html">
 # multiprocessing</a> module useful.  It can be a drop-in
 # replacement for threading as illustrated in 
 # <a href="milter-template_8py-example.html">milter-template.py</a>.
 #
 # @section Useful python packages for milters
 #
 # <a href="https://github.com/sdgathman/pymilter">pymilter</a> - this package.
 #
 # <a href="https://github.com/sdgathman/pyspf">pyspf</a> checks the
 # SMTP envelope sender (MAIL FROM, passed to the Milter.Base.envfrom callback)
 # against a Sender Policy published in DNS by the sending domain.  This
 # can prevent forgery of the MAIL FROM.  SPF is Sender Policy Framework.
 #
 # <a href="https://launchpad.net/dkimpy">pydkim</a> checks a DKIM signature
 # of the email body and headers against a public key published in DNS by
 # the signing domain.  DKIM is DomainKeys Identified Mail.
 #
 # The <a href="https://pypi.python.org/pypi/authres/">authres</a> module 
 # parses and formats the Authentication-Results email header, providing
 # a standard place to summarize the results from DKIM, SPF, rDNS, SMTP AUTH,
 # and other email authentication methods.
 #
 # <a href="https://github.com/sdgathman/pydspam/">pydspam</a> wraps 
 # the libdspam API of the <a href="http://dspam.sourceforge.net/">DSPAM</a>
 # project.
 #
 # <a href="https://github.com/sdgathman/pysrs/">pysrs</a> rewrites
 # MAIL FROM to include a timestamped signature so that "bounce spam"
 # can be immediately rejected.
 #
 # <a href="https://github.com/sdgathman/pygossip/">pygossip</a> is a 
 # system to track reputation by domain and authentication level and type,
 # and a simple protocol to gossip about reputations with other mail servers.
 #
 # @section Milters written with pymilter
 #
 # <a href="https://github.com/croessner/vrfydmn">Verify Domain</a> is a
 # Postfix milter that rejects/fixes manipulated From: header
 # on a mail host with multiple virtual domains.
 #
 # <a href="https://github.com/sdgathman/milter/">BMS Milter</a> has several
 # milters, a big complicated spam filter that integrates multiple
 # authentication protocols with pydspam, and two simple ones: spfmilter.py and
 # dkim-milter.py.
 #
@@ -1,251 +0,0 @@
 # Document miltermodule for Doxygen
 #
 ## @package milter
 #
 # A thin wrapper around libmilter.  Most users will not import
 # milter directly, but will instead import Milter and subclass
 # Milter.Base.  This module gives you ultimate low level control
 # from python.
 #
 ## Continue processing the current connection, message, or recipient.
 CONTINUE  = 0
 ##  For a connection-oriented routine, reject this connection; 
 # call Milter.Base.close(). For a message-oriented routine, except
 # Milter.Base.eom() or Milter.Base.abort(), reject this message.  For a
 # recipient-oriented routine, reject the current recipient (but continue
 # processing the current message).
 REJECT    = 1
 ## For a message- or recipient-oriented routine, accept this message, but
 # silently discard it.  SMFIS_DISCARD should not be returned by a
 # connection-oriented routine.
 DISCARD   = 2
 ## For a connection-oriented routine, accept this connection without further
 # filter processing; call Milter.Base.close().   For a message- or
 # recipient-oriented routine, accept this message without further filtering.
 ACCEPT    = 3
 ## Return a temporary failure, i.e., the corresponding SMTP command will return
 # an appropriate 4xx status code. For a message-oriented routine, except
 # Milter.Base.envfrom(), fail for this message.  For a connection-oriented
 # routine, fail for this connection; call Milter.Base.close().  For a recipient-oriented
 # routine, only
 # fail for the current recipient; continue message processing.
 TEMPFAIL  = 4
 ## Skip further callbacks of the same type in this transaction. 
 # Currently this return value is only allowed in Milter.Base.body(). It can be
 # used if a %milter has received sufficiently many body chunks to make a
 # decision, but still wants to invoke message modification functions that are
 # only allowed to be called from Milter.Base.eom(). Note: the %milter must
 # negotiate this behavior with the MTA, i.e., it must check whether the
 # protocol action SMFIP_SKIP is available and if so, the %milter must request
 # it.
 SKIP      = 5
 ## Do not send a reply back to the MTA. 
 # The %milter must negotiate this behavior with the MTA, i.e., it must check
 # whether the appropriate protocol action P_NR_* is available and if so,
 # the %milter must request it. If you set the P_NR_* protocol action for a
 # callback, that callback must always reply with NOREPLY. Using any other
 # reply code is a violation of the API. If in some cases your callback may
 # return another value (e.g., due to some resource shortages), then you must
 # not set P_NR_* and you must use CONTINUE as the default return
 # code. (Alternatively you can try to delay reporting the problem to a later
 # callback for which P_NR_* is not set.)
 #
 # This is negotiated and returned automatically by the Milter.noreply 
 # function decorator.
 NOREPLY   = 6
 ## Hold context for a %milter connection.
 # Each connection to sendmail creates a new <code>SMFICTX</code> struct within
 # libmilter.  The milter module in turn creates a milterContext
 # tied to the <code>SMFICTX</code> struct via <code>smfi_setpriv</code>
 # to hold a PyThreadState and a user defined Python object for the connection.
 # 
 # Most application interaction with libmilter takes places via 
 # the milterContext object for the connection.  It is passed to
 # callback functions as the first parameter.
 #
 # The <code>Milter</code> module creates a python class for each connection,
 # and converts function callbacks to instance method invocations.
 #
 class milterContext(object):
  ## Calls <a href="milter_api/smfi_getsymval.html">smfi_getsymval</a>.
  def getsymval(self,sym): pass
  ## Calls <a href="milter_api/smfi_setreply.html">
  # smfi_setreply</a> or
  # <a href="milter_api/smfi_setmlreply.html">
  # smfi_setmlreply</a>.
  # @param rcode SMTP response code
  # @param xcode extended SMTP response code
  # @param msg one or more message lines.  If the MTA does not support 
  #     multiline messages, only the first is used.
  def setreply(self,rcode,xcode,*msg): pass
  ## Calls <a href="milter_api/smfi_addheader.html">smfi_addheader</a>.
  def addheader(self,name,value,idx=-1): pass
  ## Calls <a href="milter_api/smfi_chgheader.html">smfi_chgheader</a>.
  def chgheader(self,name,idx,value): pass
  ## Calls <a href="milter_api/smfi_addrcpt.html">smfi_addrcpt</a>.
  def addrcpt(self,rcpt,params=None): pass
  ## Calls <a href="milter_api/smfi_delrcpt.html">smfi_delrcpt</a>.
  def delrcpt(self,rcpt): pass
  ## Calls <a href="milter_api/smfi_replacebody.html">smfi_replacebody</a>.
  def replacebody(self,data): pass
  ## Attach a Python object to this connection context.
  # @return the old value or None
  def setpriv(self,priv): pass
  ## Return the Python object attached to this connection context.
  def getpriv(self): pass
  ## Calls <a href="milter_api/smfi_quarantine.html">smfi_quarantine</a>.
  def quarantine(self,reason): pass
  ## Calls <a href="milter_api/smfi_progress.html">smfi_progress</a>.
  def progress(self): pass
  ## Calls <a href="milter_api/smfi_chgfrom.html">smfi_chgfrom</a>.
  def chgfrom(self,sender,param=None): pass
  ## Tell the MTA which macro values we are interested in for a given stage.
  # Of interest only when you need to squeeze a few more bytes of bandwidth.
  # It may only be called from the negotiate callback.
  # The protocol stages are 
  # M_CONNECT, M_HELO, M_ENVFROM, M_ENVRCPT, M_DATA, M_EOM, M_EOH.
  # Calls <a href="milter_api/smfi_setsymlist.html">smfi_setsymlist</a>.
  # @param stage protocol stage in which the macro list should be used
  # @param macrolist a space separated list of macro names
  def setsymlist(self,stage,macrolist): pass
 class error(Exception): pass
 ## Enable optional %milter actions.
 # Certain %milter actions need to be enabled before calling main()
 # or they throw an exception.  Pymilter enables them all by
 # default (since 0.9.2), but you may wish to disable unneeded
 # actions as an optimization.
 # @param flags Bit or mask of optional actions to enable
 def set_flags(flags): pass
 def set_connect_callback(cb): pass
 def set_helo_callback(cb): pass
 def set_envfrom_callback(cb): pass
 def set_envrcpt_callback(cb): pass
 def set_header_callback(cb): pass
 def set_eoh_callback(cb): pass
 def set_body_callback(cb): pass
 def set_abort_callback(cb): pass
 def set_close_callback(cb): pass
 ## Sets the return code for untrapped Python exceptions during a callback.
 # The default is TEMPFAIL.  You should not depend on this handler.  Your
 # application should have its own top level exception handler for each
 # callback.  You can then choose your own reply message, log the stack track
 # were you please, and so on.  However, if you miss one, this last ditch
 # handler will print a standard stack trace to sys.stderr, and return to
 # sendmail.  
 # @param code one of #TEMPFAIL,#REJECT,#CONTINUE, or since 1.0, #ACCEPT
 def set_exception_policy(code): pass
 ## Register python %milter with libmilter.
 # The name we pass is used to identify the %milter in the MTA configuration.
 # Callback functions must be set using the set_*_callback() functions before
 # registering the %milter.
 # Three additional callbacks are specified as keyword parameters.  These
 # were added by recent versions of libmilter.  The keyword parameters is
 # a nicer way to do it, I think, since it makes clear that you have to do
 # it before registering.  I may move all the callbacks in the future (perhaps
 # keeping the set functions for compatibility).  Note that Milter.Base
 # automatically maps all callbacks to member functions, and negotiates which
 # member functions are actually overridden by an application class.
 # @param name the %milter name by which the MTA finds us
 # @param negotiate the
 #       <a href="milter_api/xxfi_negotiate.html">
 #       xxfi_negotiate</a> callback, called to negotiate supported
 #       actions, callbacks, and protocol steps.
 # @param unknown the
 #       <a href="milter_api/xxfi_unknown.html">
 #       xxfi_unknown</a> callback, called when for SMTP commands
 #       not recognized by the MTA. (Extend SMTP in your milter!)
 # @param data the
 #       <a href="milter_api/xxfi_data.html">
 #       xxfi_data</a> callback, called when the DATA
 #       SMTP command is received.
 def register(name,negotiate=None,unknown=None,data=None): pass
 ## Attempt to create the socket used to communicate with the MTA.
 # milter.opensocket() attempts to create the socket specified previously by a
 # call to milter.setconn() which will be the interface between MTAs and the
 # %milter.  This allows the calling application to ensure that the socket can be
 # created.  If this is not called, milter.main() will do so implicitly.
 # Calls <a href="milter_api/smfi_opensocket.html">
 # smfi_opensocket</a>.  While not documented for libmilter, my experiments
 # indicate that you must call register() before calling opensocket().
 # @param rmsock Try to remove an existing unix domain socket if true.
 def opensocket(rmsock): pass
 ## Transfer control to libmilter.
 # Calls <a href="milter_api/smfi_main.html">
 #   smfi_main</a>.
 def main(): pass
 ## Set the libmilter debugging level.
 # <a href="milter_api/smfi_setdbg.html">smfi_setdbg</a>
 # sets the %milter library's internal debugging level to a new level
 # so that code details may be traced. A level of zero turns off debugging. The
 # greater (more positive) the level the more detailed the debugging. Six is the
 # current, highest, useful value.  Must be called before calling main().
 def setdbg(lev): pass
 ## Set timeout for MTA communication.
 # Calls <a href="milter_api/smfi_settimeout.html">
 # smfi_settimeout</a>.  Must be called before calling main().
 def settimeout(secs): pass
 ## Set socket backlog.
 # Calls <a href="milter_api/smfi_setbacklog.html">
 # smfi_setbacklog</a>.  Must be called before calling main().
 def setbacklog(n): pass
 ## Set the socket used to communicate with the MTA.
 # The MTA can communicate with the milter by means of a
 # unix, inet, or inet6 socket. By default, a unix domain socket
 # is used.  It must not exist,
 # and sendmail will throw warnings if, eg, the file is under a
 # group or world writable directory.  milter.setconn() will not fail with
 # an invalid socket - this will be detected only when calling milter.main()
 # or milter.opensocket().
 # @param s the socket address in proto:address format
 # <pre>
 # milter.setconn('unix:/var/run/pythonfilter')  # a named pipe
 # milter.setconn('local:/var/run/pythonfilter') # a named pipe
 # milter.setconn('inet:8800') 			# listen on ANY interface
 # milter.setconn('inet:7871@@publichost')	# listen on a specific interface
 # milter.setconn('inet6:8020')
 # milter.setconn('inet6:8020@[2001:db8:1234::1]')      # listen on specific IP
 # </pre>
 def setconn(s): pass
 ## Stop the %milter gracefully.
 def stop(): pass
 ## Retrieve diagnostic info.
 # Return a tuple with diagnostic info gathered by the milter module.
 # The first two fields are counts of milterContext objects created
 # and deleted.  Additional fields may be added later.
 # @return a tuple of diagnostic data
 def getdiag(): pass
 ## Retrieve the runtime libmilter version.
 # Return the runtime libmilter version. This can be different
 # from the compile time version when sendmail or libmilter is upgraded
 # after pymilter is compiled.
 # @return a tuple of <code>(major,minor,patchlevel)</code>
 def getversion(): pass
 ## The compile time libmilter version.
 # Python code might need to deal with pymilter compiled 
 # against various versions of libmilter.  This module constant 
 # contains the contents of the <code>SMFI_VERSION</code> macro when
 # the milter module was compiled.
 VERSION = 0x1000001
@@ -1,14 +0,0 @@
 web:
 	doxygen
 	test -L doc/html/milter_api || ln -sf /usr/share/doc/sendmail-milter-devel doc/html/milter_api
 	rsync -ravKk doc/html/ bmsi.com:/var/www/html/pymilter
 	cd doc/html; zip -r ../../doc .
 VERSION=1.0.4
 PKG=pymilter-$(VERSION)
 SRCTAR=$(PKG).tar.gz
 $(SRCTAR):
 	git archive --format=tar.gz --prefix=$(PKG)/ -o $(SRCTAR) $(PKG)
 gittar: $(SRCTAR)
@@ -1,80 +0,0 @@
 ## A very simple sample milter to prevent mixing of internal and external mail.
 # Internal is defined as using one of a list of internal top level domains.
 #  This code is open-source on the same terms as Python.
 from __future__ import print_function
 import Milter
 import time
 import sys
 from Milter.utils import parse_addr
 internal_tlds = ["corp", "personal"]
 ## Determine if a hostname is internal or not. 
 # True if internal, False otherwise
 def is_internal(hostname):
    components = hostname.split(".")
    return components.pop() in internal_tlds
 # Determine if internal and external hosts are mixed based on a list
 # of hostnames
 def are_mixed(hostnames):
    hostnames_mapped = map(is_internal, hostnames)
    # Num internals
    num_internal_hosts = hostnames_mapped.count(True)
    # Num externals
    num_external_hosts = hostnames_mapped.count(False)
    return num_external_hosts >= 1 and num_internal_hosts >= 1
 class NoMixMilter(Milter.Base):
  def __init__(self):  # A new instance with each new connection.
    self.id = Milter.uniqueID()  # Integer incremented with each call.
  ##  def envfrom(self,f,*str):
  @Milter.noreply
  def envfrom(self, mailfrom, *str):
    self.mailfrom = mailfrom
    self.domains = []
    t = parse_addr(mailfrom)
    if len(t) > 1:
      self.domains.append(t[1])
    else:
      self.domains.append('local')
    self.internal = False
    return Milter.CONTINUE
  ##  def envrcpt(self, to, *str):
  def envrcpt(self, to, *str):
    self.R.append(to)
    t = parse_addr(to)
    if len(t) > 1:
      self.domains.append(t[1])
    else:
      self.domains.append('local')
    if are_mixed(self.domains):
      # FIXME: log recipients collected in self.mailfrom and self.R
      self.setreply('550','5.7.1','Mixing internal and external TLDs')
      return Milter.REJECT
    return Milter.CONTINUE
 def main():
  socketname = "/var/run/nomixsock"
  timeout = 600
  # Register to have the Milter factory create instances of your class:
  Milter.factory = NoMixMilter
  print("%s milter startup" % time.strftime('%Y%b%d %H:%M:%S'))
  sys.stdout.flush()
  Milter.runmilter("nomixfilter",socketname,timeout)
  logq.put(None)
  bt.join()
  print("%s nomix milter shutdown" % time.strftime('%Y%b%d %H:%M:%S'))
 if __name__ == "__main__":
  main()
@@ -1,32 +1,21 @@
 ## To roll your own milter, create a class that extends Milter.  
 #  See the pymilter project at http://bmsi.com/python/milter.html
-#  based on Sendmail's milter API 
+#  based on Sendmail's milter API http://www.milter.org/milter_api/api.html
 #  This code is open-source on the same terms as Python.
 ## Milter calls methods of your class at milter events.
 ## Return REJECT,TEMPFAIL,ACCEPT to short circuit processing for a message.
 ## You can also add/del recipients, replacebody, add/del headers, etc.
 from __future__ import print_function
 import Milter
-try:
+import StringIO
  from StringIO import StringIO
 except:
  from io import StringIO
 import time
 import email
 import sys
 from socket import AF_INET, AF_INET6
-from Milter.utils import parse_addr
+from Milter import parse_addr
 if True:
  from multiprocessing import Process as Thread, Queue
 else:
  from threading import Thread
  from Queue import Queue
 logq = Queue(maxsize=4)
-class myMilter(Milter.Base):
+class myMilter(Milter.Milter):
  def __init__(self):  # A new instance with each new connection.
    self.id = Milter.uniqueID()  # Integer incremented with each call.
@@ -34,7 +23,6 @@ class myMilter(Milter.Base):
  # each connection runs in its own thread and has its own myMilter
  # instance.  Python code must be thread safe.  This is trivial if only stuff
  # in myMilter instances is referenced.
  @Milter.noreply
  def connect(self, IPname, family, hostaddr):
    # (self, 'ip068.subnet71.example.com', AF_INET, ('215.183.71.68', 4720) )
    # (self, 'ip6.mxout.example.com', AF_INET6,
@@ -75,47 +63,45 @@ class myMilter(Milter.Base):
    self.fromparms = Milter.dictfromlist(str)	# ESMTP parms
    self.user = self.getsymval('{auth_authen}')	# authenticated user
    self.log("mail from:", mailfrom, *str)
-    # NOTE: self.fp is only an *internal* copy of message data.  You
+    self.fp = StringIO.StringIO()
    # must use addheader, chgheader, replacebody to change the message
    # on the MTA.
    self.fp = StringIO()
    self.canon_from = '@'.join(parse_addr(mailfrom))
    self.fp.write('From %s %s\n' % (self.canon_from,time.ctime()))
    return Milter.CONTINUE
  ##  def envrcpt(self, to, *str):
-  @Milter.noreply
+  def envrcpt(self, recipient, *str):
  def envrcpt(self, to, *str):
    rcptinfo = to,Milter.dictfromlist(str)
    self.R.append(rcptinfo)
    return Milter.CONTINUE
  @Milter.noreply
  def header(self, name, hval):
    self.fp.write("%s: %s\n" % (name,hval))	# add header to buffer
    return Milter.CONTINUE
-  @Milter.noreply
+
  def eoh(self):
    self.fp.write("\n")				# terminate headers
    return Milter.CONTINUE
-  @Milter.noreply
+
  def body(self, chunk):
    self.fp.write(chunk)
    return Milter.CONTINUE
  def eom(self):
    self.fp.seek(0)
    msg = email.message_from_file(self.fp)
    self.setreply('250','2.5.1','Grokked by pymilter')
    # many milter functions can only be called from eom()
    # example of adding a Bcc:
    self.addrcpt('<%s>' % 'spy@example.com')
    return Milter.ACCEPT
  def close(self):
    # always called, even when abort is called.  Clean up
    # any external resources here.
@@ -128,39 +114,25 @@ class myMilter(Milter.Base):
  ## === Support Functions ===
  def log(self,*msg):
-    logq.put((msg,self.id,time.time()))
+    print "%s [%d]" % (time.strftime('%Y%b%d %H:%M:%S'),self.id),
 def background():
  while True:
    t = logq.get()
    if not t: break
    msg,id,ts = t
    print("%s [%d]" % (time.strftime('%Y%b%d %H:%M:%S',time.localtime(ts)),id),
        end=None)
    # 2005Oct13 02:34:11 [1] msg1 msg2 msg3 ...
-    for i in msg: print(i,end=None)
+    for i in msg: print i,
-    print()
+    print
-    sys.stdout.flush()
+
 ## ===
 def main():
  bt = Thread(target=background)
  bt.start()
  socketname = "/home/stuart/pythonsock"
  timeout = 600
  # Register to have the Milter factory create instances of your class:
  Milter.factory = myMilter
  flags = Milter.CHGBODY + Milter.CHGHDRS + Milter.ADDHDRS
  flags += Milter.ADDRCPT
  flags += Milter.DELRCPT
  Milter.set_flags(flags)       # tell Sendmail which features we use
-  print("%s milter startup" % time.strftime('%Y%b%d %H:%M:%S'))
+  print "%s milter startup" % time.strftime('%Y%b%d %H:%M:%S')
  sys.stdout.flush()
  Milter.runmilter("pythonfilter",socketname,timeout)
-  logq.put(None)
+  print "%s bms milter shutdown" % time.strftime('%Y%b%d %H:%M:%S')
  bt.join()
  print("%s bms milter shutdown" % time.strftime('%Y%b%d %H:%M:%S'))
 if __name__ == "__main__":
  main()
@@ -1,6 +1,6 @@
 /* Copyright (C) 2001  James Niemira (niemira@colltech.com, urmane@urmane.org)
 * Portions Copyright (C) 2001,2002,2003,2004,2005,2006,2007
- *   Stuart Gathman (stuart@gathman.org)
+ *   Stuart Gathman (stuart@bmsi.com)
 *
 * This program is free software: you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -34,6 +34,177 @@ $ python setup.py help
     libraries=["milter","smutil","resolv"]
 * $Log$
 * Revision 1.22  2009/05/29 19:53:36  customdesigned
 * Typo SMFIS_ALL_OPTS
 *
 * Revision 1.21  2009/05/29 19:49:40  customdesigned
 * Typo calling helo instead of negotiate.
 *
 * Revision 1.20  2009/05/29 18:25:59  customdesigned
 * Null terminate keyword list.
 *
 * Revision 1.19  2009/05/28 18:36:42  customdesigned
 * Support new callbacks, including negotiate
 *
 * Revision 1.18  2009/05/21 21:53:05  customdesigned
 * First cut at support unknown, data, negotiate callbacks.
 *
 * Revision 1.17  2009/02/06 04:28:08  customdesigned
 * Oops!  Missing options argument pointer for addrcpt.
 *
 * Revision 1.16  2008/12/16 04:21:05  customdesigned
 * Fedora release
 *
 * Revision 1.15  2008/12/13 20:29:56  customdesigned
 * Split off milter applications.
 *
 * Revision 1.14  2008/12/04 19:43:00  customdesigned
 * Doc updates.
 *
 * Revision 1.13  2008/11/23 03:06:47  customdesigned
 * Milter support for chgfrom.
 *
 * Revision 1.12  2008/11/21 20:42:52  customdesigned
 * Support smfi_chgfrom and smfi_addrcpt_par.
 *
 * Revision 1.11  2007/09/25 02:26:29  customdesigned
 * Update license.
 *
 * Revision 1.10  2006/02/12 02:00:42  customdesigned
 * Resolve FIXME for wrap_close.
 *
 * Revision 1.9  2005/12/23 21:46:36  customdesigned
 * Compile on sendmail-8.12 (ifdef SMFIR_INSHEADER)
 *
 * Revision 1.8  2005/10/20 23:23:36  customdesigned
 * Include smfi_progress is SMFIR_PROGRESS defined
 *
 * Revision 1.7  2005/10/20 23:04:46  customdesigned
 * Add optional idx for position of added header.
 *
 * Revision 1.6  2005/07/15 22:18:17  customdesigned
 * Support callback exception policy
 *
 * Revision 1.5  2005/06/24 04:20:07  customdesigned
 * Report context allocation error.
 *
 * Revision 1.4  2005/06/24 04:12:43  customdesigned
 * Remove unused name argument to generic wrappers.
 *
 * Revision 1.3  2005/06/24 03:57:35  customdesigned
 * Handle close called before connect.
 *
 * Revision 1.2  2005/06/02 04:18:55  customdesigned
 * Update copyright notices after reading article on /.
 *
 * Revision 1.1.1.2  2005/05/31 18:09:06  customdesigned
 * Release 0.7.1
 *
 * Revision 2.31  2004/08/23 02:24:36  stuart
 * Support setbacklog
 *
 * Revision 2.30  2004/08/21 20:29:53  stuart
 * Support option of 11 lines max for mlreply.
 *
 * Revision 2.29  2004/08/21 04:14:29  stuart
 * mlreply support
 *
 * Revision 2.28  2004/08/21 02:45:21  stuart
 * Don't leak int constants if module unloaded.
 *
 * Revision 2.27  2004/04/06 03:19:59  stuart
 * Release 0.6.8
 *
 * Revision 2.26  2004/03/04 21:43:06  stuart
 * Fix memory leak by removing unused dynamic template buffer,
 * thanks again to Alexander Kourakos.
 *
 * Revision 2.25  2004/03/01 19:45:03  stuart
 * Release 0.6.5
 *
 * Revision 2.24  2004/03/01 18:56:50  stuart
 * Support progress reporting.
 *
 * Revision 2.23  2004/03/01 18:36:09  stuart
 * Plug memory leak.  Thanks to Alexander Kourakos.
 *
 * Revision 2.22  2003/11/02 03:01:46  stuart
 * Adjust SMTP error codes after careful reading of standard.
 *
 * Revision 2.21  2003/06/24 19:57:04  stuart
 * Allow removing a python milter callback by setting to None.
 *
 * Revision 2.20  2003/02/13 17:08:57  stuart
 * IPV6 support
 *
 * Revision 2.19  2003/02/13 16:58:29  stuart
 * Support passing None to setreply and chgheader.
 *
 * Revision 2.18  2002/12/11 16:44:06  stuart
 * Support QUARANTINE if supported by libmilter.
 *
 * Revision 2.17  2002/04/18 20:20:35  stuart
 * Fix for NULL hostaddr in connect callback from Jason Erickson.
 *
 * Revision 2.16  2001/09/26 13:29:09  stuart
 * sa_len not supported by linux.
 *
 * Revision 2.15  2001/09/25 17:28:40  stuart
 * Copyrights, documentation, release 0.3.1
 *
 * Revision 2.14  2001/09/25 00:36:57  stuart
 * Pass hostaddr to python code in format used by standard socket module.
 *
 * Revision 2.13  2001/09/24 23:44:55  stuart
 * Return old callback from setcallback functions.
 *
 * Revision 2.12  2001/09/24 20:02:30  stuart
 * Remove redundant setpriv
 *
 * Revision 2.11  2001/09/23 22:26:35  stuart
 * Update docs.  Streamline Milter.py
 * update testbms.py to reflect actual sendmail behaviour with multiple
 * messages per connection.
 *
 * Revision 2.10  2001/09/22 15:33:42  stuart
 * More doc comment updates.
 *
 * Revision 2.9  2001/09/22 14:52:27  stuart
 * Actually return retval in _generic_return.
 * Go over doc comments.
 *
 * Revision 2.8  2001/09/22 01:59:32  stuart
 * Prevent reentrant call of milter_main, which libmilter doesn't support.
 *
 * Revision 2.7  2001/09/22 01:47:37  stuart
 * Forgot to set milter interp.
 *
 * Revision 2.6  2001/09/22 01:23:53  stuart
 * Added proper threading after research in python docs.
 *
 * Revision 2.5  2001/09/21 20:08:51  stuart
 * Release 0.2.3
 *
 * Revision 2.4  2001/09/20 16:18:16  stuart
 * libmilter checks in_eom state, so we don't have to.
 *
 * Revision 2.3  2001/09/19 06:02:33  stuart
 * Make more stuff static.
 *
 * Revision 2.1  2001/09/19 04:24:13  stuart
 * Use extension type to track context in python.
 *
 * Revision 1.4  2001/09/18 18:48:28  stuart
 * clear private data reference in _clear_context
 *
 * Revision 1.3  2001/09/15  04:19:37  stuart
 * nasty off by 1 mem overwrite bugs in wrap_env
 * generic_set_callback
 *
 * Revision 1.2  2001/09/15  03:15:39  stuart
 * several bugs fixed, works smoothly
 *
 */
 #ifndef MAX_ML_REPLY
@@ -68,10 +239,10 @@ $ python setup.py help
 #define HAVE_IPV6_SUPPORT /* use this for #ifdef's later on */
 /* Now see if it supports the RFC-2553 socket's API spec.  Early
 * IPv6 "prototype" implementations existed before the RFC was
- * published.  Unfortunately I know of no good way to do this
+ * published.  Unfortunately I know of now good way to do this
 * other than with OS-specific tests.
 */
-#if defined(__FreeBSD__) || defined(__linux__) || defined(__sun__) || defined(__GLIBC__) || (defined(__APPLE__) && defined(__MACH__))
+#ifdef linux
 #define HAVE_IPV6_RFC2553
 #include <arpa/inet.h>
 #endif
@@ -85,70 +256,27 @@ $ python setup.py help
 #endif
 #endif
 enum callbacks {
 	CONNECT,HELO,ENVFROM,ENVRCPT,HEADER,EOH,BODY,EOM,ABORT,CLOSE,
 #ifdef SMFIS_ALL_OPTS
 	UNKNOWN,DATA,NEGOTIATE,
 #endif
 	NUMCALLBACKS
 };
-#define connect_callback callback[CONNECT].cb
+/* Yes, these are static.  If you need multiple different callbacks, */
-#define helo_callback callback[HELO].cb
+/* it's cleaner to use multiple filters, or convert to OO method calls. */
-#define envfrom_callback callback[ENVFROM].cb
+static PyObject *connect_callback = NULL;
-#define envrcpt_callback callback[ENVRCPT].cb
+static PyObject *helo_callback    = NULL;
-#define header_callback callback[HEADER].cb
+static PyObject *envfrom_callback = NULL;
-#define eoh_callback callback[EOH].cb
+static PyObject *envrcpt_callback = NULL;
-#define body_callback callback[BODY].cb
+static PyObject *header_callback  = NULL;
-#define eom_callback callback[EOM].cb
+static PyObject *eoh_callback     = NULL;
-#define abort_callback callback[ABORT].cb
+static PyObject *body_callback    = NULL;
-#define close_callback callback[CLOSE].cb
+static PyObject *eom_callback     = NULL;
-#define unknown_callback callback[UNKNOWN].cb
+static PyObject *abort_callback   = NULL;
-#define data_callback callback[DATA].cb
+static PyObject *close_callback   = NULL;
 #define negotiate_callback callback[NEGOTIATE].cb
-/* Yes, these are static.  If you need multiple different callbacks, 
+staticforward struct smfiDesc description; /* forward declaration */
   it's cleaner to use multiple filters, or convert to OO method calls. */
 static struct MilterCallback {
  PyObject *cb;
  const char *name;
 } callback[NUMCALLBACKS+1] = {
      { NULL ,"connect" },
      { NULL ,"helo" },
      { NULL ,"envfrom" },
      { NULL ,"envrcpt" },
      { NULL ,"header" },
      { NULL ,"eoh" },
      { NULL ,"body" },
      { NULL ,"eom" },
      { NULL ,"abort" },
      { NULL ,"close" },
 #ifdef SMFIS_ALL_OPTS
      { NULL ,"unknown" },
      { NULL ,"data" },
      { NULL ,"negotiate" },
 #endif
      { NULL , NULL }
    };
 #if PY_MAJOR_VERSION >= 3
        static struct smfiDesc description; /* forward declaration */
        static PyTypeObject milter_ContextType;
 #else
        staticforward struct smfiDesc description; /* forward declaration */
        staticforward PyTypeObject milter_ContextType;
 #endif
 static PyObject *MilterError;
 /* The interpreter instance that called milter.main */
 static PyInterpreterState *interp;
 typedef struct {
  unsigned int contextNew;
  unsigned int contextDel;
 } milter_Diag;
-static milter_Diag diag;
+staticforward PyTypeObject milter_ContextType;
 typedef struct {
  PyObject_HEAD
@@ -185,7 +313,6 @@ _get_context(SMFICTX *ctx) {
      PyThreadState_Delete(t);
      return NULL;
    }
    ++diag.contextNew;
    self->t = t;
    self->ctx = ctx;
    Py_INCREF(Py_None);
@@ -224,7 +351,6 @@ milter_Context_dealloc(PyObject *s) {
  }
  Py_DECREF(self->priv);
  PyObject_DEL(self);
  ++diag.contextDel;
 }
 /* Throw an exception if an smfi call failed, otherwise return PyNone. */
@@ -245,7 +371,7 @@ _thread_return(PyThreadState *t,int val,char *errstr) {
  return _generic_return(val,errstr);
 }
-static const char milter_set_flags__doc__[] =
+static char milter_set_flags__doc__[] =
 "set_flags(int) -> None\n\
 Set flags for filter capabilities; OR of one or more of:\n\
 ADDHDRS - filter may add headers\n\
@@ -286,7 +412,7 @@ generic_set_callback(PyObject *args,char *t,PyObject **cb) {
  return Py_None;
 }
-static const char milter_set_connect_callback__doc__[] =
+static char milter_set_connect_callback__doc__[] =
 "set_connect_callback(Function) -> None\n\
 Sets the Python function invoked when a connection is made to sendmail.\n\
 Function takes args (ctx, hostname, integer, hostaddr) -> int\n\
@@ -313,7 +439,7 @@ milter_set_connect_callback(PyObject *self, PyObject *args) {
    "O:set_connect_callback", &connect_callback);
 }
-static const char milter_set_helo_callback__doc__[] =
+static char milter_set_helo_callback__doc__[] =
 "set_helo_callback(Function) -> None\n\
 Sets the Python function invoked upon SMTP HELO.\n\
 Function takes args (ctx, hostname) -> int\n\
@@ -324,7 +450,7 @@ milter_set_helo_callback(PyObject *self, PyObject *args) {
  return generic_set_callback(args, "O:set_helo_callback", &helo_callback);
 }
-static const char milter_set_envfrom_callback__doc__[] =
+static char milter_set_envfrom_callback__doc__[] =
 "set_envfrom_callback(Function) -> None\n\
 Sets the Python function invoked on envelope from.\n\
 Function takes args (ctx, from, *str) -> int\n\
@@ -337,7 +463,7 @@ milter_set_envfrom_callback(PyObject *self, PyObject *args) {
  	&envfrom_callback);
 }
-static const char milter_set_envrcpt_callback__doc__[] =
+static char milter_set_envrcpt_callback__doc__[] =
 "set_envrcpt_callback(Function) -> None\n\
 Sets the Python function invoked on each envelope recipient.\n\
 Function takes args (ctx, rcpt, *str) -> int\n\
@@ -350,7 +476,7 @@ milter_set_envrcpt_callback(PyObject *self, PyObject *args) {
  	&envrcpt_callback);
 }
-static const char milter_set_header_callback__doc__[] =
+static char milter_set_header_callback__doc__[] =
 "set_header_callback(Function) -> None\n\
 Sets the Python function invoked on each message header.\n\
 Function takes args (ctx, field, value) ->int\n\
@@ -363,7 +489,7 @@ milter_set_header_callback(PyObject *self, PyObject *args) {
  	&header_callback);
 }
-static const char milter_set_eoh_callback__doc__[] =
+static char milter_set_eoh_callback__doc__[] =
 "set_eoh_callback(Function) -> None\n\
 Sets the Python function invoked at end of header.\n\
 Function takes args (ctx) -> int";
@@ -373,20 +499,20 @@ milter_set_eoh_callback(PyObject *self, PyObject *args) {
  return generic_set_callback(args, "O:set_eoh_callback", &eoh_callback);
 }
-static const char milter_set_body_callback__doc__[] =
+static char milter_set_body_callback__doc__[] =
 "set_body_callback(Function) -> None\n\
 Sets the Python function invoked for each body chunk. There may\n\
 be multiple body chunks passed to the filter. End-of-lines are\n\
 represented as received from SMTP (normally Carriage-Return/Line-Feed).\n\
 Function takes args (ctx, chunk) -> int\n\
-chunk -> bytes - body data";
+chunk -> String - body data";
 static PyObject *
 milter_set_body_callback(PyObject *self, PyObject *args) {
  return generic_set_callback(args, "O:set_body_callback", &body_callback);
 }
-static const char milter_set_eom_callback__doc__[] =
+static char milter_set_eom_callback__doc__[] =
 "set_eom_callback(Function) -> None\n\
 Sets the Python function invoked at end of message.\n\
 This routine is the only place where special operations\n\
@@ -399,7 +525,7 @@ milter_set_eom_callback(PyObject *self, PyObject *args) {
  return generic_set_callback(args, "O:set_eom_callback", &eom_callback);
 }
-static const char milter_set_abort_callback__doc__[] =
+static char milter_set_abort_callback__doc__[] =
 "set_abort_callback(Function) -> None\n\
 Sets the Python function invoked if message is aborted\n\
 outside of the control of the filter, for example,\n\
@@ -413,7 +539,7 @@ milter_set_abort_callback(PyObject *self, PyObject *args) {
  return generic_set_callback(args, "O:set_abort_callback", &abort_callback);
 }
-static const char milter_set_close_callback__doc__[] =
+static char milter_set_close_callback__doc__[] =
 "set_close_callback(Function) -> None\n\
 Sets the Python function invoked at end of the connection.  This\n\
 is called on close even if the previous mail transaction was aborted.\n\
@@ -426,7 +552,7 @@ milter_set_close_callback(PyObject *self, PyObject *args) {
 static int exception_policy = SMFIS_TEMPFAIL;
-static const char milter_set_exception_policy__doc__[] =
+static char milter_set_exception_policy__doc__[] =
 "set_exception_policy(i) -> None\n\
 Sets the policy for untrapped Python exceptions during a callback.\n\
 Must be one of TEMPFAIL,REJECT,CONTINUE";
@@ -437,8 +563,7 @@ milter_set_exception_policy(PyObject *self, PyObject *args) {
  if (!PyArg_ParseTuple(args, "i:set_exception_policy", &i))
    return NULL;
  switch (i) {
-  case SMFIS_REJECT: case SMFIS_TEMPFAIL:
+  case SMFIS_REJECT: case SMFIS_TEMPFAIL: case SMFIS_CONTINUE:
  case SMFIS_CONTINUE: case SMFIS_ACCEPT:
    exception_policy = i;
    Py_INCREF(Py_None);
    return Py_None;
@@ -453,30 +578,23 @@ _release_thread(PyThreadState *t) {
    PyEval_ReleaseThread(t);
 }
 /** Report and clear any python exception before returning to libmilter. 
  The interpreter is locked when we are called, and we unlock it.  */
 static int _report_exception(milter_ContextObject *self) {
  char untrapped_msg[80];
  if (PyErr_Occurred()) {
    sprintf(untrapped_msg,"pymilter: untrapped exception in %.40s",
 	  description.xxfi_name);
    PyErr_Print();
    PyErr_Clear();	/* must clear since not returning to python */
    _release_thread(self->t);
    switch (exception_policy) {
      case SMFIS_REJECT:
-	smfi_setreply(self->ctx, "554", "5.3.0", untrapped_msg);
+	smfi_setreply(self->ctx, "554", "5.3.0", "Filter failure");
 	return SMFIS_REJECT;
      case SMFIS_TEMPFAIL:
-	smfi_setreply(self->ctx, "451", "4.3.0", untrapped_msg);
+	smfi_setreply(self->ctx, "451", "4.3.0", "Filter failure");
 	return SMFIS_TEMPFAIL;
    }
-    return exception_policy;
+    return SMFIS_CONTINUE;
  }
  /* This should never happen, _report_exception is only called when
   * the caller has already detected a python exception.  If it
   * does somehow happen, pretend nothing is wrong... */
  _release_thread(self->t);
  return SMFIS_CONTINUE;
 }
@@ -493,31 +611,9 @@ _generic_wrapper(milter_ContextObject *self, PyObject *cb, PyObject *arglist) {
  result = PyEval_CallObject(cb, arglist);
  Py_DECREF(arglist);
  if (result == NULL) return _report_exception(self);
-#if PY_MAJOR_VERSION >= 3
+  retval = PyInt_AsLong(result);
  if (!PyLong_Check(result)) {
 #else
  if (!PyInt_Check(result)) {
 #endif
    const struct MilterCallback *p;
    const char *cbname = "milter";
    char buf[40];
    Py_DECREF(result);
    for (p = callback; p->name; ++p) {
      if (cb == p->cb) {
        cbname = p->name;
 	break;
      }
    }
    sprintf(buf,"The %s callback must return int",cbname);
    PyErr_SetString(MilterError,buf);
    return _report_exception(self);
  }
 #if PY_MAJOR_VERSION >= 3
  retval = PyLong_AS_LONG(result);
 #else
  retval = PyInt_AS_LONG(result);
 #endif
  Py_DECREF(result);
  if (PyErr_Occurred()) return _report_exception(self);
  _release_thread(self->t);
  return retval;
 }
@@ -533,11 +629,7 @@ makeipaddr(struct sockaddr_in *addr) {
 	sprintf(buf, "%d.%d.%d.%d",
 		(int) (x>>24) & 0xff, (int) (x>>16) & 0xff,
 		(int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff);
 #if PY_MAJOR_VERSION >= 3
 	return PyUnicode_FromString(buf);
 #else
 	return PyString_FromString(buf);
 #endif
 }
 #ifdef HAVE_IPV6_SUPPORT
@@ -545,13 +637,8 @@ static PyObject *
 makeip6addr(struct sockaddr_in6 *addr) {
 	char buf[100]; /* must be at least INET6_ADDRSTRLEN + 1 */
 	const char *s = inet_ntop(AF_INET6, &addr->sin6_addr, buf, sizeof buf);
 #if PY_MAJOR_VERSION >= 3
       if (s) return PyUnicode_FromString(s);
       return PyUnicode_FromString("inet6:unknown");
 #else
 	if (s) return PyString_FromString(s);
 	return PyString_FromString("inet6:unknown");
 #endif
 }
 #endif
@@ -642,11 +729,7 @@ generic_env_wrapper(SMFICTX *ctx, PyObject*cb, char **argv) {
   for (i=0;i<count;i++) {
     /* There's some error checking performed in do_mkvalue() for a string */
     /* that's not currently done here - it probably should be */
 #if PY_MAJOR_VERSION >= 3
     PyObject *o = PyUnicode_FromStringAndSize(argv[i], strlen(argv[i]));
 #else
     PyObject *o = PyString_FromStringAndSize(argv[i], strlen(argv[i]));
 #endif
     if (o == NULL) {	/* out of memory */
       Py_DECREF(arglist);
       return _report_exception(self);
@@ -703,11 +786,7 @@ milter_wrap_body(SMFICTX *ctx, u_char *bodyp, size_t bodylen) {
   c = _get_context(ctx);
   if (!c) return SMFIS_TEMPFAIL;
   /* Unclear whether this should be s#, z#, or t# */
 #if PY_MAJOR_VERSION >= 3
   arglist = Py_BuildValue("(Oy#)", c, bodyp, bodylen);
 #else
   arglist = Py_BuildValue("(Os#)", c, bodyp, bodylen);
 #endif
   return _generic_wrapper(c, body_callback, arglist);
 }
@@ -723,6 +802,10 @@ milter_wrap_abort(SMFICTX *ctx) {
 }
 #ifdef SMFIS_ALL_OPTS
 static PyObject *unknown_callback = NULL;
 static PyObject *data_callback    = NULL;
 static PyObject *negotiate_callback = NULL;
 static int
 milter_wrap_unknown(SMFICTX *ctx, const char *cmd) {
   PyObject *arglist;
@@ -768,17 +851,20 @@ milter_wrap_negotiate(SMFICTX *ctx,
  rc = _generic_wrapper(c, negotiate_callback, arglist);
  c->t = t;
  if (rc == SMFIS_CONTINUE) {
 #if 0	// PyArgs_Parse deprecated and going away
    if (!PyArgs_Parse(optlist,"[kkkk]",pf0,pf1,pf2,pf3)) {
      PyErr_Print();
      PyErr_Clear();	/* must clear since not returning to python */
      rc = SMFIS_REJECT;
    }
 #else
    unsigned long *pa[4] = { pf0,pf1,pf2,pf3 };
    unsigned long fa[4] = { f0,f1,f2,f3 };
    int len = PyList_Size(optlist);
    int i;
    for (i = 0; i < 4; ++i) {
      *pa[i] = (i <= len)
 #if PY_MAJOR_VERSION >= 3
       ? PyLong_AsUnsignedLongMask(PyList_GET_ITEM(optlist,i))
 #else
      	? PyInt_AsUnsignedLongMask(PyList_GET_ITEM(optlist,i))
 #endif
 	: fa[i];
    }
    if (PyErr_Occurred()) {
@@ -786,6 +872,7 @@ milter_wrap_negotiate(SMFICTX *ctx,
      PyErr_Clear();
      rc = SMFIS_REJECT;
    }
 #endif
  }
  else if (rc != SMFIS_ALL_OPTS)
    rc = SMFIS_REJECT;
@@ -825,7 +912,7 @@ milter_wrap_close(SMFICTX *ctx) {
  return r;
 }
-static const char milter_register__doc__[] =
+static char milter_register__doc__[] =
 "register(name,unknown=,data=,negotiate=) -> None\n\
 Registers the milter name with current callbacks, and flags.\n\
 Required before main() is called.";
@@ -870,7 +957,7 @@ milter_register(PyObject *self, PyObject *args, PyObject *kwds) {
  return _generic_return(smfi_register(description), "cannot register");
 }
-static const char milter_opensocket__doc__[] =
+static char milter_opensocket__doc__[] =
 "opensocket(rmsock) -> None\n\
 Attempts to create and open the socket provided with setconn.\n\
 Removes the socket first if rmsock is True.";
@@ -883,7 +970,7 @@ milter_opensocket(PyObject *self, PyObject *args) {
   return _generic_return(smfi_opensocket(rmsock), "cannot opensocket");
 }
-static const char milter_main__doc__[] =
+static char milter_main__doc__[] =
 "main() -> None\n\
 Main milter routine.  Set any callbacks, and flags desired, then call\n\
 setconn(), then call register(name), and finally call main().";
@@ -907,7 +994,7 @@ milter_main(PyObject *self, PyObject *args) {
  return o;
 }
-static const char milter_setdbg__doc__[] =
+static char milter_setdbg__doc__[] =
 "setdbg(int) -> None\n\
 Sets debug level in sendmail/libmilter source.  Dubious usefulness.";
@@ -918,7 +1005,7 @@ milter_setdbg(PyObject *self, PyObject *args) {
  return _generic_return(smfi_setdbg(val), "cannot set debug value");
 }
-static const char milter_setbacklog__doc__[] =
+static char milter_setbacklog__doc__[] =
 "setbacklog(int) -> None\n\
 Set the TCP connection queue size for the milter socket.";
@@ -930,7 +1017,7 @@ milter_setbacklog(PyObject *self, PyObject *args) {
   return _generic_return(smfi_setbacklog(val), "cannot set backlog");
 }
-static const char milter_settimeout__doc__[] =
+static char milter_settimeout__doc__[] =
 "settimeout(int) -> None\n\
 Set the time (in seconds) that sendmail will wait before\n\
 considering this filter dead.";
@@ -943,7 +1030,7 @@ milter_settimeout(PyObject *self, PyObject *args) {
   return _generic_return(smfi_settimeout(val), "cannot set timeout");
 }
-static const char milter_setconn__doc__[] =
+static char milter_setconn__doc__[] =
 "setconn(filename) -> None\n\
 Sets the pathname to the unix, inet, or inet6 socket that\n\
 sendmail will use to communicate with this filter.  By default,\n\
@@ -963,7 +1050,7 @@ milter_setconn(PyObject *self, PyObject *args) {
   return _generic_return(smfi_setconn(str), "cannot set connection");
 }
-static const char milter_stop__doc__[] =
+static char milter_stop__doc__[] =
 "stop() -> None\n\
 This function appears to be a controlled method to tell sendmail to\n\
 stop using this filter.  It will close the socket.";
@@ -976,31 +1063,7 @@ milter_stop(PyObject *self, PyObject *args) {
  return _thread_return(t,smfi_stop(), "cannot stop");
 }
-static const char milter_getdiag__doc__[] =
+static char milter_getsymval__doc__[] =
 "getdiag() -> tuple\n\
 Return a tuple of diagnostic data.  The first two items are context new\n\
 count and context del count.  The rest are yet to be defined.";
 static PyObject *
 milter_getdiag(PyObject *self, PyObject *args) {
  if (!PyArg_ParseTuple(args, ":getdiag")) return NULL;
  return Py_BuildValue("(kk)", diag.contextNew,diag.contextDel);
 }
 static const char milter_getversion__doc__[] =
 "getversion() -> tuple\n\
 Return runtime libmilter version as a tuple of major,minor,patchlevel.";
 static PyObject *
 milter_getversion(PyObject *self, PyObject *args) {
  unsigned int major, minor, patch;
  if (!PyArg_ParseTuple(args, ":getversion")) return NULL;
  if (smfi_version(&major,&minor,&patch) != MI_SUCCESS) {
    PyErr_SetString(MilterError, "smfi_version failed");
    return NULL;
  }
  return Py_BuildValue("(kkk)", major,minor,patch);
 }
 static const char milter_getsymval__doc__[] =
 "getsymval(String) -> String\n\
 Returns a symbol's value.  Context-dependent, and unclear from the dox.";
@@ -1015,7 +1078,7 @@ milter_getsymval(PyObject *self, PyObject *args) {
  return Py_BuildValue("s", smfi_getsymval(ctx, str));
 }
-static const char milter_setreply__doc__[] =
+static char milter_setreply__doc__[] =
 "setreply(rcode, xcode, message) -> None\n\
 Sets the specific reply code to be used in response\n\
 to the active command.\n\
@@ -1079,7 +1142,7 @@ milter_setreply(PyObject *self, PyObject *args) {
 			 "cannot set reply");
 }
-static const char milter_addheader__doc__[] =
+static char milter_addheader__doc__[] =
 "addheader(field, value, idx=-1) -> None\n\
 Add a header to the message. This header is not passed to other\n\
 filters. It is not checked for standards compliance;\n\
@@ -1116,7 +1179,7 @@ milter_addheader(PyObject *self, PyObject *args) {
 }
 #ifdef SMFIF_CHGFROM
-static const char milter_chgfrom__doc__[] =
+static char milter_chgfrom__doc__[] =
 "chgfrom(sender,params) -> None\n\
 Change the envelope sender (MAIL From) of the current message.\n\
 A filter which calls smfi_chgfrom must have set the CHGFROM flag\n\
@@ -1125,7 +1188,7 @@ This function can only be called from the EOM callback.";
 static PyObject *
 milter_chgfrom(PyObject *self, PyObject *args) {
  char *sender;
-  char *params = NULL;
+  char *params;
  SMFICTX *ctx;
  PyThreadState *t;
@@ -1139,13 +1202,13 @@ milter_chgfrom(PyObject *self, PyObject *args) {
 }
 #endif
-static const char milter_chgheader__doc__[] =
+static char milter_chgheader__doc__[] =
 "chgheader(field, int, value) -> None\n\
 Change/delete a header in the message. \n\
 It is not checked for standards compliance; the mail filter\n\
 must ensure that no protocols are violated as a result of adding this header.\n\
 field - header field name\n\
-int - the Nth occurrence of this header\n\
+int - the Nth occurence of this header\n\
 value - header field value\n\
 field and value are strings.\n\
 This function can only be called from the EOM callback.";
@@ -1167,7 +1230,7 @@ milter_chgheader(PyObject *self, PyObject *args) {
 			 "cannot change header");
 }
-static const char milter_addrcpt__doc__[] =
+static char milter_addrcpt__doc__[] =
 "addrcpt(string,params=None) -> None\n\
 Add a recipient to the envelope.  It must be in the same format\n\
 as is passed to the envrcpt callback in the first tuple element.\n\
@@ -1197,7 +1260,7 @@ milter_addrcpt(PyObject *self, PyObject *args) {
  return _thread_return(t,rc, "cannot add recipient");
 }
-static const char milter_delrcpt__doc__[] =
+static char milter_delrcpt__doc__[] =
 "delrcpt(string) -> None\n\
 Delete a recipient from the envelope.\n\
 This function can only be called from the EOM callback.";
@@ -1215,7 +1278,7 @@ milter_delrcpt(PyObject *self, PyObject *args) {
  return _thread_return(t,smfi_delrcpt(ctx, rcpt), "cannot delete recipient");
 }
-static const char milter_replacebody__doc__[] =
+static char milter_replacebody__doc__[] =
 "replacebody(string) -> None\n\
 Replace the body of the message. This routine may be called multiple\n\
 times if the body is longer than convenient to send in one call. End of\n\
@@ -1237,7 +1300,7 @@ milter_replacebody(PyObject *self, PyObject *args) {
 	(unsigned char *)bodyp, bodylen), "cannot replace message body");
 }
-static const char milter_setpriv__doc__[] =
+static char milter_setpriv__doc__[] =
 "setpriv(object) -> object\n\
 Associates any Python object with this context, and returns\n\
 the old value or None.  Use this to\n\
@@ -1263,7 +1326,7 @@ milter_setpriv(PyObject *self, PyObject *args) {
  return old;
 }
-static const char milter_getpriv__doc__[] =
+static char milter_getpriv__doc__[] =
 "getpriv() -> None\n\
 Returns the Python object associated with the current context (if any).\n\
 Use this in conjunction with setpriv to keep track of data in a thread-safe\n\
@@ -1281,7 +1344,7 @@ milter_getpriv(PyObject *self, PyObject *args) {
 }
 #ifdef SMFIF_QUARANTINE
-static const char milter_quarantine__doc__[] =
+static char milter_quarantine__doc__[] =
 "quarantine(string) -> None\n\
 Place the message in quarantine.  A string with a description of the reason\n\
 is the only argument.";
@@ -1302,7 +1365,7 @@ milter_quarantine(PyObject *self, PyObject *args) {
 #endif
 #ifdef SMFIR_PROGRESS
-static const char milter_progress__doc__[] =
+static char milter_progress__doc__[] =
 "progress() -> None\n\
 Notify the MTA that we are working on a message so it will reset timeouts.";
@@ -1319,23 +1382,23 @@ milter_progress(PyObject *self, PyObject *args) {
 }
 #endif
-#ifdef SMFIF_SETSYMLIST
+#ifdef SMFIF_SETSMLIST
-static const char milter_setsymlist__doc__[] =
+static char milter_setsmlist__doc__[] =
-"setsymlist(stage,macrolist) -> None\n\
+"setsmlist(stage,macrolist) -> None\n\
 Tell the MTA which macro values we are interested in for a given stage";
 static PyObject *
-milter_setsymlist(PyObject *self, PyObject *args) {
+milter_setsmlist(PyObject *self, PyObject *args) {
  SMFICTX *ctx;
  PyThreadState *t;
  int stage = 0;
  char *smlist = 0;
-  if (!PyArg_ParseTuple(args, "is:setsymlist",&stage, &smlist)) return NULL;
+  if (!PyArg_ParseTuple(args, "is:setsmlist",&stage, &smlist)) return NULL;
  ctx = _find_context(self);
  if (ctx == NULL) return NULL;
  t = PyEval_SaveThread();
-  return _thread_return(t,smfi_setsymlist(ctx,stage,smlist),
+  return _thread_return(t,smfi_setsmlist(ctx,stage,smlist),
        "cannot set macro list");
 }
 #endif
@@ -1359,18 +1422,16 @@ static PyMethodDef context_methods[] = {
 #ifdef SMFIF_CHGFROM
  { "chgfrom",  milter_chgfrom,  METH_VARARGS, milter_chgfrom__doc__},
 #endif
-#ifdef SMFIF_SETSYMLIST
+#ifdef SMFIF_SETSMLIST
-  { "setsymlist",  milter_setsymlist,  METH_VARARGS, milter_setsymlist__doc__},
+  { "setsmlist",  milter_setsmlist,  METH_VARARGS, milter_setsmlist__doc__},
 #endif
  { NULL, NULL }
 };
 #if PY_MAJOR_VERSION < 3
 static PyObject *
 milter_Context_getattr(PyObject *self, char *name) {
  return Py_FindMethod(context_methods, self, name);
 }
 #endif
 static struct smfiDesc description = {  /* Set some reasonable defaults */
  "pythonfilter",
@@ -1414,29 +1475,18 @@ static PyMethodDef milter_methods[] = {
   { "setbacklog",           milter_setbacklog,           METH_VARARGS, milter_setbacklog__doc__},
   { "setconn",              milter_setconn,              METH_VARARGS, milter_setconn__doc__},
   { "stop",                 milter_stop,                 METH_VARARGS, milter_stop__doc__},
   { "getdiag",              milter_getdiag,              METH_VARARGS, milter_getdiag__doc__},
   { "getversion",           milter_getversion,           METH_VARARGS, milter_getversion__doc__},
   { NULL, NULL }
 };
 static PyTypeObject milter_ContextType = {
 #if PY_MAJOR_VERSION >= 3
  PyVarObject_HEAD_INIT(&PyType_Type,0)
  "milter.Context",
 #else
  PyObject_HEAD_INIT(&PyType_Type)
  0,
  "milterContext",
 #endif
  sizeof(milter_ContextObject),
  0,
        milter_Context_dealloc,            /* tp_dealloc */
        0,               /* tp_print */
 #if PY_MAJOR_VERSION >= 3
        0,           /* tp_getattr */
 #else
        milter_Context_getattr,           /* tp_getattr */
 #endif
        0,			/* tp_setattr */
        0,                                      /* tp_compare */
        0,                 /* tp_repr */
@@ -1450,63 +1500,26 @@ static PyTypeObject milter_ContextType = {
        0,                                      /* tp_setattro */
        0,                                      /* tp_as_buffer */
        Py_TPFLAGS_DEFAULT,                     /* tp_flags */
 #if PY_MAJOR_VERSION >= 3
        NULL,   /* Documentation string */
        0,      /* call function for all accessible objects */
        0,      /* delete references to contained objects */
        0,      /* rich comparisons */
        0,      /* weak reference enabler */
        0, 0,   /* Iterators */
        context_methods, /* Attribute descriptor and subclassing stuff */
 #endif
 };
-static const char milter_documentation[] =
+static char milter_documentation[] =
 "This module interfaces with Sendmail's libmilter functionality,\n\
 allowing one to write email filters directly in Python.\n\
 Libmilter is currently marked FFR, and needs to be explicitly installed.\n\
 See <sendmailsource>/libmilter/README for details on setting it up.\n";
 static void setitem(PyObject *d,const char *name,long val) {
 #if PY_MAJOR_VERSION >= 3
  PyObject *v = PyLong_FromLong(val);
 #else
  PyObject *v = PyInt_FromLong(val);
 #endif
  PyDict_SetItemString(d,name,v);
  Py_DECREF(v);
 }
-#if PY_MAJOR_VERSION >= 3
+void
-
+initmilter(void) {
 static struct PyModuleDef moduledef = {
    PyModuleDef_HEAD_INIT,
    "milter",           /* m_name */
    milter_documentation,/* m_doc */
    -1,                  /* m_size */
    milter_methods,      /* m_methods */
    NULL,                /* m_reload */
    NULL,                /* m_traverse */
    NULL,                /* m_clear */
    NULL,                /* m_free */
 };
 PyMODINIT_FUNC PyInit_milter(void) {
    PyObject *m, *d;
   if (PyType_Ready(&milter_ContextType) < 0)
          return NULL;
   m = PyModule_Create(&moduledef);
   if (m == NULL) return NULL;
 #else
 void initmilter(void) {
   PyObject *m, *d;
   m = Py_InitModule4("milter", milter_methods, milter_documentation,
 		      (PyObject*)NULL, PYTHON_API_VERSION);
 #endif
   d = PyModule_GetDict(m);
   MilterError = PyErr_NewException("milter.error", NULL, NULL);
   PyDict_SetItemString(d,"error", MilterError);
@@ -1531,15 +1544,8 @@ void initmilter(void) {
 #ifdef SMFIF_CHGFROM
   setitem(d,"CHGFROM",SMFIF_CHGFROM);
 #endif
-#ifdef SMFIF_SETSYMLIST
+#ifdef SMFIF_SETSMLIST
-   setitem(d,"SETSYMLIST",SMFIF_SETSYMLIST);
+   setitem(d,"SETSMLIST",SMFIF_SETSMLIST);
   setitem(d,"M_CONNECT",SMFIM_CONNECT);/* connect */
   setitem(d,"M_HELO",SMFIM_HELO);	/* HELO/EHLO */
   setitem(d,"M_ENVFROM",SMFIM_ENVFROM);/* MAIL From */
   setitem(d,"M_ENVRCPT",SMFIM_ENVRCPT);/* RCPT To */
   setitem(d,"M_DATA",SMFIM_DATA);	/* DATA */
   setitem(d,"M_EOM",SMFIM_EOM);	/* end of message (final dot) */
   setitem(d,"M_EOH",SMFIM_EOH);	/* end of header */
 #endif
 #ifdef SMFIS_ALL_OPTS
   setitem(d,"P_RCPT_REJ",SMFIP_RCPT_REJ);
@@ -1572,7 +1578,4 @@ void initmilter(void) {
   setitem(d,"DISCARD",  SMFIS_DISCARD);
   setitem(d,"ACCEPT",  SMFIS_ACCEPT);
   setitem(d,"TEMPFAIL",  SMFIS_TEMPFAIL);
 #if PY_MAJOR_VERSION >= 3
   return m;
 #endif
 }
@@ -1,16 +1,4 @@
 # $Log$
 # Revision 1.8  2011/11/05 15:51:03  customdesigned
 # New example
 #
 # Revision 1.7  2009/06/13 21:15:12  customdesigned
 # Doxygen updates.
 #
 # Revision 1.6  2009/06/09 03:13:13  customdesigned
 # More doxygen docs.
 #
 # Revision 1.5  2005/07/20 14:49:43  customdesigned
 # Handle corrupt and empty ZIP files.
 #
 # Revision 1.4  2005/06/17 01:49:39  customdesigned
 # Handle zip within zip.
 #
@@ -82,45 +70,31 @@
 # with old milter code.
 #
-## @package mime
+# This module provides a "defang" function to replace naughty attachments
-# This module provides a "defang" function to replace naughty attachments.
+# with a warning message.
 #
 # We also provide workarounds for bugs in the email module that comes 
 # with python.  The "bugs" fixed mostly come up only with malformed
 # messages - but that is what you have when dealing with spam.
 # Author: Stuart D. Gathman <stuart@bmsi.com>
 # Copyright 2001,2002,2003,2004,2005 Business Management Systems, Inc.
 # This code is under the GNU General Public License.  See COPYING for details.
-from __future__ import print_function
+import StringIO
 try:
  from io import BytesIO, StringIO
 except:
  from StringIO import StringIO 
  BytesIO = StringIO
 import socket
 import Milter
 import zipfile
 import sys
 import email
-from email.message import Message
+import email.Message
-try:
+from email.Message import Message
-  from email.generator import BytesGenerator
+from email.Generator import Generator
-  from email import message_from_binary_file
+from email.Utils import quote
-except:
+from email import Utils
-  from email.generator import Generator as BytesGenerator
+from email.Parser import Parser
-  from email import message_from_file as message_from_binary_file
+from email import Errors
 from email.utils import quote
-if not getattr(Message,'as_bytes',None):
+from types import ListType,StringType
  Message.as_bytes = Message.as_string
 ## Return a list of filenames in a zip file.
 # Embedded zip files are recursively expanded.
 def zipnames(txt):
-  fp =  BytesIO(txt)
+  fp =  StringIO.StringIO(txt)
  zipf = zipfile.ZipFile(fp,'r')
  names = []
  for nm in zipf.namelist():
@@ -129,9 +103,7 @@ def zipnames(txt):
      names += zipnames(zipf.read(nm))
  return names
-## Fix multipart handling in email.Generator.
+class MimeGenerator(Generator):
 #
 class MimeGenerator(BytesGenerator):
    def _dispatch(self, msg):
        # Get the Content-Type: for the message, then try to dispatch to
        # self._handle_<maintype>_<subtype>().  If there's no handler for the
@@ -141,7 +113,7 @@ class MimeGenerator(BytesGenerator):
 	if msg.is_multipart() and main.lower() != 'multipart':
 	  self._handle_multipart(msg)
 	else:
-          BytesGenerator._dispatch(self,msg)
+	  Generator._dispatch(self,msg)
 def unquote(s):
    """Remove quotes from a string."""
@@ -158,33 +130,33 @@ def unquote(s):
 	  return s[1:-1]
    return s
 from types import TupleType
 def _unquotevalue(value):
-  if isinstance(value, tuple):
+  if isinstance(value, TupleType):
      return value[0], value[1], unquote(value[2])
  else:
      return unquote(value)
 #email.Message._unquotevalue = _unquotevalue
-from email.message import _parseparam
+from email.Message import _parseparam
-## Enhance email.message.Message
+# Enhance email.Message 
-#
+# - Provide a headerchange event for integration with Milter
-# Tracks modifications to headers of body or any part independently.
+#   Headerchange attribute can be assigned a function to be called when
 #   changing headers.  The signature is:
 #	headerchange(msg,name,value) -> None
 # - Track modifications to headers of body or any part independently
 class MimeMessage(Message):
  """Version of email.Message.Message compatible with old mime module
  """
  def __init__(self,fp=None,seekable=1):
    Message.__init__(self)
    self.headerchange = None
    self.submsg = None
    self.modified = False
  ## @var headerchange
  # Provide a headerchange event for integration with Milter.
  #   The headerchange attribute can be assigned a function to be called when
  #   changing headers.  The signature is:
  #   headerchange(msg,name,value) -> None
    self.headerchange = None
  def get_param(self, param, failobj=None, header='content-type', unquote=True):
    val = Message.get_param(self,param,failobj,header,unquote)
@@ -209,7 +181,7 @@ class MimeMessage(Message):
       interpret as a name - and hence decide to execute this message."""
    names = []
    for attr,val in self._get_params_preserve([],'content-type'):
-      if isinstance(val, tuple):
+      if isinstance(val, TupleType):
 	  # It's an RFC 2231 encoded parameter
 	  newvalue = _unquotevalue(val)
 	  if val[0]:
@@ -244,9 +216,9 @@ class MimeMessage(Message):
    g = MimeGenerator(file)
    g.flatten(self,unixfrom=unixfrom)
-  def as_bytes(self, unixfrom=False):
+  def as_string(self, unixfrom=False):
      "Return the entire formatted message as a string."
-      fp = BytesIO()
+      fp = StringIO.StringIO()
      self.dump(fp,unixfrom=unixfrom)
      return fp.getvalue()
@@ -307,7 +279,7 @@ class MimeMessage(Message):
    return None
 def message_from_file(fp):
-  msg = message_from_binary_file(fp,MimeMessage)
+  msg = email.message_from_file(fp,MimeMessage)
  for part in msg.walk():
    part.modified = False
  assert not msg.ismodified()
@@ -318,7 +290,7 @@ ade,adp,asd,asx,asp,bas,bat,chm,cmd,com,cpl,crt,dll,exe,hlp,hta,inf,ins,isp,js,
 jse,lnk,mdb,mde,msc,msi,msp,mst,ocx,pcd,pif,reg,scr,sct,shs,url,vb,vbe,vbs,wsc,
 wsf,wsh 
 """.split())
-bad_extensions = ['.' + x for x in extlist.split(',')]
+bad_extensions = map(lambda x:'.' + x,extlist.split(','))
 def check_ext(name):
  "Check a name for dangerous Winblows extensions."
@@ -357,6 +329,8 @@ def check_name(msg,savname=None,ckname=check_ext,scan_zip=False):
  msg["Content-Type"] = "text/plain; name="+name
  return Milter.CONTINUE
 import email.Iterators
 def check_attachments(msg,check):
  """Scan attachments.
 msg	MimeMessage
@@ -402,21 +376,18 @@ class _defang:
 # emulate old defang function
 defang = _defang()
-if sys.version < '3.0.0':
+import sgmllib
    from sgmllib import SGMLParser as HTMLParser
 else:
    from Milter.sgmllib import SGMLParser as HTMLParser
 import re
 declname = re.compile(r'[a-zA-Z][-_.a-zA-Z0-9]*\s*')
 declstringlit = re.compile(r'(\'[^\']*\'|"[^"]*")\s*')
-class SGMLFilter(HTMLParser):
+class SGMLFilter(sgmllib.SGMLParser):
  """Parse HTML and pass through all constructs unchanged.  It is intended for
     derived classes to implement exceptional processing for selected cases.
  """
  def __init__(self,out):
-    HTMLParser.__init__(self)
+    sgmllib.SGMLParser.__init__(self)
    self.out = out
  def handle_comment(self,comment):
@@ -447,7 +418,7 @@ class SGMLFilter(HTMLParser):
    self.out.write("<!%s>" % data)
  def write(self,buf):
-    "Act like a writer.  Why doesn't HTMLParser do this by default?"
+    "Act like a writer.  Why doesn't SGMLParser do this by default?"
    self.feed(buf)
  # Python-2.1 sgmllib rejects illegal declarations.  Since various Microsoft
@@ -490,14 +461,11 @@ class HTMLScriptFilter(SGMLFilter):
    self.modified = False
    self.msg = "<!-- WARNING: embedded script removed -->"
  def start_script(self,unused):
    #print('beg script',unused)
    self.ignoring += 1
    self.modified = True
  def end_script(self):
    #print('end script')
    self.ignoring -= 1
    if not self.ignoring:
    self.out.write(self.msg)
  def end_script(self):
    self.ignoring -= 1
  def handle_data(self,data):
    if not self.ignoring: SGMLFilter.handle_data(self,data)
  def handle_comment(self,comment):
@@ -512,14 +480,14 @@ def check_html(msg,savname=None):
      if name and name.lower().endswith(".htm"):
 	msgtype = 'text/html'
  if msgtype == 'text/html':
-    out = StringIO()
+    out = StringIO.StringIO()
    htmlfilter = HTMLScriptFilter(out)
    try:
-      htmlfilter.write(msg.get_payload(decode=True).decode())
+      htmlfilter.write(msg.get_payload(decode=True))
      htmlfilter.close()
    #except sgmllib.SGMLParseError:
    except:
-      mimetools.copyliteral(msg.get_payload(),open('debug.out','wb'))
+      #mimetools.copyliteral(msg.get_payload(),open('debug.out','w')
      htmlfilter.close()
      hostname = socket.gethostname()
      msg.set_payload(
@@ -538,17 +506,18 @@ def check_html(msg,savname=None):
  return Milter.CONTINUE
 if __name__ == '__main__':
  import sys
  def _list_attach(msg):
    t = msg.get_content_type()
    p = msg.get_payload(decode=True)
-    print(msg.get_filename(),msg.get_content_type(),type(p))
+    print msg.get_filename(),msg.get_content_type(),type(p)
    msg = msg.get_submsg()
    if isinstance(msg,Message):
      return check_attachments(msg,_list_attach)
    return Milter.CONTINUE
  for fname in sys.argv[1:]:
-    fp = open(fname,'rb')
+    fp = open(fname)
    msg = message_from_file(fp)
-    email.iterators._structure(msg)
+    email.Iterators._structure(msg)
    check_attachments(msg,_list_attach)
@@ -1,6 +0,0 @@
 Check	Description		Justification
 E111	req indent 4		Creates more continuation lines
 E114	req indent 4 cmnt	Same
 E231	req space after ,	makes calls like print() harder to read
 E266	no ## 			Required by Doxygen
 W291	trailing spaces in cmnt	Needed for space preserving para reformat
@@ -1,5 +0,0 @@
 #!/bin/sh
 ignore=`awk -F\\\\t '{ print $1 }' pep8.dat | tail -n +2`
 a=(${ignore})
 list=$(echo "${a[@]}"|tr '[ ]' '[,]')
 echo python3 -m pep8 --ignore="$list" $@
@@ -1,254 +1,88 @@
-# we don't want to provide private python extension libs
+# EL 3,4,5 supported, set to 0 for Fedora
-%global sum Python interface to sendmail milter API
+%define el4 1
-%global __provides_exclude_from ^(%{python2_sitearch})/.*\\.so$
+%define dist .el4
-%if 0%{?epel} == 7
+%if 0%{?el3} || 0%{?el4}
-%global python3 python34
+%define __python python2.4
 %else
 %global python3 python3
 %endif
-Summary: %{sum}
+%define libdir %{_libdir}/pymilter
-Name: python-pymilter
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-Version: 1.0.4
+%define pythonbase %(basename %{__python})
-Release: 1%{?dist}
+
-Url: http://bmsi.com/pymilter
+Summary: Python interface to sendmail milter API
-Source: https://github.com/sdgathman/pymilter/archive/pymilter-%{version}.tar.gz
+Name: pymilter
-Source1: tmpfiles-python-pymilter.conf
+Version: 0.9.2
-# remove unit tests that require network for check
+Release: 3%{dist}
-Patch: pymilter-check.patch
+Source: http://downloads.sourceforge.net/pymilter/%{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Development/Libraries
-BuildRequires: python2-devel, %{python3}-devel, sendmail-devel >= 8.13
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-# python-2.6.4 gets RuntimeError: not holding the import lock
+Url: http://www.bmsi.com/python/milter.html
-# Need python2.6 specific pydns, not the version for system python
+Requires: %{pythonbase} >= 2.4, sendmail >= 8.13
-BuildRequires:  gcc
+%if 0%{?el3} || 0%{?el4}
 # Need python2.4 specific pydns, not the version for system python
 Requires: pydns
 %else
 # Needed for callbacks, not a core function but highly useful for milters
 Requires: python-pydns
 %endif
 BuildRequires: ed, %{pythonbase}-devel >= 2.4, sendmail-devel >= 8.13
-%global _description\
+%description
-This is a python extension module to enable python scripts to\
+This is a python extension module to enable python scripts to
-attach to sendmail's libmilter functionality.  Additional python\
+attach to sendmail's libmilter functionality.  Additional python
-modules provide for navigating and modifying MIME parts, sending\
+modules provide for navigating and modifying MIME parts, sending
 DSNs, and doing CBV.
 %description %_description
 %package -n python2-pymilter
 Summary: %{sum}
 %if 0%{?epel} >= 6
 Requires: python-pydns
 %else
 Requires: python2-pydns
 %endif
 Requires: %{name}-common = %{version}-%{release}
 %{?python_provide:%python_provide python2-pymilter}
 %description -n python2-pymilter %_description
 %package -n %{python3}-pymilter
 Summary: %{sum}
 %if 0%{?fedora} >= 26
 Requires: %{python3}-py3dns
 %endif
 Requires: %{name}-common = %{version}-%{release}
 %{?python_provide:%python_provide %{python3}-pymilter}
 %description -n %{python3}-pymilter %_description
 %package common
 Summary: Common files and directories for python milters
 BuildArch: noarch
 %description common
 Common files and directories used for python milters
 %package selinux
 Summary: SELinux policy module for pymilter
 Group: System Environment/Base
 Requires: policycoreutils, selinux-policy-targeted
 Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 BuildRequires: policycoreutils, checkpolicy, selinux-policy-devel
 %if 0%{?epel} >= 6
 BuildRequires: policycoreutils-python
 %else
 BuildRequires: policycoreutils-python-utils
 %endif
 %description selinux
 Give sendmail_t additional access to stream sockets used to communicate
 with milters.
 %prep
-%setup -q -n pymilter-pymilter-%{version}
+%setup -q
 %patch -p1 -b .check
 %build
-%py2_build
+env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 #patch -p1 -b -z .py3 <milter.patch # not needed since 1.0.3
 %py3_build
 checkmodule -m -M -o pymilter.mod pymilter.te
 semodule_package -o pymilter.pp -m pymilter.mod
 %install
-%py2_install 
+rm -rf $RPM_BUILD_ROOT
-%py3_install 
+%{__python} setup.py install --root=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/milter
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/milter
 mkdir -p $RPM_BUILD_ROOT%{libdir}
 cp start.sh $RPM_BUILD_ROOT%{libdir}
 ed $RPM_BUILD_ROOT%{libdir}/start.sh <<'EOF'
 /^datadir=/
 c
 datadir="%{_localstatedir}/log/milter"
 .
 /^piddir=/
 c
 piddir="%{_localstatedir}/run/milter"
 .
 /^libdir=/
 c
 libdir="%{libdir}"
 .
 /^python=/
 c
 python="%{__python}"
 .
 w
 q
 EOF
 chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh
-mkdir -p %{buildroot}/run/milter
+# start.sh is used by spfmilter, srsmilter, and milter, and could be used by
-mkdir -p %{buildroot}%{_localstatedir}/log/milter
+# other milters using pymilter.
-mkdir -p %{buildroot}%{_libexecdir}/milter
+%files
-mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
+%defattr(-,root,root,-)
 install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
 # install selinux modules
 mkdir -p %{buildroot}%{_datadir}/selinux/targeted
 cp -p pymilter.pp %{buildroot}%{_datadir}/selinux/targeted
 %check
 py2path=$(ls -d build/lib.linux-*-2.*)
 py3path=$(ls -d build/lib.linux-*-3.*)
 PYTHONPATH=${py2path}:. python2 test.py &&
 PYTHONPATH=${py3path}:. python3 test.py
 %files -n python2-pymilter
 %license COPYING
 %doc README ChangeLog NEWS TODO CREDITS sample.py milter-template.py
-%{python2_sitearch}/*
+%{python_sitearch}/*
-
+%{libdir}
-%files -n %{python3}-pymilter
+%dir %attr(0755,mail,mail) %{_localstatedir}/run/milter
 %license COPYING
 %doc README ChangeLog NEWS TODO CREDITS sample.py milter-template.py
 %{python3_sitearch}/*
 %files common
 %dir %{_libexecdir}/milter
 %{_prefix}/lib/tmpfiles.d/%{name}.conf
 %dir %attr(0755,mail,mail) %{_localstatedir}/log/milter
 %dir %attr(0755,mail,mail) /run/milter
-%files selinux
+%clean
-%doc pymilter.te
+rm -rf $RPM_BUILD_ROOT
 %{_datadir}/selinux/targeted/*
 %post selinux
 %{_sbindir}/semodule -s targeted -i %{_datadir}/selinux/targeted/pymilter.pp \
        &>/dev/null || :
 %postun selinux
 if [ $1 -eq 0 ] ; then
 %{_sbindir}/semodule -s targeted -r pymilter &> /dev/null || :
 fi
 %changelog
 * Wed Apr 17 2019 Stuart Gathman <stuart@gathman.org> - 1.0.4-1
 - New upstream release: cleanup unused files, additional platform support
 - Minor doc updates
 * Sun Dec 23 2018 Stuart Gathman <stuart@gathman.org> - 1.0.3-1
 - New upstream release
 - patch step for python3 no longer required in build
 * Sat Aug  4 2018 Stuart Gathman <stuart@gathman.org> - 1.0.2-4
 - Add unit tests to %%check
 * Sat Aug  4 2018 Stuart Gathman <stuart@gathman.org> - 1.0.2-3
 - use libexec instead of libdir
 * Sat Aug  4 2018 Stuart Gathman <stuart@gathman.org> - 1.0.2-2
 - add python34 subpackage on el7
 * Sat Aug  4 2018 Stuart Gathman <stuart@gathman.org> - 1.0.2-1
 - build for both python2 and python3
 - add selinux policy allowing sendmail_t access to milters
 * Tue Jul 17 2018 Miro Hrončok <mhroncok@redhat.com> - 1.0-13
 - Update Python macros to new packaging standards
  (See https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package)
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 * Fri Feb 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.0-11
 - Update Python 2 dependency declarations to new packaging standards
  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0-9
 - Escape macros in %%changelog
 * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0-8
 - Python 2 binary package renamed to python2-pymilter
  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 >>>>>>> 021796e51e5919812f1c300d1830ef9ed378db2d
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 * Sat Sep 27 2014 Paul Wouters <pwouters@redhat.com> - 1.0-1
 - Updated to 1.0
 - Use tmpfiles and /run
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 * Fri Jan 10 2014 Paul Wouters <pwouters@redhat.com> - 0.9.8-4
 - Add COPYING
 - Fix buildroot macros and dist macro
 * Fri Jan 10 2014 Paul Wouters <pwouters@redhat.com> - 0.9.8-3
 - rebuilt with proper file permission
 * Tue Jan 07 2014 Paul Wouters <pwouters@redhat.com> - 0.9.8-2
 - Fixup for fedora release
 * Sat Mar  9 2013 Stuart Gathman <stuart@bmsi.com> 0.9.8-1
 - Add Milter.test module for unit testing milters.
 - Fix typo that prevented setsymlist from being active.
 - Change untrapped exception message to:
 - "pymilter: untrapped exception in milter app"
 * Sat Feb 25 2012 Stuart Gathman <stuart@bmsi.com> 0.9.7-1
 - Raise RuntimeError when result != CONTINUE for @noreply and @nocallback
 - Remove redundant table in miltermodule
 - Fix CNAME chain duplicating TXT records in Milter.dns (from pyspf).
 * Sat Feb 25 2012 Stuart Gathman <stuart@bmsi.com> 0.9.6-1
 - Raise ValueError on unescaped '%%' passed to setreply
 - Grace time at end of Greylist window
 * Fri Aug 19 2011 Stuart Gathman <stuart@bmsi.com> 0.9.5-1
 - Print milter.error for invalid callback return type.
  (Since stacktrace is empty, the TypeError exception is confusing.)
 - Fix milter-template.py
 - Tweak Milter.utils.addr2bin and Milter.dynip to handle IP6
 * Tue Mar 02 2010 Stuart Gathman <stuart@bmsi.com> 0.9.4-1
 - Handle IP6 in Milter.utils.iniplist()
 - python-2.6
 * Thu Jul 02 2009 Stuart Gathman <stuart@bmsi.com> 0.9.3-1
 - Handle source route in Milter.utils.parse_addr()
 - Fix default arg in chgfrom.
 - Disable negotiate callback for libmilter < 8.14.3 (1,0,1)
 * Tue Jun 02 2009 Stuart Gathman <stuart@bmsi.com> 0.9.2-3
 - Change result of @noreply callbacks to NOREPLY when so negotiated.
@@ -1,13 +0,0 @@
 module pymilter 1.0;
 require {
 	type sendmail_t;
 	type var_run_t;
 	type initrc_t;
 	class sock_file { write getattr };
 	class unix_stream_socket connectto;
 }
 #============= sendmail_t ==============
 allow sendmail_t initrc_t:unix_stream_socket connectto;
 allow sendmail_t var_run_t:sock_file { write getattr };
@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 # A simple milter.
 # Author: Stuart D. Gathman <stuart@bmsi.com>
@@ -7,10 +7,8 @@ from __future__ import print_function
 import sys
 import os
-try:
+import StringIO
-  from io import BytesIO
+import rfc822
 except:
  from StringIO import StringIO as BytesIO
 import mime
 import Milter
 import tempfile
@@ -23,9 +21,9 @@ class sampleMilter(Milter.Milter):
  "Milter to replace attachments poisonous to Windows with a WARNING message."
  def log(self,*msg):
-    print("%s [%d]" % (strftime('%Y%b%d %H:%M:%S'),self.id),end=None)
+    print "%s [%d]" % (strftime('%Y%b%d %H:%M:%S'),self.id),
-    for i in msg: print(i,end=None)
+    for i in msg: print i,
-    print()
+    print
  def __init__(self):
    self.tempname = None
@@ -33,25 +31,16 @@ class sampleMilter(Milter.Milter):
    self.fp = None
    self.bodysize = 0
    self.id = Milter.uniqueID()
    self.user = None
  # multiple messages can be received on a single connection
  # envfrom (MAIL FROM in the SMTP protocol) seems to mark the start
  # of each message.
  @Milter.symlist('{auth_authen}')
  @Milter.noreply
  def envfrom(self,f,*str):
-    "start of MAIL transaction"
+    self.log("mail from",f,str)
-    self.fp = BytesIO()
+    self.fp = StringIO.StringIO()
    self.tempname = None
    self.mailfrom = f
    self.bodysize = 0
    self.user = self.getsymval('{auth_authen}')
    self.auth_type = self.getsymval('{auth_type}')
    if self.user:
      self.log("user",self.user,"sent mail from",f,str)
    else:
      self.log("mail from",f,str)
    return Milter.CONTINUE
  def envrcpt(self,to,*str):
@@ -104,12 +93,12 @@ class sampleMilter(Milter.Milter):
    if lname in ('subject','x-mailer'):
      self.log('%s: %s' % (name,val))
    if self.fp:
-      self.fp.write(("%s: %s\n" % (name,val)).encode())	# add header to buffer
+      self.fp.write("%s: %s\n" % (name,val))	# add header to buffer
    return Milter.CONTINUE
  def eoh(self):
    if not self.fp: return Milter.TEMPFAIL	# not seen by envfrom
-    self.fp.write(b'\n')
+    self.fp.write("\n")
    self.fp.seek(0)
    # copy headers to a temp file for scanning the body
    headers = self.fp.getvalue()
@@ -147,16 +136,19 @@ class sampleMilter(Milter.Milter):
    self.log("Temp file:",self.tempname)
    self.tempname = None	# prevent removal of original message copy
    # copy defanged message to a temp file 
-    with tempfile.TemporaryFile() as out:
+    out = tempfile.TemporaryFile()
    try:
      msg.dump(out)
      out.seek(0)
-      msg = mime.message_from_file(out)
+      msg = rfc822.Message(out)
-      fp = BytesIO(msg.as_bytes().split(b'\n\n',1)[1])
+      msg.rewindbody()
      while 1:
-        buf = fp.read(8192)
+	buf = out.read(8192)
 	if len(buf) == 0: break
 	self.replacebody(buf)	# feed modified message to sendmail
      return Milter.ACCEPT	# ACCEPT modified message
    finally:
      out.close()
    return Milter.TEMPFAIL
  def close(self):
@@ -177,13 +169,13 @@ if __name__ == "__main__":
  socketname = os.getenv("HOME") + "/pythonsock"
  Milter.factory = sampleMilter
  Milter.set_flags(Milter.CHGBODY + Milter.CHGHDRS + Milter.ADDHDRS)
-  print("""To use this with sendmail, add the following to sendmail.cf:
+  print """To use this with sendmail, add the following to sendmail.cf:
 O InputMailFilters=pythonfilter
 Xpythonfilter,        S=local:%s
 See the sendmail README for libmilter.
-sample  milter startup""" % socketname)
+sample  milter startup""" % socketname
  sys.stdout.flush()
  Milter.runmilter("pythonfilter",socketname,240)
-  print("sample milter shutdown")
+  print "sample milter shutdown"
@@ -1,5 +1,5 @@
 [bdist_rpm]
-python=python3
+python=python2.4
-doc_files=README NEWS TODO COPYING CREDITS
+doc_files=README NEWS TODO
-packager=Stuart D. Gathman <stuart@gathman.org>
+packager=Stuart D. Gathman <stuart@bmsi.com>
 release=1
@@ -2,19 +2,22 @@ import os
 import sys
 from distutils.core import setup, Extension
 if sys.version < '2.6.5':
  sys.exit('ERROR: Sorry, python 2.6.5 is required for this module.')
 # FIXME: on some versions of sendmail, smutil is renamed to sm.
 # On slackware and debian, leave it out entirely.  It depends
 # on how libmilter was built by the sendmail package.
 #libs = ["milter", "smutil"]
 libs = ["milter"]
 libdirs = ["/usr/lib/libmilter"]    # needed for Debian
-modules = ["mime"]
+
 # patch distutils if it can't cope with the "classifiers" or
 # "download_url" keywords
 if sys.version < '2.2.3':
  from distutils.dist import DistributionMetadata
  DistributionMetadata.classifiers = None
  DistributionMetadata.download_url = None
 # NOTE: importing Milter to obtain version fails when milter.so not built
-setup(name = "pymilter", version = '1.0.4',
+setup(name = "pymilter", version = '0.9.2',
 	description="Python interface to sendmail milter API",
 	long_description="""\
 This is a python extension module to enable python scripts to
@@ -25,19 +28,17 @@ sending DSNs or doing CBVs.
 	author="Jim Niemira",
 	author_email="urmane@urmane.org",
 	maintainer="Stuart D. Gathman",
-	maintainer_email="stuart@gathman.org",
+	maintainer_email="stuart@bmsi.com",
 	license="GPL",
-	url="https://pythonhosted.org/milter/",
+	url="http://www.bmsi.com/python/milter.html",
-	py_modules=modules,
+	py_modules=["mime"],
 	packages = ['Milter'],
 	ext_modules=[
 	  Extension("milter", ["miltermodule.c"],
            library_dirs=libdirs,
 	    libraries=libs,
 	    # set MAX_ML_REPLY to 1 for sendmail < 8.13
-	    define_macros = [ ('MAX_ML_REPLY',32) ],
+	    define_macros = [ ('MAX_ML_REPLY',32) ]
            # save lots of debugging time testing rfc2553 compliance
            extra_compile_args = [ "-Werror=implicit-function-declaration" ]
 	  ),
 	],
 	keywords = ['sendmail','milter'],
@@ -0,0 +1,16 @@
 #!/bin/sh
 appname="$1"
 script="${2:-${appname}}"
 datadir="/var/log/milter"
 piddir="/var/run/milter"
 libdir="/usr/lib/pymilter"
 python="python2.4"
 exec >>${datadir}/${appname}.log 2>&1
 if test -s ${datadir}/${script}.py; then
  cd ${datadir} # use version in log dir if it exists for debugging
 else
  cd ${libdir}
 fi
 ${python} ${script}.py &
 echo $! >${piddir}/${appname}.pid
@@ -2,7 +2,6 @@ import unittest
 import testmime
 import testsample
 import testutils
 import testgrey
 import os
 def suite(): 
@@ -10,7 +9,6 @@ def suite():
  s.addTest(testmime.suite())
  s.addTest(testsample.suite())
  s.addTest(testutils.suite())
  s.addTest(testgrey.suite())
  return s
 if __name__ == '__main__':
@@ -0,0 +1,710 @@
 From stuart@bmsi.com  Wed May  1 14:37:14 2002
 Return-Path: <stuart@bmsi.com>
 Received: from bmsi.com (IDENT:stuart@localhost [127.0.0.1])
 	by gathman.bmsi.com (8.11.6/8.11.6) with ESMTP id g41IbCF01796
 	for <stuart@gathman.bmsi.com>; Wed, 1 May 2002 14:37:13 -0400
 Sender: stuart@gathman.bmsi.com
 Message-ID: <3CD035D7.18ADF27F@bmsi.com>
 Date: Wed, 01 May 2002 14:37:11 -0400
 From: "Stuart D. Gathman" <stuart@bmsi.com>
 Organization: Business Management Systems, Inc.
 X-Mailer: Mozilla 4.78 [en] (X11; U; Linux 2.4.9-21 i586)
 X-Accept-Language: en
 MIME-Version: 1.0
 To: stuart@gathman.bmsi.com
 Subject: Amazon.com--Earth's Biggest Selection
 Content-Type: multipart/mixed;
 boundary="------------59A46341C90BA737DD47867B"
 This is a multi-part message in MIME format.
 --------------59A46341C90BA737DD47867B
 Content-Type: multipart/alternative;
 boundary="------------0B098FB91956AC123C61B151"
 --------------0B098FB91956AC123C61B151
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 http://www.amazon.com/exec/obidos/subst/home/redirect.html/103-3111065-2579065
 --
              Stuart D. Gathman
 Business Management Systems Inc.  Phone: 703 591-0911 Fax: 703 591-6154
 "Confutatis maledictis, flamis acribus addictis" - background song for
 a Microsoft sponsored "Where do you want to go from here?" commercial.
 --------------0B098FB91956AC123C61B151
 Content-Type: text/html; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <A HREF="http://www.amazon.com/exec/obidos/subst/home/redirect.html/103-3111065-2579065">http://www.amazon.com/exec/obidos/subst/home/redirect.html/103-3111065-2579065</A>
 <pre>--&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Stuart D. Gathman&nbsp;<stuart@bmsi.com>
 Business Management Systems Inc.&nbsp; Phone: 703 591-0911 Fax: 703 591-6154
 "Confutatis maledictis, flamis acribus addictis" - background song for
 a Microsoft sponsored "Where do you want to go from here?" commercial.</pre>
 &nbsp;</html>
 --------------0B098FB91956AC123C61B151--
 --------------59A46341C90BA737DD47867B
 Content-Type: text/html; charset=us-ascii;
 name="103-3111065-2579065"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
 filename="103-3111065-2579065"
 Content-Base: "http://www.amazon.com/exec/obidos/subs
 	t/home/redirect.html/103-3111065-25
 	79065"
 Content-Location: "http://www.amazon.com/exec/obidos/subs
 	t/home/redirect.html/103-3111065-25
 	79065"
 <html>
 <head>
 <title>
 Amazon.com--Earth's Biggest Selection
 </title>
 <meta name="keywords" content="amazon.com,amazon books,amazon,amazon.com books,amazon music,amazon.com music,amazon video,amazon.com video,auctions,amazon auctions,amazon.com auctions,electronics,consumer electronics,gifts,amazon gifts,amazon.com gifts,cards,e-cards,e-mail cards,greeting cards,amazon cards,amazon.com cards,toys,amazon toys,amazon.com toys,games,amazon games,amazon.com games,toys & games,toys and games">
 <style type="text/css"><!-- .serif { font-family: times,serif; font-size: medium; }
 .sans { font-family: verdana,arial,helvetica,sans-serif; font-size: medium; }
 .small { font-family: verdana,arial,helvetica,sans-serif; font-size: small; }
 .h1 { font-family: verdana,arial,helvetica,sans-serif; color: #CC6600; font-size: medium; }
 .h3color { font-family: verdana,arial,helvetica,sans-serif; color: #CC6600; font-size: small; }
 .tiny { font-family: verdana,arial,helvetica,sans-serif; font-size: x-small; }
 .listprice { font-family: arial,verdana,helvetica,sans-serif; text-decoration: line-through; font-size: small; }
 .price { font-family: verdana,arial,helvetica,sans-serif; color: #990000; font-size: small; }
 --></style>
 </head>
 <body bgcolor="#FFFFFF" link="#003399" alink="#FF9933" vlink="#996633" text="#000000" onLoad="document.searchform.elements[1].focus()">
 <a name="top"></a>
 <map name="right_top_nav_map">
 <area shape="rect" href=/exec/obidos/shopping-basket/ref=top_nav_sb_gateway/103-3111065-2579065 coords="0,0,80,21">
 <area shape="rect" href=/exec/obidos/wishlist/ref=cm_wl_topnav_gateway/103-3111065-2579065 coords="85,0,151,21">
 <area shape="rect" href=/exec/obidos/account-access-login/ref=top_nav_ya_gateway/103-3111065-2579065 coords="155,0,256,21">
 <area shape="rect" href=/exec/obidos/tg/browse/-/508510/ref=top_nav_hp_gateway/103-3111065-2579065 coords="260,0,299,21">
 </map>
 <map name="gateway_nav_map">
 <area shape=rect coords="0,0,124,28" href=/exec/obidos/tg/stores/static/-/gateway/international-gateway/ref=gw_subnav_in/103-3111065-2579065>
 <area shape=rect coords="125,0,228,28" href=/exec/obidos/tg/new-for-you/top-sellers/-/main/ref=gw_subnav_ts/103-3111065-2579065>
 <area shape=rect coords="229,0,332,28" href=/exec/obidos/tg/browse/-/700060/ref=gw_subnav_target/103-3111065-2579065>
 <area shape=rect coords="333,0,450,28" href=/exec/obidos/tg/browse/-/909656/ref=stuffandsubnav_td1_/103-3111065-2579065>
 <area shape=rect coords="451,0,580,28" href=/exec/obidos/subst/misc/sell-your-stuff.html/ref=subnav_sys_/103-3111065-2579065>
 </map>
 <table border=0 width=100% cellspacing=0 cellpadding=0>
 <tr><td width=100%>
 <center>
 <table width=100% border=0 cellspacing=0 cellpadding=0 vspace=0>
 <tr>
 <td width=25% rowspan=2>&nbsp;</td>
 <td align=left valign=bottom><a href=/exec/obidos/subst/home/redirect.html/ref=nh_gateway/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/associates/navbar2000/logo-no-border(1).gif" width=148 height=43 alt="" border=0></a></td>
 <td width=10%>&nbsp;</td>
 <td align=right>
 <img src="http://g-images.amazon.com/images/G/01/nav/personalized/cartwish/right-topnav-default-2.gif" width=300 height=22 alt="" USEMAP=#right_top_nav_map border=0></td>
 <td align=right rowspan=2 width=25%>
 &nbsp;
 </td>
 </tr>
 <tr valign=bottom>
 <td colspan=3 align=center>
 <table align=center border=0 cellpadding=0 cellspacing=0><tr valign=bottom>
 <td><a href=/exec/obidos/subst/home/home.html/ref%3Dtab%5Fgw%5Fgw%5F1/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/welcome-on-whole.gif" width=60 height=26 border=0></a></td>
 <td><a href=/exec/obidos/tg/stores/your/store-home/-/0/ref%3Dtab%5Fgw%5Ffr%5F2/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/yourstore-off-sliced._ZCSTUART%27S,0,2,0,0,verdenab,7,90,90,80_.gif" width=81 height=26 border=0></a></td>
 <td><a href=/exec/obidos/tg/browse/-/283155/ref%3Dtab%5Fgw%5Fb%5F3/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/books-off-sliced.gif" width=39 height=26 border=0></a></td>
 <td><a href=/exec/obidos/tg/browse/-/172282/ref%3Dtab%5Fgw%5Fe%5F4/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/electronics-off-sliced.gif" width=74 height=26 border=0></a></td>
 <td><a href=/exec/obidos/tg/browse/-/130/ref%3Dtab%5Fgw%5Fd%5F5/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/dvd-off-sliced.gif" width=35 height=26 border=0></a></td>
 <td><a href=/exec/obidos/tg/browse/-/171280/ref%3Dtab%5Fgw%5Ft%5F6/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/toys-off-sliced.gif" width=47 height=26 border=0></a></td>
 <td><a href=/exec/obidos/tg/browse/-/468642/ref%3Dtab%5Fgw%5Fvg%5F7/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/videogames-off-sliced.gif" width=73 height=26 border=0></a></td>
 <td><a href=/exec/obidos/tg/browse/-/600460/ref%3Dtab%5Fgw%5F%5F8/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/corporate-off-sliced.gif" width=70 height=26 border=0></a></td>
 <td><a href=/exec/obidos/subst/home/all-stores.html/ref%3Dtab_gw_storesdirectory/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/nav/personalized/tabs/see-more-off-sliced.gif" width=70 height=26 border=0></a></td>
 </tr></table>
 </td>
 </tr>
 </table>
 </center>
 </td></tr>
 <tr align=center bgcolor=#006699>
 <td><img src="http://g-images.amazon.com/images/G/01/nav/amazon/gateway/blue/gateway-subnav-default.gif" width=580 height=28 width=580 height=28 alt="" USEMAP="#gateway_nav_map" border=0></td>
 </tr>
 <tr>
 <td bgcolor=#ffffdd align=center class=small>
 <font face=verdana,arial,helvetica size=-1>
 <font color="#CC6600"><B>Hello, Stuart D. Gathman.</B></font>
 We have <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/subst%2Frecs%2Finstant-recs-home.html%2Fref%3Dpd_ir_gw_r/ref=ilm_stripe_272005/103-3111065-2579065&message=272005,m1,26">recommendations</A> for you.
 </font><font face=verdana,arial,helvetica size=-2>
 (If you're not Stuart D. Gathman, <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/flex-sign-in%2Fref%3Dpd_ir_gw_r%2F%3Fopt%3Doa%26page%3Drecs%2Fsign-in-secure.html%26response%3Dtg%2Frecs%2Frecs-post-login-dispatch%2F-%2Frecs%2Fpd_rw_gw_r/ref=ilm_stripe_272005/103-3111065-2579065&message=272005,m1,26">click here</A>.)
 </font>
 </td>
 </tr>
 </table>
 <br>
 <table width=100% cellpadding=0 cellspacing=0 border=0>
 <tr valign=top>
 <td width=174>
 <TABLE border=0 cellspacing=0 cellpadding=0><TR valign=bottom align=center>
 <td><img src="http://g-images.amazon.com/images/G/01/v9/search-browse/search-gateway.gif" width=171 height=19 border=0 alt="Search Amazon.com"></td>
 </TR> <TR valign=top align=center><TD> <TABLE border=0 width= 171 cellpadding=1 cellspacing=0 bgcolor=#708090 ><TR> <TD width=100%><TABLE width=100% border=0 cellpadding=4 cellspacing=0 bgcolor=#708090><TR> <TD bgcolor=#FFCC66 valign=top width=100%>
 <form method="post" action="/exec/obidos/search-handle-form/103-3111065-2579065" name="searchform">
 <select name=index>
 <option value=blended selected>All Products
 <option value=books>Books
 <option value=music>Popular Music
 <option value=music-dd>Music Downloads
 <option value=classical>Classical Music
 <option value="dvd">DVD
 <option value="vhs">VHS
 <option value=theatrical>Movie Showtimes
 <option value=toys>Toys
 <option value=baby>Baby
 <option value=pc-hardware>Computers
 <option value=videogames>Video Games
 <option value=electronics>Electronics
 <option value=photo>Camera &amp; Photo
 <option value=software>Software
 <option value=tools>Tools &amp; Hardware
 <option value=magazines>Magazines
 <option value=garden>Outdoor Living
 <option value=kitchen>Kitchen
 <option value=travel>Travel
 <option value=wireless-phones>Cell Phones & Service
 <option value=outlet>Outlet
 <option value=auction-redirect>Auctions
 <option value=fixed-price-redirect>zShops
 </select>
 <input type="text" name="field-keywords" size="15">
 <input type="image" height="21" width="21" border=0 value="Go" name="Go" src="http://g-images.amazon.com/images/G/01/v9/search-browse/go-button-gateway.gif" align=absmiddle>
 </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </form>
 </TR> </TABLE> <br clear=left>
 <TABLE border=0 cellspacing=0 cellpadding=0>
 <TR valign=bottom align=center>
 <td><img src="http://g-images.amazon.com/images/G/01/v9/search-browse/browse-gateway.gif" width=171 height=19 border=0 alt="Browse Amazon.com"></td>
 </TR> <TR valign=top align=center>
 <TD> <TABLE border=0 width= 171 cellpadding=1 cellspacing=0 bgcolor=#708090 ><TR> <TD width=100%><TABLE width=100% border=0 cellpadding=4 cellspacing=0 bgcolor=#708090><TR> <TD bgcolor=#ffffff valign=top width=100%>
 <table cellpadding=3 cellspacing=0>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/283155/ref=gw_br_bo/103-3111065-2579065">Books</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/172282/ref=gw_br_el/103-3111065-2579065">Electronics</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/540744/ref=gw_br_ba/103-3111065-2579065">Baby &amp;</a><br>&nbsp; &nbsp;<a href="/exec/obidos/tg/browse/-/540744/ref=gw_br_ba/103-3111065-2579065">Baby Registry</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/5174/ref=gw_br_mu/103-3111065-2579065">Music</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/redirect-to-partner/ref=gw_br_dscm/103-3111065-2579065?name=dscm&aid=2&aparam=tb5270_bhp&trx=8056">Health & Beauty</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/130/ref=gw_br_dvd/103-3111065-2579065">DVD</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/229534/ref=gw_br_sw/103-3111065-2579065">Software</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/284507/ref=gw_br_ki/103-3111065-2579065">Kitchen &amp;</a><br>&nbsp; &nbsp;<a href="/exec/obidos/tg/browse/-/284507/ref=gw_br_ki/103-3111065-2579065">Housewares</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/228013/ref=gw_br_hi/103-3111065-2579065">Tools &amp;</a><br>&nbsp; &nbsp;<a href="/exec/obidos/tg/browse/-/228013/ref=gw_br_hi/103-3111065-2579065">Hardware</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/541966/ref=gw_br_pc/103-3111065-2579065">Computers</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/502394/ref=gw_br_p/103-3111065-2579065">Camera & Photo</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/562436/ref=gw_br_th/103-3111065-2579065">Movie Showtimes</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/468642/ref=gw_br_cvg/103-3111065-2579065">Computer &amp;</a><br>&nbsp; &nbsp;<a href="/exec/obidos/tg/browse/-/468642/ref=gw_br_cvg/103-3111065-2579065">Video Games</a></b></td>
 </tr> <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/171280/ref=gw_br_tg/103-3111065-2579065">Toys &amp; Games</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/301185/ref=gw_br_wi/103-3111065-2579065">Cell Phones</a><br>&nbsp;&nbsp;&nbsp;<a href="/exec/obidos/tg/browse/-/301185/ref=gw_br_wi/103-3111065-2579065">& Service</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/404272/ref=gw_br_vi/103-3111065-2579065">Video</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/599858/ref=gw_br_zi/103-3111065-2579065">Magazine</a><br>&nbsp; &nbsp;<a href="/exec/obidos/tg/browse/-/599858/ref=gw_br_zi/103-3111065-2579065">Subscriptions</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/286168/ref=gw_br_lp/103-3111065-2579065">Outdoor Living</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/605012/ref=gw_br_tr/103-3111065-2579065">Travel</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/acn-redirect-to-partner/ref=gw_br_cars/103-3111065-2579065?partner-name=carsdirect&partner-url=home%3Fpartner%3Damzn%26customerid%3Dbrowse">Cars</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/229220/ref=gw_br_gi/103-3111065-2579065">Gifts &amp;</a><br>&nbsp; &nbsp;<a href="/exec/obidos/tg/browse/-/229220/ref=gw_br_gi/103-3111065-2579065">Gift Certificates</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="http://s1.amazon.com/exec/varzea/subst/home/home.html/ref=gw_br_au/103-3111065-2579065">Auctions</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="http://s1.amazon.com/exec/varzea/subst/home/fixed.html/ref=gw_br_zs/103-3111065-2579065">zShops</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/517808/ref=gw_br_ou/103-3111065-2579065">Outlet</a></b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<b><a href="/exec/obidos/tg/browse/-/600460/ref=gw_br_cb/103-3111065-2579065">Corporate</a> <br>&nbsp; &nbsp;<a href="/exec/obidos/tg/browse/-/600460/ref=gw_br_cb/103-3111065-2579065">Accounts</a></b></td>
 </tr>
 <tr>
 <td class=small>
 <a href="/exec/obidos/flex-sign-in/ref=pd_fr_gw_fav_edt/103-3111065-2579065?page=personalization/favorites/favorites-sign-in-secure.html&response=favorites-edit/personalization/favorites/edit-areas.html&pass_through=product-group-id.gateway.hp&method=GET">
 <img src="http://g-images.amazon.com/images/G/01/buttons/edit-favorites.gif" width=69 height=15 border=0 valign=top vspace=2></a><br>
 </td>
 </tr>
 <tr>
 <td class=small><b>Browse Partners</b></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<a href="/exec/obidos/tg/browse/-/700060/ref=gw_tarb_/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/target/target-logo-sm.gif" width=71 height=17 border=0 alt=Target></a></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<a href="/exec/obidos/tg/browse/-/171280/ref=gw_trub_/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/toys/navigation/tru-logo.gif" width=117 height=14 border=0 alt=Toysrus.com></a></td>
 </tr>
 <tr>
 <td class=small>&#149;&nbsp;<a href="/exec/obidos/tg/browse/-/540744/ref=gw_brub_/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/toys/navigation/bru-logo.gif" width=136 height=15 border=0 alt=Babiesrus.com></a></td>
 </tr>
 </table>
 </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD>
 </TR>
 </TABLE> <br>
 <TABLE border=0 width=171 cellpadding=1 cellspacing=0 bgcolor=#708090 ><TR> <TD width=100%><TABLE width=100% border=0 cellpadding=4 cellspacing=0 bgcolor=#708090><TR> <TD bgcolor=#ffffff valign=top width=100%>
 <font face=verdana,arial,helvetica color=#000000 size=-1><b>Special Features</b></font><br>
 <font face=verdana,arial,helvetica size=-1>
 <ul><li> <A href="/exec/obidos/subst/alerts/signup.html/ref=gw_hp_ls_1_1/103-3111065-2579065">Alerts</A><li> <A href="/exec/obidos/subst/misc/anywhere/anywhere.html/ref=gw_hp_ls_1_2/103-3111065-2579065">Amazon.com
 Anywhere</A><li> <A href="/exec/obidos/subst/misc/amazon-credit/marketing-page.html/ref=gw_hp_ls_1_3/103-3111065-2579065">Amazon Credit Account</A><li> <A href="/exec/obidos/subst/delivers/delivers-signup-combo.html/ref=gw_hp_ls_1_4/103-3111065-2579065">Delivers</A><li><A href="/exec/obidos/tg/browse/-/225840/ref=gw_hp_ls_1_5/103-3111065-2579065">Free e-Cards</A><li><A href="/exec/obidos/subst/community/community-home.html/ref=gw_hp_ls_1_6/103-3111065-2579065">Friends &amp; Favorites</A><li> <A href="/exec/obidos/subst/gifts/gift-services/gift-certificates.html/ref=gw_hp_ls_1_7/103-3111065-2579065">Gift
 Certificates</A><li> <A href="http://auctions.amazon.com/exec/varzea/subst/fx/home.html/ref=gw_hp_ls_1_8/103-3111065-2579065">Honor
 System</A><li> <A href="/exec/obidos/subst/community/community.html/ref=gw_hp_ls_1_9/103-3111065-2579065">Purchase
 Circles</A><li>
 <A href="/exec/obidos/tg/browse/-/885446/ref=gw_hp_ls_1_10/103-3111065-2579065">Wedding
 Registry</A></ul>
 </font>
 </TD> </TR> </TABLE> </TD> </TR> </TABLE> <br>
 <TABLE border=0 width=171 cellpadding=1 cellspacing=0 bgcolor=#708090 ><TR> <TD width=100%><TABLE width=100% border=0 cellpadding=4 cellspacing=0 bgcolor=#708090><TR> <TD bgcolor=#ffffff valign=top width=100%>
 <font face=verdana,arial,helvetica color=#000000 size=-1><b>Associates</b></font><br>
 <font face=verdana,arial,helvetica size=-1>
 Sell books, music, videos, and more from your
 Web site. <A href="/exec/obidos/subst/associates/join/associates.html/ref=gw_hp_ls_2_1/103-3111065-2579065">Start earning
 today</A>!<BR>
 </font>
 </TD> </TR> </TABLE> </TD> </TR> </TABLE> <br>
 <p>
 <br clear=all>
 </td>
 <td>&nbsp;</td>
 <td>
 <center>
 </center>
 <br clear=all><p>
 <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/tg/browse/-/283155/ref=ilm_rc_285799/103-3111065-2579065&message=285799,m1,27">
 <center><img src="http://g-images.amazon.com/images/G/01/books/homepage-pricing/books-home-pricing-iii.gif" width=257 height=99 border=0></center>
 </A>
 <br clear=all><br>
 <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/tg/browse/-/753570/ref=ilm_rc_283024/103-3111065-2579065&message=283024,gw_lr_dvd_lor,28"><img src="http://g-images.amazon.com/images/G/01/icons/thumbnails/b00003cwt6_thumb.gif" width=41 height=60 border=0 valign=top align=left></A>
 Pre-order the Oscar&#174;-winning blockbuster <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/tg/browse/-/753570/ref=ilm_rc_283024/103-3111065-2579065&message=283024,gw_lr_dvd_lor,28"><I>The Lord of the Rings: The Fellowship of the Ring</I></A>, arriving on <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/ASIN/B00003CWT6/ref=ilm_rc_283024/103-3111065-2579065&message=283024,gw_lr_dvd_lor,28">DVD</A> and <A href="http://www.amazon.com/exec/obidos/ilm-redirect/103-3111065-2579065?append-uid=no&path=http://www.amazon.com/exec/obidos/ASIN/B000065U6Q/ref=ilm_rc_283024/103-3111065-2579065&message=283024,gw_lr_dvd_lor,28">video</A> August 6.
 <br clear=all><br>
 <b class=small><A href="/exec/obidos/tg/browse/-/229220/ref=gw_hp_cs_1_1/103-3111065-2579065">In Gifts</A></b><br>
 <A href="/exec/obidos/tg/browse/-/229220/ref=gw_hp_cs_2_1/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/marketing/mothers_day/md_sd_roto.jpg" width=100 height=95 border=0 align=left hspace=4></A>
 <b><font face=verdana,arial,helvetica color=#CC6600>Mother's Day Is May 12</font></b><br>
 We've made it fun and easy to buy the perfect
 present for Mom. Shop by <A href="/exec/obidos/tg/stores/recs/gift-wizard-refine/-/holiday/ref=gw_hp_cs_2_2/103-3111065-2579065">recipient</A>
 or <A href="/exec/obidos/tg/stores/recs/gift-wizard/-/price/ref=gw_hp_cs_2_3/103-3111065-2579065">price</A>,
 browse <A href="/exec/obidos/tg/stores/recs/gift-wizard/-/topsellers/ref=gw_hp_cs_2_4/103-3111065-2579065">top
 sellers</A>, or order <A href="http://www.amazon.com/exec/obidos/redirect-to-external-url/103-3111065-2579065?path=http%3A//www.proflowers.com/freechocolate/freechocolate.cfm%3FREF%3DFCHAmazonGatewayExp042702">flowers</A>.
 Visit <A href="/exec/obidos/tg/browse/-/229220/ref=gw_hp_cs_2_5/103-3111065-2579065">Gifts</A> for
 these and more great ideas for expressing your love and
 appreciation.<BR>
 &nbsp;<br clear=left>
 <br clear=all>
 <a href=/exec/obidos/instant-recs/recs/instant-recs-home.html/ref=pd_gw_qpt_h/103-3111065-2579065><b class=small>Your Recommendations</b></a>
 <br> <b class=h1>
 <i>War in Heaven</i>
 </b>
 </b><br>
 <a href=/exec/obidos/ASIN/0802812198/ref=pd_gw_qpt_1/103-3111065-2579065><img src="http://images.amazon.com/images/P/0802812198.01.__PE20_PIm.arrow,TopLeft,-2,-19_SCTZZZZZZZ_.jpg" width=76 height=116 vspace=3 hspace=7 align=left border=0></a>
 <b>Amazon.com</b><br>
 "The telephone was ringing wildly," begins Charles Williams's novel <I>War in Heaven</I>, "but without result, since there was no-one in the room but the corpse." From this abrupt--and darkly humorous--start, Williams takes us on a 20th-century version of the Grail quest, with an Archdeacon, a Duke, and an...
 <a href=/exec/obidos/ASIN/0802812198/ref=pd_gw_qpt_1/103-3111065-2579065>
 <font size=-1>Read more</font></a>
 <span class=tiny>
 &#124;
 &#040;<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/0802812198/gw/1/pc/3/none/ref=pd_gw_qpt_1/103-3111065-2579065>Why was I recommended this?</a>&#041;
 </span>
 <br clear=all>
 <br><b class=small>More Recommendations</b><br>
 <img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
 <a href=/exec/obidos/ASIN/0471070408/ref=pd_gw_qpt_2/103-3111065-2579065><i>Reliable Linux</i></a> by Iain Campbell
 <span class=tiny>
 &#040;<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/0471070408/gw/1/pc/3/none/ref=pd_gw_qpt_2/103-3111065-2579065>Why?</a>&#041;
 </span>
 <br>
 <img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
 <a href=/exec/obidos/ASIN/1565926102/ref=pd_gw_qpt_3/103-3111065-2579065><i>Programming PHP</i></a> by Rasmus Lerdorf, et al
 <span class=tiny>
 &#040;<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/1565926102/gw/1/pc/3/none/ref=pd_gw_qpt_3/103-3111065-2579065>Why?</a>&#041;
 </span>
 <br>
 <img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
 <a href=/exec/obidos/ASIN/0802812201/ref=pd_gw_qpt_4/103-3111065-2579065><i>Descent into Hell</i></a> by Charles W. Williams
 <span class=tiny>
 &#040;<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/0802812201/gw/1/pc/3/none/ref=pd_gw_qpt_4/103-3111065-2579065>Why?</a>&#041;
 </span>
 <br>
 <img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
 <a href=/exec/obidos/ASIN/059600186X/ref=pd_gw_qpt_5/103-3111065-2579065><i>Network Troubleshooting Tools (O'Reilly System Administration)</i></a> by Joseph D. Sloan
 <span class=tiny>
 &#040;<a href=/exec/obidos/tg/recs/ir-why/-/books/0/regular/none/059600186X/gw/1/pc/3/none/ref=pd_gw_qpt_5/103-3111065-2579065>Why?</a>&#041;
 </span>
 <br>
 <p>
 <font face=verdana,arial,helvetica size=-1><a href=/exec/obidos/tg/stores/your/favorites/-/music/ref=pd_fr_gw_nr_h/103-3111065-2579065><b>Your Music Store</b></a></font><br>
 <font face=verdana,arial,helvetica color=#CC6600><b>
 Isaac Freeman, et al&#44;
 <i>Beautiful Stars</i>
 </b></font>
 <br>
 <a href=/exec/obidos/ASIN/B000063TQV/ref=pd_fr_qw_nr_1/103-3111065-2579065><img src="http://images.amazon.com/images/P/B000063TQV.01.26TLZZZZ.jpg" width=73 height=71 vspace=3 hspace=7 align=left border=0></a>
 Great African American gospel music has an indisputable power, rooted in the audible faith of its performers and the beauty of their voices. As the bass singer of the <a href="/exec/obidos/tg/stores/artist/glance/-/73920/103-3111065-2579065">Fairfield Four</a>, an a cappella group that started more than a half century ago,...
 <a href=/exec/obidos/ASIN/B000063TQV/ref=pd_fr_qw_nr_1/103-3111065-2579065><font size=-1>Read more</font></a>
 <br>
 <br clear=left>
 <br>
 <table border=0 cellpadding=2 cellspacing=0><tr><td colspan=2>
 <p><b class="small">More Stores:</b>
 </td></tr>
 <tr valign=top><td width=1%><a href=/exec/obidos/tg/stores/your/favorites/-/electronics/ref=pd_fr_qw_nr_2/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-electronics-icon.gif" width=18 height=18 alt=Icon border=0 align=absmiddle></a></td><td><b class="small"><a href=/exec/obidos/tg/stores/your/favorites/-/electronics/ref=pd_fr_gw_nr_2_p/103-3111065-2579065>Your Electronics Store</a>:</b> <a href=/exec/obidos/ASIN/B000063574/ref=pd_fr_gw_nr_2/103-3111065-2579065>iRiver SlimX iMP-350 CD/MP3 Player with 8 minutes ASP and Upgradeable Firmware</a>
 by iRiver
 </td></tr>
 <tr valign=top><td width=1%><a href=/exec/obidos/tg/stores/your/favorites/-/video/ref=pd_fr_qw_nr_3/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-video-icon.gif" width=18 height=18 alt=Icon border=0 align=absmiddle></a></td><td><b class="small"><a href=/exec/obidos/tg/stores/your/favorites/-/video/ref=pd_fr_gw_nr_3_p/103-3111065-2579065>Your Video Store</a>:</b> <a href=/exec/obidos/ASIN/B000062XNA/ref=pd_fr_gw_nr_3/103-3111065-2579065><i>Ocean's Eleven</i></a>
 <b>VHS</b> ~ George Clooney
 </td></tr>
 </table>
 <p>
 <b><font face=verdana,arial,helvetica color=#CC6600>Listmania!</font></b><br>
 <font face=verdana,arial,helvetica size=-2>
 (<a href=/exec/obidos/tg/browse/-/542566/103-3111065-2579065>What is this?</a>)
 </font><br>
 <table width=100% border=0 cellpadding=5 cellspacing=0>
 <tr valign=top>
 <td width=50% class=small>
 <a href=/exec/obidos/tg/listmania/list-browse/-/2RKS17C9X4D3F/ref=pd_gw_lmq_1/103-3111065-2579065><img src="http://images.amazon.com/images/P/0072127732.01.__PIm.arrow,TopLeft,-2,-19_SCTZZZZZZZ_.jpg" width=76 height=109 border=0 vspace=4 hspace=5></a>
 <p>
 <font face=verdana,arial,helvetica size=-1>
 <a href=/exec/obidos/tg/listmania/list-browse/-/2RKS17C9X4D3F/ref=pd_gw_lmq_1/103-3111065-2579065><b>Best Linux Security books</b></a>:&nbsp;A list by <a href=/exec/obidos/tg/cm/member-fil/-/A3362WVVMJ3LE9/ref=pd_gw_lmq_n1/103-3111065-2579065>J. Parker</a>, Administrator, hacker.<br>
 (7 item list)</font>
 </td>
 <td width=50% class=small>
 <a href=/exec/obidos/tg/listmania/list-browse/-/2B0DIAPG2D3RT/ref=pd_gw_lmq_2/103-3111065-2579065><img src="http://images.amazon.com/images/P/0070419531.01.__PIm.arrow,TopLeft,-2,-19_SCTZZZZZZZ_.jpg" width=76 height=109 border=0 vspace=4 hspace=5></a>
 <p>
 <font face=verdana,arial,helvetica size=-1>
 <a href=/exec/obidos/tg/listmania/list-browse/-/2B0DIAPG2D3RT/ref=pd_gw_lmq_2/103-3111065-2579065><b>Networking</b></a>:&nbsp;A list by <a href=/exec/obidos/tg/cm/member-fil/-/AJINE650CAMUQ/ref=pd_gw_lmq_n2/103-3111065-2579065>gakis</a>, Engineer<br>
 (13 item list)</font>
 </td>
 </tr>
 <tr>
 <td colspan=2 class=small><ul>
 <li><a href=/exec/obidos/tg/listmania/list-browse/-/IEF1DNVKZO8B/ref=pd_gw_lmq_3/103-3111065-2579065>My Coder Library</a>:&nbsp;A list by <a href=/exec/obidos/tg/cm/member-fil/-/A3RK9LZQKL2YIN/ref=pd_gw_lmq_n3/103-3111065-2579065>John Washam</a><br> <li><a href=/exec/obidos/tg/listmania/list-browse/-/LE6A7H4L7VZK/ref=pd_gw_lmq_4/103-3111065-2579065>ALL THE FANTASY YOU'LL EVER NE</a>:&nbsp;A list by <a href=/exec/obidos/tg/cm/member-fil/-/A3628L43ZVEMP5/ref=pd_gw_lmq_n4/103-3111065-2579065>aramis</a><br> <li><a href=/exec/obidos/tg/listmania/list-browse/-/1MD5H6RUOIMIU/ref=pd_gw_lmq_5/103-3111065-2579065>Mythopoeic Fantasy</a>:&nbsp;A list by <a href=/exec/obidos/tg/cm/member-fil/-/A7CSNW9E46NR5/ref=pd_gw_lmq_n5/103-3111065-2579065>Vera Nazarian</a><br> </ul></td></tr></table>
 <p>
 <b class=small><A href="/exec/obidos/tg/browse/-/605012/ref=gw_hp_cb_1_1/103-3111065-2579065">In Travel</A></b><br>
 <A href="/exec/obidos/tg/browse/-/605012/ref=gw_hp_cb_2_1/103-3111065-2579065"><img src="http://g-images.amazon.com/images/G/01/travel/promotions/travel-gateway1.gif" width=100 height=95 border=0 align=left hspace=4></A>
 <b><font face=verdana,arial,helvetica color=#CC6600>Your Next Vacation Starts
 Here</font></b><br>
 Save up to 70% on hotels from Vegas to New York
 and everywhere in between on <A href="/exec/obidos/acn-redirect-to-partner/103-3111065-2579065?partner-name=expedia&partner-url=pubspec/scripts/eap.asp%3FEAPID%3D11420-1%26GOTO%3DDAILY%26Page%3D/deals/hoteldeals.asp%3Frfrr%3D-2980">Expedia.com</A>.
 Book a flight during Hotwire's <A href="/exec/obidos/acn-redirect-to-partner/103-3111065-2579065?partner-name=hotwire&partner-url=index.jsp%3Fsid%3D39151%26bid%3DB627">major-airline Spring Sale</A> through May 2 and fly the
 big-name airlines at no-name airline prices. <A href="/exec/obidos/acn-redirect-to-partner/103-3111065-2579065?partner-name=thevacationstore&partner-url=cruises/show_cruise.asp%3Fd%3D%26i%3D743065%26c%3D24%26v%3D110">The
 Vacation Store</A> is offering seven-day Holland America
 Caribbean cruises from just $599. <BR>
 &nbsp;<br clear=left>
 <td width=174>
 <table width=100% cellpadding=3 cellspacing=0 border=0>
 <tr>
 <td>
 <a href=/exec/obidos/subst/xs/hotpicks.html/ref=xs_ie_13_gw/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/marketing/cross-shop/web-labs/lp_gate_roto_t._ZCStuart%5c,,3,5,300,300,verdenab,14,204,0,0_SCLZZZZZZZ_.gif" width=174 height=34 border=0></a><br>
 <a href=/exec/obidos/subst/xs/hotpicks.html/ref=xs_ie_13_gw/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/marketing/cross-shop/web-labs/lp_gate_roto_m.gif" width=174 height=200 border=0></a><br>
 <a href=/exec/obidos/subst/xs/hotpicks.html/ref=xs_ie_13_gw/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/marketing/cross-shop/web-labs/lp_gate_roto_b.gif" width=174 height=231 border=0></a><br>
 <a href=/exec/obidos/tg/new-for-you/new-for-you/-/main/ref=pd_nfy_gw_n/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/banners/n4u/n4u-header-recognized-01.gif" width=174 height=41 hspace=0 vspace=0 align=right border=0 alt="New For You"></a><br clear=all>
 <table border=0 bgcolor=#708090 cellpadding=1 cellspacing=0 width=174 align=right valign=top vspace=0 hspace=0><tr><td>
 <table border=0 cellpadding=3 cellspacing=0 width=100% bgcolor=#ffffff>
 <tr><td bgcolor=#ffffff align=middle>
 <span class=small><font color=#CC6600><b>Stuart,</b></font> check out what's<b> <a href=/exec/obidos/tg/new-for-you/new-for-you/-/main/ref=pd_nfy_gw_n/103-3111065-2579065>New for You</a></b>:<br></span>
 </td></tr>
 <tr><td bgcolor=#ffffff align=middle>
 <span class=tiny>(If you're not Stuart D. Gathman, <a href=/exec/obidos/flex-sign-in/ref=pd_nfy_gw_n/103-3111065-2579065?opt=o&page=misc/login/flex-sign-in-secure.html&response=tg/new-for-you/new-for-you/-/main>click here</a>.)</span>
 <br><br>
 </td></tr>
 <tr bgcolor=#eeeecc><td>
 <a href=/exec/obidos/tg/new-for-you/inbox/inbox/-/main/ref=pd_nfy_gw_ibx/103-3111065-2579065><b class=small>Your Message Center</b></a>
 </td></tr>
 <tr bgcolor=#ffffee><td>
 <table><tr bgcolor=#ffffee>
 <td valign=top><a href=/exec/obidos/tg/new-for-you/inbox/inbox/-/main/ref=pd_nfy_gw_ibx/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/exclamation-clear.gif" width=20 height=20 border=0 alt=!></a></td>
 <td class=small> You have <a href=/exec/obidos/tg/new-for-you/inbox/inbox/-/main/ref=pd_nfy_gw_ibx/103-3111065-2579065>5 new messages</a>.
 <br><br>
 </td>
 </tr></table>
 </td></tr>
 <tr bgcolor=#eeeecc><td>
 <font face=verdana,arial,helvetica size=-1><a href=/exec/obidos/shopping-basket/ref=pd_nfy_gw_sc/103-3111065-2579065><b>Your Shopping Cart</b></a></font>
 </td></tr>
 <tr><td>
 <table><tr>
 <td valign=top><a href=/exec/obidos/shopping-basket/ref=pd_nfy_gw_sc/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/shopping-cart-small.gif" width=25 height=25 border=0 alt="Shopping Cart" align=left></a></td>
 <td valign=top><font face=verdana,arial,helvetica size=-1>You have 0 items in <a href=/exec/obidos/shopping-basket/ref=pd_nfy_gw_sc/103-3111065-2579065>your Shopping Cart</a>.</font><br><br></td>
 </tr></table>
 </td></tr></table>
 <table border=0 cellpadding=3 cellspacing=0 width=100% bgcolor=#ffffff vspace=0>
 <tr bgcolor=#eeeecc><td class=small>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/main/ref=pd_nfy_gw_n/103-3111065-2579065><b>Your New Releases</b></a>
 </td></tr></table>
 <table border=0 cellpadding=3 cellspacing=0 width=100% bgcolor=#ffffff vspace=0>
 <tr valign=top><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/music/37/ref=pd_nfy_gw_n1/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-music-icon.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/music/37/ref=pd_nfy_gw_n1/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Pop</font></a>
 </td></tr>
 <tr valign=top><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/music/173429/ref=pd_nfy_gw_n2/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-music-icon.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/music/173429/ref=pd_nfy_gw_n2/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Christian & Gospel</font></a>
 </td></tr>
 <tr valign=top><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/books/5/ref=pd_nfy_gw_n3/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/books/5/ref=pd_nfy_gw_n3/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Computers & Internet</font></a>
 </td></tr>
 <tr valign=top><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/kitchen/289814/ref=pd_nfy_gw_n4/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/icon-kitchen-blue.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/kitchen/289814/ref=pd_nfy_gw_n4/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Cookware</font></a>
 </td></tr>
 <tr valign=top><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/video/141/ref=pd_nfy_gw_n5/103-3111065-2579065><img src="http://g-images.amazon.com/images/G/01/icons/small-blue-vhs-icon.gif" width=18 height=18 border=0 alt=Icon ></a></td><td>
 <a href=/exec/obidos/tg/new-for-you/new-releases/-/video/141/ref=pd_nfy_gw_n5/103-3111065-2579065><font face=verdana,arial,helvetica size=-1>Action & Adventure</font></a>
 </td></tr>
 </td></tr>
 <tr><td colspan=2 align=left> <img src="http://g-images.amazon.com/images/G/01/icons/orange-arrow.gif" width=10 height=9 border=0> <a href=/exec/obidos/tg/new-for-you/new-releases/-/main/ref=pd_nfy_gw_n/103-3111065-2579065><font face=verdana,arial,helvetica size=-1><b>More New Releases</b></font></a><p>
 </td></tr></table>
 <table border=0 cellpadding=3 cellspacing=0 width=100% bgcolor=#ffffff>
 <tr bgcolor=#eeeecc><td class=small>
 <a href=/exec/obidos/tg/new-for-you/movers-and-shakers/-/books/ref=pd_gw_msgr/103-3111065-2579065><b>Movers &amp; Shakers</b></a>
 </td></tr></table>
 <table border=0 cellpadding=2 cellspacing=0 width=100% bgcolor=#ffffff vspace=0>
 <tr><td valign=top align=center>
 <img src="http://g-images.amazon.com/images/G/01/icons/uparrow_green2.gif" width=13 height=11 alt="Up">
 </td>
 <td valign=top>
 <font color=#339900 face=verdana,arial,helvetica size=-1><b>974%</b></font> </td></tr>
 <tr><td valign=top align=left>
 <img src="http://g-images.amazon.com/images/G/01/icons/small-blue-dvd-icon.gif" width=18 height=18 border=0 alt=Icon >
 </td>
 <td valign=top>
 <font face=verdana,arial,helvetica size=-1><a href=/exec/obidos/tg/new-for-you/movers-and-shakers/-/dvd/ref=pd_gw_msd2/103-3111065-2579065>Dorothy L. Sayers Mysteries (Strong Poison / Have His Carcass / Gaudy Night)</a>
 <font face=verdana,arial,helvetica size=-1>
 <b>DVD</b>
 <br>~ Dorothy L. Sayers
 </font>
 </font>
 </td></tr>
 <tr><td valign=top align=center>
 <img src="http://g-images.amazon.com/images/G/01/icons/uparrow_green2.gif" width=13 height=11 alt="Up">
 </td>
 <td valign=top>
 <font color=#339900 face=verdana,arial,helvetica size=-1><b>2,415%</b></font> </td></tr>
 <tr><td valign=top align=left>
 <img src="http://g-images.amazon.com/images/G/01/icons/small-blue-books-icon.gif" width=18 height=18 border=0 alt=Icon >
 </td>
 <td valign=top>
 <font face=verdana,arial,helvetica size=-1><a href=/exec/obidos/tg/new-for-you/movers-and-shakers/-/books/ref=pd_gw_msb2/103-3111065-2579065>Artemis Fowl</a>
 <br><font face=verdana,arial,helvetica size=-1>by Eoin Colfer</font>
 </font>
 </td></tr>
 <tr><td colspan=2>
 <img src="http://g-images.amazon.com/images/G/01/icons/orange-arrow.gif" width=10 height=9 border=0> <font face=verdana,arial,helvetica size=-1><b><a href=/exec/obidos/tg/new-for-you/movers-and-shakers/-/books/ref=pd_gw_msgr/103-3111065-2579065>More Movers & Shakers</a></b>
 <br>
 </td></tr></table>
 </td></tr></table>
 </td></tr></table>
 </td></tr></table>
 <br clear="all">
 <center>
 <form method="post" action="/exec/obidos/search-handle-form/103-3111065-2579065">
 <table border=0 width=100% cellpadding=1 cellspacing=0 bgcolor=#999999>
 <tr><td>
 <table border=0 width=100% bgcolor=#ffffff cellspacing=0 cellpadding=5 class="small">
 <tr valign=top><td width=33% class="small">
 <b>Where's My Stuff?</b><br>
 &#149; Track your <a href="/exec/obidos/flex-sign-in/ref=hy_f_1/103-3111065-2579065?opt=ab&page=help/ya-sign-in-secure.html&response=order-history-filtered&method=POST&ss-order-filter=wheres-my-stuff&return-url=order-history-filtered">recent orders</a>.<br>
 &#149; View or change your orders in <a href="/exec/obidos/account-access-login/ref=hy_f_2/103-3111065-2579065">Your Account</a>.
 <script language="JavaScript1.1" type="text/javascript">
 <!--
 var agt=navigator.userAgent.toLowerCase();
 var is_major = parseInt(navigator.appVersion);
 var is_nav = ((agt.indexOf('mozilla')!=-1) && (agt.indexOf('spoofer')==-1)
 && (agt.indexOf('compatible') == -1) && (agt.indexOf('opera')==-1)
 && (agt.indexOf('webtv')==-1) && (agt.indexOf('hotjava')==-1));
 var is_gecko = (agt.indexOf('gecko') != -1);
 var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
 var is_aol = (agt.indexOf("aol") != -1);
 var is_opera = (agt.indexOf("opera") != -1);
 var is_win = ( (agt.indexOf("win")!=-1) || (agt.indexOf("16bit")!=-1) );
 //-->
 </script>
 <script language="JavaScript1.1" type="text/javascript">
 <!--
 var OpenedWin;
 function openWin (URL, width, height) {
 OpenedWin = window.open(URL, "demo_window", "width="+width+",height="+height+",status=no,menubar=no,location=no,toolbar=no,directories=no,scrollbars=no");
 if (! is_aol) {
 var NewX = (screen.availWidth/2)-(width/2);
 var NewY = (screen.availHeight/2)-(height/2);
 OpenedWin.moveTo(NewX, NewY);
 NewX = null;
 NewY = null;
 }
 }
 function launch (URL, width, height) {
 if (!URL || !width || !height) {
 alert("Error");
 } else if (width>screen.availWidth || height>screen.availHeight) {
 var message;
 message = "Your screen resolution is too low to display the demo.\nClick 'OK' if you wish to continue anyway.\n";
 message += '\n Your screen resolution: '+screen.width+' x '+screen.height;
 message += ' | Viewable: '+screen.availWidth+' x '+screen.availHeight;
 message += '\n Required: '+width+' x '+height;
 if (confirm(message)) {
 message = "If you can not find the close buttons, use your keyboard:\n";
 message += 'Windows: ALT+F4\n';
 message += 'Macintosh: CONTROL+W';
 alert(message);
 openWin(URL, width, height);
 }
 } else {
 openWin(URL, width, height);
 }
 }
 function displayLink(text){
 if ( is_major >= 4 && is_win && ( is_nav || is_ie || is_opera || is_gecko ) ) {
 document.write(text);
 };
 }
 //-->
 </script>
 <script language="JavaScript1.1" type="text/javascript">
 <!--
 displayLink('<br>&#149; See our <b><a href=javascript:launch(\'/exec/obidos/subst/help/demo-wms/display-demo.html/ref=hy_f_demo/103-3111065-2579065\',788,444)>animated demo</a></b>!');
 //-->
 </script>
 </td>
 <td width=33% class="small">
 <b>Shipping &amp; Returns</b><br>
 &#149; See our <a href="/exec/obidos/tg/browse/-/468520/ref=hy_f_3/103-3111065-2579065">shipping rates &amp; policies</a>.<br>
 &#149; <a href="/exec/obidos/subst/help/self-service-returns.html/ref=hy_f_4/103-3111065-2579065">Return</a> an item (here's our <a href="/exec/obidos/tg/browse/-/468532/103-3111065-2579065">Returns Policy</a>).
 </td>
 <td width=33% class="small">
 <b>Need Help?</b><br>
 &#149; Forgot your password? <a href="/exec/obidos/self-service-forgot-password-get-email/ref=hy_f_6/103-3111065-2579065">Click here</a>.
 <br>
 &#149; <a href="/exec/obidos/subst/gifts/gift-certificates/gc-redeeming.html/ref=hy_f_7/103-3111065-2579065">Redeem</a> or <a href="/exec/obidos/subst/gifts/gift-services/gift-certificates.html/ref=hy_f_8/103-3111065-2579065">buy</a> a gift certificate.<br>
 &#149; <a href="/exec/obidos/tg/browse/-/508510/ref=hy_f_9/103-3111065-2579065">Visit our Help department</a>. <br>
 </td></tr>
 </table>
 </td></tr>
 <tr><td>
 <table border=0 width=100% bgcolor=#FFCC66 cellspacing=0 cellpadding=5>
 <tr><td align=center class="small">
 <b>Search&nbsp;</b>
 <select name=index>
 <option value=blended selected>All Products
 <option value=books>Books
 <option value=music>Popular Music
 <option value=music-dd>Music Downloads
 <option value=classical>Classical Music
 <option value="dvd">DVD
 <option value="vhs">VHS
 <option value=theatrical>Movie Showtimes
 <option value=toys>Toys
 <option value=baby>Baby
 <option value=pc-hardware>Computers
 <option value=videogames>Video Games
 <option value=electronics>Electronics
 <option value=photo>Camera &amp; Photo
 <option value=software>Software
 <option value=tools>Tools &amp; Hardware
 <option value=magazines>Magazines
 <option value=garden>Outdoor Living
 <option value=kitchen>Kitchen
 <option value=travel>Travel
 <option value=wireless-phones>Cell Phones & Service
 <option value=outlet>Outlet
 <option value=auction-redirect>Auctions
 <option value=fixed-price-redirect>zShops
 </select>
 <b>&nbsp;&nbsp;for&nbsp;&nbsp;</b>
 <input type="text" name="field-keywords" size="15">&nbsp;&nbsp;
 <input type=image name="Go" value="Go!" border=0 alt="Go!" src=http://g-images.amazon.com/images/G/01/v9/search-browse/go-button-gateway.gif width=21 height=21 border=0 align=absmiddle > </td></tr></table>
 </td></tr>
 </table>
 </form>
 <p align=center>
 <b class=h1>Stuart D. Gathman, make </b><font color=#990000><b class=sans>$</b><b class=sans>310.61</b></font><br />
 <b class=sans>Sell <a href="/exec/obidos/flex-sign-in/ref=sdp_bbump_gw/103-3111065-2579065?opt=an&page=misc/login/flex-sign-in-secure.html&response=tg/stores/static/-/used/sell-your-collection/1/">your past purchases</a> at Amazon.com today!</b>
 </p>
 <table width="100%">
 <tr>
 <td width="50%" valign="top" align="left">
 <span class="small"><a href=/exec/obidos/change-style/subst/home/redirect.html/103-3111065-2579065>Text Only</a></span>
 </td>
 <td width="50%" valign="top" align="right" class="small">
 <a href="#top">Top of Page</a>
 </td>
 </tr>
 </table>
 <center>
 <p>
 <a href=/exec/obidos/subst/home/all-stores.html/ref=gw_bt_st/103-3111065-2579065>Directory of All Stores</a><p>
 Our International Sites:
 <a href="/exec/obidos/redirect-to-external-url/ref=gw_bt_uk/103-3111065-2579065?path=http%3A//www.amazon.co.uk/exec/obidos/redirect-home%3Ftag%3Dintl-usgt-ukhome-21%26site%3Damazon">United Kingdom</a>
 &nbsp;&nbsp;|&nbsp;&nbsp;
 <a href="/exec/obidos/redirect-to-external-url/ref=gw_bt_de/103-3111065-2579065?path=http%3A//www.amazon.de/exec/obidos/redirect-home%3Ftag%3Dintl-usgt-dehome-21%26site%3Dhome">Germany</a>
 &nbsp;&nbsp;|&nbsp;&nbsp;
 <a href="/exec/obidos/redirect-to-external-url/ref=gw_bt_jp/103-3111065-2579065?path=http%3A//www.amazon.co.jp/exec/obidos/redirect-home%3Ftag%3Dintl-usgatew-jphome-22%26site%3Damazon">Japan</a>
 &nbsp;&nbsp|&nbsp;&nbsp;
 <a href="/exec/obidos/redirect-to-external-url/ref=gw_bt_fr/103-3111065-2579065?path=http%3A//www.amazon.fr/exec/obidos/redirect-home%3Fsite%3Damazon%26tag%3Dusfr-gatew-footer-21">France</a>
 <p>
 <a href=/exec/obidos/tg/browse/-/508510/ref=gw_bt_he/103-3111065-2579065>Help</a>&nbsp;&nbsp;|&nbsp;&nbsp;
 <a href=/exec/obidos/shopping-basket/ref=gw_bt_sc/103-3111065-2579065>Shopping Cart</a>&nbsp;&nbsp;|&nbsp;&nbsp;
 <a href=/exec/obidos/account-access-login/ref=gw_bt_ya/103-3111065-2579065>Your Account</a>&nbsp;&nbsp;|&nbsp;&nbsp;
 <a href="http://s1.amazon.com/exec/varzea/ts/announcement-list-zshops/slp/ref=gw_bt_si/103-3111065-2579065">Sell Items</a>&nbsp;&nbsp;|&nbsp;&nbsp;
 <a href="/exec/obidos/flex-sign-in/ref=gw_bt_oc/103-3111065-2579065?opt=a&page=ordering/one-click-address-sign-in-secure.html&response=one-click-main&method=GET&return-url=one-click-main">1-Click Settings</a>
 <p>
 <a href=/exec/obidos/subst/misc/company-info.html/ref=gw_bt_aa/103-3111065-2579065>About Amazon.com</a>&nbsp;&nbsp;|&nbsp;&nbsp;
 <a href=/exec/obidos/tg/stores/job-listings/-/generic/home/103-3111065-2579065>Join Our Staff</a>&nbsp;&nbsp;|&nbsp;&nbsp;
 <a href="/exec/obidos/subst/associates/join/associates.html/ref=gw_bt_as/103-3111065-2579065">Join Associates</a>&nbsp;&nbsp;|&nbsp;&nbsp;
 <a href=/exec/obidos/subst/partners/direct/direct-application.html/ref=gw_bt_ad/103-3111065-2579065>Join Advantage</a>&nbsp;&nbsp;|&nbsp;&nbsp;
 <a href="http://s1.amazon.com/exec/varzea/subst/fx/home.html/ref=gw_bt_hs/103-3111065-2579065">Join Honor System</a>
 </center>
 <center>
 <p>
 <div class="tiny" align=center>
 <A HREF="/exec/obidos/subst/misc/policy/conditions-of-use.html/103-3111065-2579065">Conditions of Use</A> | <A HREF="/exec/obidos/tg/browse/-/468496/103-3111065-2579065">Privacy Notice</A> &copy; 1996-2002, Amazon.com, Inc. or its affiliates
 </div>
 </center>
 <!-- whfhYn47qD1fv3PW2R8XWAkFcMwteHFKxorD -->
 </body>
 </html>
 --------------59A46341C90BA737DD47867B--
@@ -1,56 +0,0 @@
 import unittest
 import doctest
 import os
 #from Milter.greylist import Greylist
 from Milter.greysql import Greylist
 class GreylistTestCase(unittest.TestCase):
  def setUp(self):
    self.fname = 'test.db'
    if os.path.isfile(self.fname):
      os.remove(self.fname)
  def tearDown(self):
    #os.remove(self.fname)
    pass
  def testGrey(self):
    grey = Greylist(self.fname)
    # first time
    rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com')
    self.assertEqual(rc,0)
    # not in window yet
    rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com',timeinc=5*60)
    self.assertEqual(rc,0)
    # within window
    rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com',timeinc=15*60)
    self.assertEqual(rc,1)
    # new triple
    rc = grey.check('1.2.3.5','foo@bar.com','baz@spat.com',timeinc=15*60)
    self.assertEqual(rc,0)
    # seen again
    rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com',timeinc=5*3600)
    self.assertEqual(rc,2)
    # new one past expire
    rc = grey.check('1.2.3.5','foo@bar.com','baz@spat.com',timeinc=6*3600)
    self.assertEqual(rc,0)
    # original past retain 
    rc = grey.check('1.2.3.4','foo@bar.com','baz@spat.com',timeinc=37*24*3600)
    self.assertEqual(rc,0)
    # new one for testing expire
    rc = grey.check('1.2.3.5','flub@bar.com','baz@spat.com',timeinc=20*24*3600)
    self.assertEqual(rc,0)
    grey.close()
    # test cleanup
    grey = Greylist(self.fname)
    rc = grey.clean(timeinc=37*24*3600)
    self.assertEqual(rc,1)
    grey.close()
 def suite(): 
  s = unittest.makeSuite(GreylistTestCase,'test')
  return s
 if __name__ == '__main__':
  unittest.TextTestRunner().run(suite())
@@ -1,10 +1,4 @@
 # $Log$
 # Revision 1.5  2011/06/09 17:27:42  customdesigned
 # Documentation updates.
 #
 # Revision 1.4  2005/07/20 14:49:44  customdesigned
 # Handle corrupt and empty ZIP files.
 #
 # Revision 1.3  2005/06/17 01:49:39  customdesigned
 # Handle zip within zip.
 #
@@ -26,21 +20,13 @@
 # Revision 1.20  2004/11/20 16:38:17  stuart
 # Add rcs log
 #
 from __future__ import print_function
 import unittest
 import mime
 import socket
-try:
+import StringIO
  from StringIO import StringIO
 except:
  from io import StringIO
 import email
 import sys
-import Milter
+from email import Errors
 try:
  from email import Errors as errors
 except:
  from email import errors
 samp1_txt1 = """Dear Agent 1
 I hope you can read this.  Whenever you write label it  P.B.S kids.
@@ -53,56 +39,48 @@ class MimeTestCase(unittest.TestCase):
  # test mime parameter parsing
  def testParam(self):
-    plist = mime._parseparam('; boundary="----=_NextPart_000_4e56_490d_48e3"')
+    plist = mime._parseparam(
-    plist = [ x for x in plist if x ] # py2 doesn't include empty params
+      '; boundary="----=_NextPart_000_4e56_490d_48e3"')
-    self.assertEqual(1,len(plist))
+    self.failUnless(len(plist)==1)
-    self.assertTrue(plist[0] == 'boundary="----=_NextPart_000_4e56_490d_48e3"')
+    self.failUnless(plist[0] == 'boundary="----=_NextPart_000_4e56_490d_48e3"')
    plist = mime._parseparam('; name="Jim&amp;amp;Girlz.jpg"')
-    plist = [ x for x in plist if x ] # py2 doesn't include empty params
+    self.failUnless(len(plist)==1)
-    self.assertEqual(1,len(plist))
+    self.failUnless(plist[0] == 'name="Jim&amp;amp;Girlz.jpg"')
    self.assertTrue(plist[0] == 'name="Jim&amp;amp;Girlz.jpg"')
  def testParse(self,fname='samp1'):
-    with open('test/'+fname,"rb") as fp:
+    msg = mime.message_from_file(open('test/'+fname,"r"))
-      msg = mime.message_from_file(fp)
+    self.failUnless(msg.ismultipart())
    self.assertTrue(msg.ismultipart())
    parts = msg.get_payload()
-    self.assertTrue(len(parts) == 2)
+    self.failUnless(len(parts) == 2)
    txt1 = parts[0].get_payload()
-    self.assertTrue(txt1.rstrip() == samp1_txt1,txt1)
+    self.failUnless(txt1.rstrip() == samp1_txt1,txt1)
-    with open('test/missingboundary',"rb") as fp:
+    msg = mime.message_from_file(open('test/missingboundary',"r"))
      msg = mime.message_from_file(fp)
    # should get no exception as long as we don't try to parse
    # message attachments
    mime.defang(msg,scan_rfc822=False)
-    with open('test/missingboundary.out','wb') as fp:
+    msg.dump(open('test/missingboundary.out','w'))
-      msg.dump(fp)
+    msg = mime.message_from_file(open('test/missingboundary',"r"))
    with open('test/missingboundary',"rb") as fp:
      msg = mime.message_from_file(fp)
    try:
      mime.defang(msg)
      # python 2.4 doesn't get exceptions on missing boundaries, and
      # if message is modified, output is readable by mail clients
      if sys.hexversion < 0x02040000:
 	self.fail('should get boundary error parsing bad rfc822 attachment')
-    except errors.BoundaryError:
+    except Errors.BoundaryError:
      pass
  def testDefang(self,vname='virus1',part=1,
  	fname='LOVE-LETTER-FOR-YOU.TXT.vbs'):
-    with open('test/'+vname,"rb") as fp:
+    msg = mime.message_from_file(open('test/'+vname,"r"))
      msg = mime.message_from_file(fp)
    mime.defang(msg,scan_zip=True)
-    self.assertTrue(msg.ismodified(),"virus not removed")
+    self.failUnless(msg.ismodified(),"virus not removed")
    oname = vname + '.out'
-    with open('test/'+oname,"wb") as fp:
+    msg.dump(open('test/'+oname,"w"))
-      msg.dump(fp)
+    msg = mime.message_from_file(open('test/'+oname,"r"))
    with open('test/'+oname,"rb") as fp:
      msg = mime.message_from_file(fp)
    txt2 = msg.get_payload()
    if type(txt2) == list:
      txt2 = txt2[part].get_payload()
-    self.assertTrue(
+    self.failUnless(
      txt2.rstrip()+'\n' == mime.virus_msg % (fname,hostname,None),txt2)
  def testDefang3(self):
@@ -118,94 +96,58 @@ class MimeTestCase(unittest.TestCase):
  # virus6 has no parts - the virus is directly inline
  def testDefang6(self,vname="virus6",fname='FAX20.exe'):
-    with open('test/'+vname,"rb") as fp:
+    msg = mime.message_from_file(open('test/'+vname,"r"))
      msg = mime.message_from_file(fp)
    mime.defang(msg)
    oname = vname + '.out'
-    with open('test/'+oname,"wb") as fp:
+    msg.dump(open('test/'+oname,"w"))
-      msg.dump(fp)
+    msg = mime.message_from_file(open('test/'+oname,"r"))
-    with open('test/'+oname,"rb") as fp:
+    self.failIf(msg.ismultipart())
      msg = mime.message_from_file(fp)
    self.assertFalse(msg.ismultipart())
    txt2 = msg.get_payload()
-    self.assertTrue(txt2 == mime.virus_msg % \
+    self.failUnless(txt2 == mime.virus_msg % \
    	(fname,hostname,None),txt2)
  # honey virus has a sneaky ASP payload which is parsed correctly
  # by email package in python-2.2.2, but not by mime.MimeMessage or 2.2.1
  def testDefang7(self,vname="honey",fname='story[1].scr'):
-    with open('test/'+vname,"rb") as fp:
+    msg = mime.message_from_file(open('test/'+vname,"r"))
      msg = mime.message_from_file(fp)
    mime.defang(msg)
    oname = vname + '.out'
-    with open('test/'+oname,"wb") as fp:
+    msg.dump(open('test/'+oname,"w"))
-      msg.dump(fp)
+    msg = mime.message_from_file(open('test/'+oname,"r"))
    with open('test/'+oname,"rb") as fp:
      msg = mime.message_from_file(fp)
    parts = msg.get_payload()
    txt2 = parts[1].get_payload()
    txt3 = parts[2].get_payload()
-    self.assertTrue(txt2.rstrip()+'\n' == mime.virus_msg % \
+    self.failUnless(txt2.rstrip()+'\n' == mime.virus_msg % \
    	(fname,hostname,None),txt2)
    if txt3 != '':
-      self.assertTrue(txt3.rstrip()+'\n' == mime.virus_msg % \
+      self.failUnless(txt3.rstrip()+'\n' == mime.virus_msg % \
 	  ('story[1].asp',hostname,None),txt3)
  def testParse2(self,fname="spam7"):
-    with open('test/'+fname,"rb") as fp:
+    msg = mime.message_from_file(open('test/'+fname,"r"))
-      msg = mime.message_from_file(fp)
+    self.failUnless(msg.ismultipart())
    self.assertTrue(msg.ismultipart())
    parts = msg.get_payload()
-    self.assertTrue(len(parts) == 2)
+    self.failUnless(len(parts) == 2)
    name = parts[1].getname()
-    self.assertTrue(name == "Jim&amp;amp;Girlz.jpg","name=%s"%name)
+    self.failUnless(name == "Jim&amp;amp;Girlz.jpg","name=%s"%name)
  def testZip(self,vname="zip1",fname='zip.zip'):
    self.testDefang(vname,1,'zip.zip')
    # test scan_zip flag
-    with open('test/'+vname,"rb") as fp:
+    msg = mime.message_from_file(open('test/'+vname,"r"))
      msg = mime.message_from_file(fp)
    mime.defang(msg,scan_zip=False)
-    self.assertFalse(msg.ismodified())
+    self.failIf(msg.ismodified())
    # test ignoring empty zip (often found in DSNs)
-    with open('test/zip2','rb') as fp:
+    msg = mime.message_from_file(open('test/zip2','r'))
      msg = mime.message_from_file(fp)
    mime.defang(msg,scan_zip=True)
-    self.assertFalse(msg.ismodified())
+    self.failIf(msg.ismodified())
    # test corrupt zip (often an EXE named as a ZIP)
    self.testDefang('zip3',1,'zip.zip')
    # test zip within zip
    self.testDefang('ziploop',1,'stuart@bmsi.com.zip')
  def _chk_name(self,name):
    self.filename = name
  def _chk_attach(self,msg):
    "Filter attachments by content."
    # check for bad extensions
    mime.check_name(msg,ckname=self._chk_name,scan_zip=True)
    # remove scripts from HTML
    mime.check_html(msg)
    # don't let a tricky virus slip one past us
    msg = msg.get_submsg()
    if isinstance(msg,email.message.Message):
      return mime.check_attachments(msg,self._chk_attach)
    return Milter.CONTINUE
  def testCheckAttach(self,fname="test1"):
    # test1 contains a very long filename
    with open('test/'+fname,'rb') as fp:
      msg = mime.message_from_file(fp)
    mime.defang(msg,scan_zip=True)
    self.assertFalse(msg.ismodified())
    with open('test/test2','rb') as fp:
      msg = mime.message_from_file(fp)
    rc = mime.check_attachments(msg,self._chk_attach)
    self.assertEqual(self.filename,"7501'S FOR TWO GOLDEN SOURCES SHIPMENTS FOR TAX & DUTY PURPOSES ONLY.PDF")
    self.assertEqual(rc,Milter.CONTINUE)
  def testHTML(self,fname=""):
-    result = StringIO()
+    result = StringIO.StringIO()
    filter = mime.HTMLScriptFilter(result)
    msg = """<! Illegal declaration used as comment>
      <![if conditional]> Optional SGML <![endif]>
@@ -214,10 +156,8 @@ class MimeTestCase(unittest.TestCase):
    script = "<script lang=javascript> Dangerous script </script>"
    filter.feed(msg + script)
    filter.close()
-    #print(result.getvalue())
+    #print result.getvalue()
-    #print('---')
+    self.failUnless(result.getvalue() == msg + filter.msg)
    #print(msg + filter.msg)
    self.assertTrue(result.getvalue() == msg + filter.msg)
 def suite(): return unittest.makeSuite(MimeTestCase,'test')
@@ -226,7 +166,7 @@ if __name__ == '__main__':
    unittest.main()
  else:
    for fname in sys.argv[1:]:
-      with open(fname,'rb') as fp:
+      fp = open(fname,'r')
      msg = mime.message_from_file(fp)
      mime.defang(msg,scan_zip=True)
-      print(msg.as_string())
+      print msg.as_string()
@@ -2,57 +2,111 @@ import unittest
 import Milter
 import sample
 import mime
-from Milter.test import TestBase
+import rfc822
-from Milter.testctx import TestCtx
+import StringIO
 class TestMilter(sample.sampleMilter):
 class TestMilter(TestBase,sample.sampleMilter):
  def __init__(self):
-    TestBase.__init__(self)
+    self.logfp = open("test/milter.log","a")
-    sample.sampleMilter.__init__(self)
+
  def log(self,*msg):
    for i in msg: print >>self.logfp, i,
    print >>self.logfp
  def replacebody(self,chunk):
    if self._body:
      self._body.write(chunk)
      self.bodyreplaced = True
    else:
      raise IOError,"replacebody not called from eom()"
  # FIXME: rfc822 indexing does not really reflect the way chg/add header
  # work for a milter
  def chgheader(self,field,idx,value):
    self.log('chgheader: %s[%d]=%s' % (field,idx,value))
    if value == '':
      del self._msg[field]
    else:
      self._msg[field] = value
    self.headerschanged = True
  def addheader(self,field,value):
    self.log('addheader: %s=%s' % (field,value))
    self._msg[field] = value
    self.headerschanged = True
  def feedMsg(self,fname):
    self._body = None
    self.bodyreplaced = False
    self.headerschanged = 0
    fp = open('test/'+fname,'r')
    msg = rfc822.Message(fp)
    rc = self.envfrom('<spam@advertisements.com>')
    if rc != Milter.CONTINUE: return rc
    rc = self.envrcpt('<victim@lamb.com>')
    if rc != Milter.CONTINUE: return rc
    line = None
    for h in msg.headers:
      if h[:1].isspace():
 	line = line + h
 	continue
      if not line:
 	line = h
 	continue
      s = line.split(': ',1)
      rc = self.header(s[0],s[1].strip())
      if rc != Milter.CONTINUE: return rc
      line = h
    if line:
      s = line.split(': ',1)
      rc = self.header(s[0],s[1])
      if rc != Milter.CONTINUE: return rc
    rc = self.eoh()
    if rc != Milter.CONTINUE: return rc
    while 1:
      buf = fp.read(8192)
      if len(buf) == 0: break
      rc = self.body(buf)
      if rc != Milter.CONTINUE: return rc
    self._msg = msg
    self._body = StringIO.StringIO()
    rc = self.eom()
    if self.bodyreplaced:
      body = self._body.getvalue()
    else:
      msg.rewindbody()
      body = msg.fp.read()
    self._body = StringIO.StringIO()
    self._body.writelines(msg.headers)
    self._body.write('\n')
    self._body.write(body)
    return rc
  def connect(self,host='localhost'):
    self._body = None
    self.bodyreplaced = False
    rc =  sample.sampleMilter.connect(self,host,1,0) 
    if rc != Milter.CONTINUE and rc != Milter.ACCEPT:
      self.close()
      return rc
    rc = self.hello('spamrelay')
    if rc != Milter.CONTINUE:
      self.close()
    return rc
 class BMSMilterTestCase(unittest.TestCase):
  def testCtx(self,fname='virus1'):
    ctx = TestCtx()
    Milter.factory = sample.sampleMilter
    ctx._setsymval('{auth_authen}','batman')
    ctx._setsymval('{auth_type}','batcomputer')
    ctx._setsymval('j','mailhost')
    rc = ctx._connect()
    self.assertTrue(rc == Milter.CONTINUE)
    rc = ctx._feedMsg(fname)
    milter = ctx.getpriv()
 #    self.assertTrue(milter.user == 'batman',"getsymval failed: "+
 #        "%s != %s"%(milter.user,'batman'))
    self.assertEquals(milter.user,'batman')
    self.assertTrue(milter.auth_type != 'batcomputer',"setsymlist failed")
    self.assertTrue(rc == Milter.ACCEPT)
    self.assertTrue(ctx._bodyreplaced,"Message body not replaced")
    fp = ctx._body
    open('test/'+fname+".tstout","wb").write(fp.getvalue())
    #self.assertTrue(fp.getvalue() == open("test/virus1.out","r").read())
    fp.seek(0)
    msg = mime.message_from_file(fp)
    s = msg.get_payload(1).get_payload()
    milter.log(s)
    ctx._close()
  def testDefang(self,fname='virus1'):
    milter = TestMilter()
    milter.setsymval('{auth_authen}','batman')
    milter.setsymval('{auth_type}','batcomputer')
    milter.setsymval('j','mailhost')
    rc = milter.connect()
-    self.assertTrue(rc == Milter.CONTINUE)
+    self.failUnless(rc == Milter.CONTINUE)
    rc = milter.feedMsg(fname)
-    self.assertTrue(milter.user == 'batman',"getsymval failed")
+    self.failUnless(rc == Milter.ACCEPT)
-    # setsymlist not working in TestBase
+    self.failUnless(milter.bodyreplaced,"Message body not replaced")
    #self.assertTrue(milter.auth_type != 'batcomputer',"setsymlist failed")
    self.assertTrue(rc == Milter.ACCEPT)
    self.assertTrue(milter._bodyreplaced,"Message body not replaced")
    fp = milter._body
-    open('test/'+fname+".tstout","wb").write(fp.getvalue())
+    open('test/'+fname+".tstout","w").write(fp.getvalue())
-    #self.assertTrue(fp.getvalue() == open("test/virus1.out","r").read())
+    #self.failUnless(fp.getvalue() == open("test/virus1.out","r").read())
    fp.seek(0)
    msg = mime.message_from_file(fp)
    s = msg.get_payload(1).get_payload()
@@ -63,30 +117,30 @@ class BMSMilterTestCase(unittest.TestCase):
    milter = TestMilter()
    milter.connect('somehost')
    rc = milter.feedMsg(fname)
-    self.assertTrue(rc == Milter.ACCEPT)
+    self.failUnless(rc == Milter.ACCEPT)
-    self.assertFalse(milter._bodyreplaced,"Milter needlessly replaced body.")
+    self.failIf(milter.bodyreplaced,"Milter needlessly replaced body.")
    fp = milter._body
-    open('test/'+fname+".tstout","wb").write(fp.getvalue())
+    open('test/'+fname+".tstout","w").write(fp.getvalue())
    milter.close()
  def testDefang2(self):
    milter = TestMilter()
    milter.connect('somehost')
    rc = milter.feedMsg('samp1')
-    self.assertTrue(rc == Milter.ACCEPT)
+    self.failUnless(rc == Milter.ACCEPT)
-    self.assertFalse(milter._bodyreplaced,"Milter needlessly replaced body.")
+    self.failIf(milter.bodyreplaced,"Milter needlessly replaced body.")
    rc = milter.feedMsg("virus3")
-    self.assertTrue(rc == Milter.ACCEPT)
+    self.failUnless(rc == Milter.ACCEPT)
-    self.assertTrue(milter._bodyreplaced,"Message body not replaced")
+    self.failUnless(milter.bodyreplaced,"Message body not replaced")
    fp = milter._body
-    open("test/virus3.tstout","wb").write(fp.getvalue())
+    open("test/virus3.tstout","w").write(fp.getvalue())
-    #self.assertTrue(fp.getvalue() == open("test/virus3.out","r").read())
+    #self.failUnless(fp.getvalue() == open("test/virus3.out","r").read())
    rc = milter.feedMsg("virus6")
-    self.assertTrue(rc == Milter.ACCEPT)
+    self.failUnless(rc == Milter.ACCEPT)
-    self.assertTrue(milter._bodyreplaced,"Message body not replaced")
+    self.failUnless(milter.bodyreplaced,"Message body not replaced")
-    self.assertTrue(milter._headerschanged,"Message headers not adjusted")
+    self.failUnless(milter.headerschanged,"Message headers not adjusted")
    fp = milter._body
-    open("test/virus6.tstout","wb").write(fp.getvalue())
+    open("test/virus6.tstout","w").write(fp.getvalue())
    milter.close()
 def suite(): return unittest.makeSuite(BMSMilterTestCase,'test')
@@ -1,11 +1,9 @@
 from __future__ import print_function
 import unittest
 import doctest
 import os
 import Milter.utils
 from Milter.cache import AddrCache
 from Milter.dynip import is_dynip
 from Milter.pyip6 import inet_ntop
 class AddrCacheTestCase(unittest.TestCase):
@@ -13,7 +11,6 @@ class AddrCacheTestCase(unittest.TestCase):
    self.fname = 'test.dat'
  def tearDown(self):
    if os.path.exists(self.fname):
    os.remove(self.fname)
  def testAdd(self):
@@ -21,40 +18,30 @@ class AddrCacheTestCase(unittest.TestCase):
    cache['foo@bar.com'] = None
    cache.addperm('baz@bar.com')
    cache['temp@bar.com'] = 'testing'
-    self.assertTrue(cache.has_key('foo@bar.com'))
+    self.failUnless(cache.has_key('foo@bar.com'))
-    self.assertTrue(not cache.has_key('hello@bar.com'))
+    self.failUnless(not cache.has_key('hello@bar.com'))
-    self.assertTrue('baz@bar.com' in cache)
+    self.failUnless('baz@bar.com' in cache)
    self.assertEquals(cache['temp@bar.com'],'testing')
    s = open(self.fname).readlines()
-    self.assertTrue(len(s) == 2)
+    self.failUnless(len(s) == 2)
-    self.assertTrue(s[0].startswith('foo@bar.com '))
+    self.failUnless(s[0].startswith('foo@bar.com '))
    self.assertEquals(s[1].strip(),'baz@bar.com')
    # check that new result overrides old
    cache['temp@bar.com'] = None
-    self.assertTrue(not cache['temp@bar.com'])
+    self.failUnless(not cache['temp@bar.com'])
  def testDomain(self):
-    with open(self.fname,'w') as fp:
+    fp = open(self.fname,'w')
-      print('spammer.com',file=fp)
+    print >>fp,'spammer.com'
    fp.close()
    cache = AddrCache(fname=self.fname)
    cache.load(self.fname,30)
-    self.assertTrue('spammer.com' in cache)
+    self.failUnless('spammer.com' in cache)
  def testParseHeader(self):
    s='=?UTF-8?B?TGFzdCBGZXcgQ29sZHBsYXkgQWxidW0gQXJ0d29ya3MgQXZhaWxhYmxlAA?='
    h = Milter.utils.parse_header(s)
    self.assertEqual(h,b'Last Few Coldplay Album Artworks Available\x00')
  @unittest.expectedFailure
  def testParseAddress(self):
    s = Milter.utils.parseaddr('a(WRONG)@b')
    self.assertEqual(s,('WRONG', 'a@b'))
 def suite(): 
  s = unittest.makeSuite(AddrCacheTestCase,'test')
  s.addTest(doctest.DocTestSuite(Milter.utils))
  s.addTest(doctest.DocTestSuite(Milter.dynip))
  s.addTest(doctest.DocTestSuite(Milter.pyip6))
  return s
 if __name__ == '__main__':