merge with stable
authorMatt Mackall <mpm@selenic.com>
Sun, 01 Dec 2013 21:24:48 -0600
changeset 20165 1c92524c37cd
parent 20163 b8b3c0b293a2 (current diff)
parent 20164 1ddf4409229f (diff)
child 20166 7eda5bb9ec8f
merge with stable
--- a/i18n/check-translation.py	Sun Dec 01 20:54:02 2013 -0600
+++ b/i18n/check-translation.py	Sun Dec 01 21:24:48 2013 -0600
@@ -122,6 +122,7 @@
     (options, args) = optparser.parse_args()
 
     if options.doctest:
+        import os
         if 'TERM' in os.environ:
             del os.environ['TERM']
         import doctest