Make __getitem__ and __setitem__ mirror behavior of __getattr__ and __setattr__

diff --git a/tornado/options.py b/tornado/options.py
old mode 100644 (file)
new mode 100755 (executable)
index ba16b1a..bdb5baa
--- a/tornado/options.py
+++ b/tornado/options.py
@@ -132,8 +132,10 @@ class OptionParser(object):
         return name in self._options
 
     def __getitem__(self, name):
-        name = self._normalize_name(name)
-        return self._options[name].value()
+        return self.__getattr__(name)
+
+    def __setitem__(self, name, value):
+        return self.__setattr__(name, 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 c32184bb405e39b3e02fb4ce56f572a720b19d71..2f2384b2480b3bf83584db83e68ef0453d729e94 100644 (file)
--- a/tornado/test/options_test.py
+++ b/tornado/test/options_test.py
@@ -131,6 +131,12 @@ class OptionsTest(unittest.TestCase):
         options = self._sample_options()
         self.assertEqual(1, options['a'])
 
+    def test_setitem(self):
+        options = OptionParser()
+        options.define('foo', default=1, type=int)
+        options['foo'] = 2
+        self.assertEqual(options['foo'], 2)
+
     def test_items(self):
         options = self._sample_options()
         # OptionParsers always define 'help'.