Pull Scott's changes

Milter/utils.py

@@ -218,8 +218,8 @@ def parse_header(val):
 	except LookupError:
 	  u.append(unicode(s))
       else:
-	u.append(unicode(s))
-    u = ''.join(u)
+        u.append(unicode(s))
+    u = u''.join(u)
     for enc in ('us-ascii','iso-8859-1','utf-8'):
       try:
 	return u.encode(enc)

setup.cfg

@@ -1,5 +1,5 @@
 [bdist_rpm]
 python=python3
-doc_files=README NEWS TODO
-packager=Stuart D. Gathman <stuart@bmsi.com>
+doc_files=README NEWS TODO COPYING CREDITS
+packager=Stuart D. Gathman <stuart@gathman.org>
 release=1

testmime.py

@@ -1,4 +1,7 @@
 # $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.
 #
@@ -170,7 +173,7 @@ class MimeTestCase(unittest.TestCase):
     msg = mime.message_from_file(open('test/'+fname,'r'))
     mime.defang(msg,scan_zip=True)
     self.failIf(msg.ismodified())
-    msg = mime.message_from_file(open('test/tmpytgcE5.fail','r'))
+    msg = mime.message_from_file(open('test/test2','r'))
     rc = mime.check_attachments(msg,self._chk_attach)
     self.assertEquals(self.filename,"7501'S FOR TWO GOLDEN SOURCES SHIPMENTS FOR TAX & DUTY PURPOSES ONLY.PDF")
     self.assertEquals(rc,Milter.CONTINUE)