[llvm-commits] [zorg] r150745 - /zorg/trunk/lnt/lnt/server/db/v4db.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Feb 16 16:54:23 2012
New Revision: 150745

URL: http://llvm.org/viewvc/llvm-project?rev=150745&view=rev
Log:
[lnt] lnt.server.db.v4db: Simplify.

Modified:
    zorg/trunk/lnt/lnt/server/db/v4db.py

Modified: zorg/trunk/lnt/lnt/server/db/v4db.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/db/v4db.py?rev=150745&r1=150744&r2=150745&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/db/v4db.py (original)
+++ zorg/trunk/lnt/lnt/server/db/v4db.py Thu Feb 16 16:54:23 2012
@@ -18,7 +18,7 @@
             for name, in self.v4db.query(testsuite.TestSuite.name):
                 yield name
 
-        def __getitem__(self, name):
+        def get(self, name, default = None):
             # Check the test suite cache, to avoid gratuitous reinstantiation.
             #
             # FIXME: Invalidation?
@@ -29,18 +29,19 @@
             ts = self.v4db.query(testsuite.TestSuite).\
                 filter(testsuite.TestSuite.name == name).first()
             if ts is None:
-                raise IndexError,name
+                return default
 
             # Instantiate the per-test suite wrapper object for this test suite.
             self._cache[name] = ts = testsuitedb.TestSuiteDB(
                 self.v4db, name, ts)
             return ts
 
-        def get(self, name, default = None):
-            if name in self:
-                return self[name]
-            return default
-
+        def __getitem__(self, name):
+            ts = self.get(name)
+            if ts is None:
+                raise IndexError(name)
+            return ts
+            
         def keys(self):
             return iter(self)