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

[kobold at codespeak.net]

Author: kobold
Date: Tue Sep 19 11:02:43 2006
New Revision: 32474

Modified:
   z3/sqlos/branch/kobold-sqlos/src/sqlos/browser.py
   z3/sqlos/branch/kobold-sqlos/src/sqlos/container.py
   z3/sqlos/branch/kobold-sqlos/src/sqlos/zsqlobject.py
Log:
A few fixes.


Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/browser.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/browser.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/browser.py	Tue Sep 19 11:02:43 2006
@@ -44,5 +44,7 @@
         try:
             v = container[name]
         except KeyError:
-            raise TraversalError(name)
+            v = getattr(container, name, None)
+            if not v:
+                raise TraversalError(name)
         return v

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	Tue Sep 19 11:02:43 2006
@@ -53,7 +53,7 @@
         obj.__parent__ = parent
 
     if oldname != name and name is not None:
-        obj.__name__ = name
+        obj.__name__ = unicode(name)
 
     return obj
 

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	Tue Sep 19 11:02:43 2006
@@ -70,8 +70,11 @@
         # objects in the cache that have a __parent__ set.
         # This may be confusing when expect to get a object
         # which has no __parent__ and thats not what you get.
-        val = super(SQLOS, self).get(id, connection=connection,
-                                    selectResults=selectResults)
+        try:
+            val = super(SQLOS, self).get(id, connection=connection,
+                                        selectResults=selectResults)
+        except ValueError:
+            raise AttributeError, id
         if getattr(val, '__parent__', None) is not None:
             val.__parent__ = None
             val.__name__ = None