From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 1 Mar 2011 00:19:31 +0000 (-0800)
Subject: Python3 decodes sys.argv for us, so only decode when necessary.
X-Git-Tag: v2.0.0~85^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2089a131a9ffc08ced1e01c572886d6d11e7f8ad;p=thirdparty%2Ftornado.git

Python3 decodes sys.argv for us, so only decode when necessary.
---

diff --git a/tornado/options.py b/tornado/options.py
index 35c695783..17608af77 100644
--- a/tornado/options.py
+++ b/tornado/options.py
@@ -55,6 +55,8 @@ import re
 import sys
 import time
 
+from tornado.escape import _unicode
+
 # For pretty log messages, if available
 try:
     import curses
@@ -295,7 +297,7 @@ class _Option(object):
         return value.lower() not in ("false", "0", "f")
 
     def _parse_string(self, value):
-        return value.decode("utf-8")
+        return _unicode(value)
 
 
 class Error(Exception):