Merge branch 'master' into constructor-methods

2015-07-19 12:49:23 -07:00
parent 861d906fc2 6ece2c173b
commit bc822cd4c7
18 changed files with 254 additions and 191 deletions
@@ -234,7 +234,7 @@ def color_text(text, color):

  # No ANSI escapes on Windows.
  if sys.platform == 'win32':
-    return text
+    return str(text)

  return color + str(text) + '\033[0m'