Author: phd
Date: 2007-09-26 15:27:41 -0600 (Wed, 26 Sep 2007)
New Revision: 3006
Modified:
SQLObject/branches/0.9/sqlobject/versioning/test/test_version.py
Log:
Backported the patch from r2987 from the trunk.
Modified: SQLObject/branches/0.9/sqlobject/versioning/test/test_version.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/versioning/test/test_version.py 2007-09-26 21:19:59 UTC (rev 3005)
+++ SQLObject/branches/0.9/sqlobject/versioning/test/test_version.py 2007-09-26 21:27:41 UTC (rev 3006)
@@ -1,17 +1,16 @@
-from py.test import raises
-from sqlobject import *
try:
sorted
except NameError:
# For Python 2.2 and 2.3:
from sqlobject.events import sorted
+
+from py.test import raises
+from sqlobject import *
from sqlobject.inheritance import InheritableSQLObject
from sqlobject.versioning import Versioning
from sqlobject.tests.dbtest import *
-from datetime import datetime
-
class MyClass(SQLObject):
name = StringCol()
versions = Versioning()
@@ -45,12 +44,12 @@
class Extra(SQLObject):
name = StringCol()
versions = Versioning(extraCols={'extra' : StringCol(default=_set_extra())})
+
class HasAltId(SQLObject):
name = StringCol()
altid = IntCol(alternateID=True)
versions = Versioning()
-
def setup():
classes = [MyClass, Base, Child, Government, Monarchy, VChild, Extra, HasAltId]
if hasattr(HasForeign, "_connection"):
@@ -58,7 +57,7 @@
else:
classes.append(HasForeign)
for cls in classes:
- if hasattr(cls, 'versions') and hasattr(cls, "_connection") and \
+ if hasattr(cls, 'versions') and getattr(cls, "_connection", None) and \
cls._connection.tableExists(cls.sqlmeta.table):
setupClass(cls.versions.versionClass)
setupClass(cls)
@@ -68,7 +67,6 @@
version.destroySelf()
def test_versioning():
-
#the simple case
setup()
mc = MyClass(name='fleem')
@@ -131,7 +129,6 @@
extra.versions[0].restore()
assert extra.name == "fleem"
-
def test_next():
setup()
base = Base(name='first', value=1)
@@ -168,4 +165,3 @@
setup()
extra = HasAltId(name="fleem", altid=5)
extra.name = "morx"
-
|