From: Ben Darnell <bdarnell@beaker.local>
Date: Mon, 5 Apr 2010 19:23:24 +0000 (-0700)
Subject: Make options.__getattr__ raise AttributeError instead of Error for consistency
X-Git-Tag: v1.0.0~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5365d8c015b11a26b5ac6f29a40cd4d59e550e3;p=thirdparty%2Ftornado.git

Make options.__getattr__ raise AttributeError instead of Error for consistency
with standard attribute lookups (so getattr(options, 'foo', None) works
if no option 'foo' has been defined).
---

diff --git a/tornado/options.py b/tornado/options.py
index 781c2820d..66bce091e 100644
--- a/tornado/options.py
+++ b/tornado/options.py
@@ -175,7 +175,7 @@ class _Options(dict):
     def __getattr__(self, name):
         if isinstance(self.get(name), _Option):
             return self[name].value()
-        raise Error("Unrecognized option %r" % name)
+        raise AttributeError("Unrecognized option %r" % name)
 
 
 class _Option(object):