SQLObject

Author: phd
Date: 2004-11-29 19:19:41 +0000 (Mon, 29 Nov 2004)
New Revision: 418

Modified:
   home/phd/SQLObject/inheritance/sqlobject/main.py
   home/phd/SQLObject/inheritance/tests/test_sqlobject.py
Log:
Merged fixes from the trunk.


Modified: home/phd/SQLObject/inheritance/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/inheritance/sqlobject/main.py	2004-11-29 19:13:59 UTC (rev 417)
+++ home/phd/SQLObject/inheritance/sqlobject/main.py	2004-11-29 19:19:41 UTC (rev 418)
@@ -895,7 +895,7 @@
             for name, value in kw.items():
                 fromPy = getattr(self, '_SO_fromPython_%s' % name, None)
                 if fromPy:
-                    kw[name] = value = fromPy(value, self._SO_validatorState)
+                    kw[name] = fromPy(value, self._SO_validatorState)
                 setattr(self, instanceName(name), value)
             for name, value in extra.items():
                 setattr(self, name, value)

Modified: home/phd/SQLObject/inheritance/tests/test_sqlobject.py
===================================================================
--- home/phd/SQLObject/inheritance/tests/test_sqlobject.py	2004-11-29 19:13:59 UTC (rev 417)
+++ home/phd/SQLObject/inheritance/tests/test_sqlobject.py	2004-11-29 19:19:41 UTC (rev 418)
@@ -34,7 +34,7 @@
             class Duplicate(SQLObject):
                 pass
         except ValueError, err:
-            self.assertEqual(str(err), "class Duplicate is already in the registry")
+            assert str(err).startswith("class Duplicate is already in the registry")
         else:
             self.fail("should have raised an error on duplicate class definition")
 
@@ -1198,14 +1198,9 @@
             n += 1
             SOIndex1(name=name, number=n)
         mod = SOIndex1._connection.module
-        # Firebird doesn't throw an integrity error, unfortunately:
-        if mod.__name__.endswith('kinterbasdb'):
-            exc = mod.ProgrammingError
-        else:
-            exc = mod.IntegrityError
         try:
             SOIndex1(name='blah', number=0)
-        except exc:
+        except (mod.ProgrammingError, mod.IntegrityError):
             # expected
             pass
         else: