Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Sun, 12 Oct 2008 19:11:56 +0200
changeset 7079 0b74409d5858
parent 7077 ccbd39cad3c3 (current diff)
parent 7078 967adcf5910d (diff)
child 7080 a6477aa893b8
Merge with crew-stable
--- a/tests/test-doctest.py	Sat Oct 11 13:07:29 2008 +0200
+++ b/tests/test-doctest.py	Sun Oct 12 19:11:56 2008 +0200
@@ -1,5 +1,7 @@
 # this is hack to make sure no escape characters are inserted into the output
-import os; del os.environ['TERM'] 
+import os;
+if 'TERM' in os.environ:
+    del os.environ['TERM'] 
 import doctest
 
 import mercurial.changelog