Merge pull request tornadoweb#1576 from ewang/master

Override __setitem__ in tornado.options
macro · Nov 7, 2015 · 7da0d5b · 7da0d5b
2 parents 3dcb12c + a3d2618
commit 7da0d5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tornado/options.py b/tornado/options.py
@@ -132,8 +132,10 @@ def __contains__(self, name):
         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
@@ -131,6 +131,12 @@ def test_getitem(self):
         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'.