summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-12-03 15:54:47 +0000
committerDavid Cournapeau <cournape@gmail.com>2009-12-03 15:54:47 +0000
commit36dae6932c2f4d8d8cf54f102c10f19096cc3cf6 (patch)
tree6481ecfa6504c57d3143946e762cea2dcdb5e6f7
parentead042607c9d311e02b3670b3a64652a63930aa7 (diff)
downloadnumpy-36dae6932c2f4d8d8cf54f102c10f19096cc3cf6.tar.gz
Make numpy.distutils.log importable from python3.
-rw-r--r--numpy/distutils/log.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/numpy/distutils/log.py b/numpy/distutils/log.py
index a3de98f09..fe44bb443 100644
--- a/numpy/distutils/log.py
+++ b/numpy/distutils/log.py
@@ -4,7 +4,11 @@ import sys
from distutils.log import *
from distutils.log import Log as old_Log
from distutils.log import _global_log
-from misc_util import red_text, default_text, cyan_text, green_text, is_sequence, is_string
+
+if sys.version_info[0] < 3:
+ from misc_util import red_text, default_text, cyan_text, green_text, is_sequence, is_string
+else:
+ from numpy.distutils.misc_util import red_text, default_text, cyan_text, green_text, is_sequence, is_string
def _fix_args(args,flag=1):
@@ -24,7 +28,7 @@ class Log(old_Log):
return
if msg.startswith('byte-compiling '):
return
- print _global_color_map[level](msg)
+ print(_global_color_map[level](msg))
sys.stdout.flush()
def good(self, msg, *args):
@@ -33,9 +37,9 @@ class Log(old_Log):
"""
if WARN >= self.threshold:
if args:
- print green_text(msg % _fix_args(args))
+ print(green_text(msg % _fix_args(args)))
else:
- print green_text(msg)
+ print(green_text(msg))
sys.stdout.flush()
_global_log.__class__ = Log