Fixing #10 (#12)

timofurrer · Sep 27, 2018 · c90c436 · c90c436
1 parent 7a01398
commit c90c436
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/colorful/core.py b/colorful/core.py
@@ -209,7 +209,7 @@ def style_string(string, ansi_style, colormode, nested=False):
     # replace nest placeholders with the current begin style
     if PY2:
         if isinstance(string, str):
-            string = string.decode(DEFAULT_ENCODE)
+            string = string.decode('utf-8' if DEFAULT_ENCODE is None else DEFAULT_ENCODE)
     string = UNICODE(string).replace(ansi.NEST_PLACEHOLDER, ansi_start_code)
 
     return '{start_code}{string}{end_code}{nest_ph}'.format(
@@ -232,7 +232,7 @@ def __unicode__(self):
             return self.styled_string
 
         def __str__(self):
-            return self.styled_string.encode(DEFAULT_ENCODE)
+            return self.styled_string.encode('utf-8' if DEFAULT_ENCODE is None else DEFAULT_ENCODE)
     else:
         def __str__(self):
             return self.styled_string