[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog/regressiontests - loadmail.py:1.9

Barry Warsaw barry@wooz.org
Wed, 11 Sep 2002 15:49:45 -0400


Update of /cvs-repository/Zope/lib/python/Products/ZCatalog/regressiontests
In directory cvs.zope.org:/tmp/cvs-serv27522

Modified Files:
	loadmail.py 
Log Message:
loadinc(): Do the same check of the environment that's done in
loadmail() when deciding on the print format.


=== Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py 1.8 => 1.9 ===
--- Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py:1.8	Thu Aug 22 17:43:17 2002
+++ Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py	Wed Sep 11 15:49:45 2002
@@ -213,7 +213,10 @@
         app=jar.root()['Application']
         mdest=getattr(app, name)
         if i%100 == 0 and printstat:
-            sys.stdout.write("\t%s\t%s\t\r" % (i, f.tell()))
+            fmt = "\t%s\t%s\t\r"
+            if os.environ.get('TERM') in ('dumb', 'emacs'):
+                fmt = "\t%s\t%s\t\n"
+            sys.stdout.write(fmt % (i, f.tell()))
             sys.stdout.flush()
 
         did=str(i)