diff --git a/Milter/test.py b/Milter/test.py index 4977cca..1573052 100644 --- a/Milter/test.py +++ b/Milter/test.py @@ -37,7 +37,7 @@ class TestBase(object): def log(self,*msg): for i in msg: print(i,file=self.logfp,end=None) - print(file=self.logfp,flush=True) + print(file=self.logfp) ## Set a macro value. # These are retrieved by the %milter with getsymval. diff --git a/milter-nomix.py b/milter-nomix.py index a6686ba..bde0e43 100644 --- a/milter-nomix.py +++ b/milter-nomix.py @@ -2,6 +2,7 @@ # 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 @@ -68,12 +69,12 @@ def main(): 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') + 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') + print("%s nomix milter shutdown" % time.strftime('%Y%b%d %H:%M:%S')) if __name__ == "__main__": main() diff --git a/milter-template.py b/milter-template.py index 076165c..b41c50c 100644 --- a/milter-template.py +++ b/milter-template.py @@ -136,7 +136,8 @@ def background(): end=None) # 2005Oct13 02:34:11 [1] msg1 msg2 msg3 ... for i in msg: print(i,end=None) - print(flush=True) + print() + sys.stdout.flush() ## === @@ -151,7 +152,8 @@ def main(): 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'),flush=True) + print("%s milter startup" % time.strftime('%Y%b%d %H:%M:%S')) + sys.stdout.flush() Milter.runmilter("pythonfilter",socketname,timeout) logq.put(None) bt.join() diff --git a/sample.py b/sample.py index 68bb17d..eb1c4ec 100644 --- a/sample.py +++ b/sample.py @@ -23,7 +23,7 @@ class sampleMilter(Milter.Milter): def log(self,*msg): print("%s [%d]" % (strftime('%Y%b%d %H:%M:%S'),self.id),end=None) for i in msg: print(i,end=None) - print(flush=True) + print() def __init__(self): self.tempname = None @@ -177,6 +177,7 @@ O InputMailFilters=pythonfilter Xpythonfilter, S=local:%s See the sendmail README for libmilter. -sample milter startup""" % socketname,flush=True) +sample milter startup""" % socketname) + sys.stdout.flush() Milter.runmilter("pythonfilter",socketname,240) print("sample milter shutdown") diff --git a/testmime.py b/testmime.py index f33c538..94e0b25 100644 --- a/testmime.py +++ b/testmime.py @@ -26,6 +26,7 @@ # Revision 1.20 2004/11/20 16:38:17 stuart # Add rcs log # +from __future__ import print_function import unittest import mime import socket @@ -188,7 +189,7 @@ class MimeTestCase(unittest.TestCase): script = "" filter.feed(msg + script) filter.close() - #print result.getvalue() + #print(result.getvalue()) self.failUnless(result.getvalue() == msg + filter.msg) def suite(): return unittest.makeSuite(MimeTestCase,'test') @@ -201,4 +202,4 @@ if __name__ == '__main__': fp = open(fname,'r') msg = mime.message_from_file(fp) mime.defang(msg,scan_zip=True) - print msg.as_string() + print(msg.as_string())