options[key] should return a value, not an _Option instance

diff --git a/tornado/options.py b/tornado/options.py
index 04ae443765e5d578629f2ef638a6c232a5227a3d..be3ae71571aad1cf526d35cd7403f433d07bfe61 100644 (file)
--- a/tornado/options.py
+++ b/tornado/options.py
@@ -105,7 +105,7 @@ class OptionParser(object):
         return iter(self._options)
 
     def __getitem__(self, item):
-        return self._options[item]
+        return self._options[item].value()
 
     def items(self):
         """A sequence of (name, value) pairs."""

diff --git a/tornado/test/options_test.py b/tornado/test/options_test.py
index 2c1f4035ecc9c1782da9a9fddf64dbcb4d7425eb..53b6f079b6023f6f0da54305d190b9e52253eb44 100644 (file)
--- a/tornado/test/options_test.py
+++ b/tornado/test/options_test.py
@@ -124,6 +124,10 @@ class OptionsTest(unittest.TestCase):
         # OptionParsers always define 'help'.
         self.assertEqual(set(['a', 'b', 'help']), set(iter(options)))
 
+    def test_getitem(self):
+        options = self._sample_options()
+        self.assertEqual(1, options['a'])
+
     def test_items(self):
         options = self._sample_options()
         # OptionParsers always define 'help'.