[z3-checkins] r31876 - z3/sqlos/branch/kobold-sqlos/src/sqlos

[kobold at codespeak.net]

Author: kobold
Date: Thu Aug 31 14:08:09 2006
New Revision: 31876

Modified:
   z3/sqlos/branch/kobold-sqlos/src/sqlos/container.py
   z3/sqlos/branch/kobold-sqlos/src/sqlos/zsqlobject.py
Log:
Several small changes after a first review of the code from Brian.


Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/container.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/container.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/container.py	Thu Aug 31 14:08:09 2006
@@ -106,7 +106,8 @@
                 # ignore it
                 if utility is not None:
                     yield name, utility
-                    if self._monocontainer: break
+                    if self._monocontainer:
+                        break
 
     def keys(self):
         """ Return a sequence-like object containing the names
@@ -131,7 +132,8 @@
             for obj in (self._filters and utility.selectBy(**self._filters) or utility.select()):
                 if self._monocontainer:
                     name = isinstance(obj.id, basestring) and obj.id or str(obj.id)
-                else: name = '%s.%s' % (utility_name, obj.id)
+                else:
+                    name = '%s.%s' % (utility_name, obj.id)
                 yield (name, contained(obj, parent=self, name=name))
 
     def __getitem__(self, name):
@@ -163,10 +165,12 @@
                 factoryName = '.'.join(parts[:-1])
             except ValueError:
                 raise KeyError, name
-        else: factoryName, id = None, name
+        else:
+            factoryName, id = None, name
 
         for utility_name, utility in self._getAllowedIISQLObjectUtilities():
-            if factoryName and factoryName != utility_name: continue
+            if factoryName and factoryName != utility_name:
+                continue
             try:
                 obj = utility.get(utility.sqlmeta.idType(id))
                 if self._filters:
@@ -325,11 +329,15 @@
 
     implements(ISQLObjectJoinContainer)
 
+    _allowed_joins = []
+
     def __getitem__(self, name):
         for j in self.sqlmeta.joins:
-            if name != j.joinDef.name: continue
+            if name != j.joinDef.name:
+                continue
             for i, container in self._allowed_joins:
-                if not i.implementedBy(j.otherClass): continue
+                if not i.implementedBy(j.otherClass):
+                    continue
                 c = container()
                 c._filters = {j.joinColumn[:-3] + 'ID': self.id}
                 return contained(c, parent=self, name=name)

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/zsqlobject.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/zsqlobject.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/zsqlobject.py	Thu Aug 31 14:08:09 2006
@@ -17,7 +17,6 @@
 
 from sqlos.connection import ConnectionDescriptor
 from sqlos.interfaces import ISQLObject
-from sqlos.interfaces.container import ISQLObjectJoinContainer
 from sqlos import _transaction
 
 def syncUpdateAll():
@@ -51,9 +50,7 @@
         >>> testdb.tearDown()
     """
     implements(ISQLObject)
-
     _connection = ConnectionDescriptor()
-    _allowed_joins = []
 
     class sqlmeta:
         lazyUpdate = True