From bd775d0d401686e260dccce94ca61f4edcf3a452 Mon Sep 17 00:00:00 2001 From: John Garland Date: Mon, 7 Jun 2010 20:05:34 +1000 Subject: [PATCH] Only encode if necessary --- deluge/ui/console/colors.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/colors.py b/deluge/ui/console/colors.py index 3b9455446..83465737d 100644 --- a/deluge/ui/console/colors.py +++ b/deluge/ui/console/colors.py @@ -126,7 +126,8 @@ def get_line_length(line, encoding="UTF-8"): if line.count("{!") != line.count("!}"): raise BadColorString("Number of {! is not equal to number of !}") - line = line.encode(encoding, "replace") + if isinstance(line, unicode): + line = line.encode(encoding, "replace") # Remove all the color tags line = strip_colors(line) @@ -146,7 +147,8 @@ def parse_color_string(s, encoding="UTF-8"): if s.count("{!") != s.count("!}"): raise BadColorString("Number of {! is not equal to number of !}") - s = s.encode(encoding, "replace") + if isinstance(s, unicode): + s = s.encode(encoding, "replace") ret = [] # Keep track of where the strings