[z3-checkins] r22482 - z3/sqlos/trunk/src/sqlos

[jinty at codespeak.net]

Author: jinty
Date: Sat Jan 21 16:56:58 2006
New Revision: 22482

Modified:
   z3/sqlos/trunk/src/sqlos/container.py
Log:
Commit a patch from Fabio Tranchitella. This apparently allows people to use
SQLObjects without an integer id.

SQLObject apparently throws a ValueError if the id is wrong, which we catch and
convert to a KeyError.


Modified: z3/sqlos/trunk/src/sqlos/container.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/container.py	(original)
+++ z3/sqlos/trunk/src/sqlos/container.py	Sat Jan 21 16:56:58 2006
@@ -151,7 +151,7 @@
             raise KeyError, "%s is not a string" % name
         try:
             parts = name.split('.')
-            id = int(parts[-1])
+            id = parts[-1]
             factoryName = '.'.join(parts[:-1])
         except ValueError:
             raise KeyError, name
@@ -162,7 +162,8 @@
             try:
                 obj = utility.get(id)
                 return contained(obj, parent=self, name=name)
-            except SQLObjectNotFound:
+            except (SQLObjectNotFound, ValueError):
+                # SQlObject raises ValueError if the key is not correct
                 raise KeyError, name
         raise KeyError, name