Assume all config files are encoded in UTF-8

diff --git a/tornado/options.py b/tornado/options.py
index fd97f31f3ffbb617290e6677daf0cd580d4589d7..12d2c8017dcbcdf817e7e4eda375b90bbf53ab76 100644 (file)
--- a/tornado/options.py
+++ b/tornado/options.py
@@ -265,7 +265,7 @@ class OptionParser(object):
 
         return remaining
 
-    def parse_config_file(self, path, final=True, encoding=None):
+    def parse_config_file(self, path, final=True):
         """Parses and loads the Python config file at the given path.
 
         If ``final`` is ``False``, parse callbacks will not be run.
@@ -275,7 +275,7 @@ class OptionParser(object):
         config = {}
         try:
             # python 3
-            with open(path, encoding=encoding) as f:
+            with open(path, encoding="utf-8") as f:
                 exec_in(f.read(), config, config)
         except TypeError:
             # python 2

diff --git a/tornado/test/options_test.py b/tornado/test/options_test.py
index 82c4495fd4d3ec74b9edcec4fa18d4a620acbbb1..f90c30d251d15ea795947d0701786dcc81d26632 100644 (file)
--- a/tornado/test/options_test.py
+++ b/tornado/test/options_test.py
@@ -34,9 +34,8 @@ class OptionsTest(unittest.TestCase):
         options = OptionParser()
         options.define("port", default=80)
         options.define("username", default='foo')
-        cfg_path = os.path.join(os.path.dirname(__file__), "options_test.cfg")
-        options.parse_config_file(cfg_path, encoding="utf-8")
-
+        options.parse_config_file(os.path.join(os.path.dirname(__file__),
+                                               "options_test.cfg"))
         self.assertEquals(options.port, 443)
         self.assertEqual(options.username, "李康")