From f253bea303050a217e836731de9c208541d567a4 Mon Sep 17 00:00:00 2001 From: "A. Jesse Jiryu Davis" Date: Fri, 17 May 2013 09:49:05 -0400 Subject: [PATCH] options[key] should return a value, not an _Option instance --- tornado/options.py | 2 +- tornado/test/options_test.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tornado/options.py b/tornado/options.py index 04ae44376..be3ae7157 100644 --- 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 2c1f4035e..53b6f079b 100644 --- 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'. -- 2.47.2