Author: phd
Date: 2007-09-26 15:28:18 -0600 (Wed, 26 Sep 2007)
New Revision: 3007
Modified:
SQLObject/trunk/sqlobject/versioning/test/test_version.py
Log:
Minor code cleanup.
Modified: SQLObject/trunk/sqlobject/versioning/test/test_version.py
===================================================================
--- SQLObject/trunk/sqlobject/versioning/test/test_version.py 2007-09-26 21:27:41 UTC (rev 3006)
+++ SQLObject/trunk/sqlobject/versioning/test/test_version.py 2007-09-26 21:28:18 UTC (rev 3007)
@@ -1,10 +1,11 @@
-from py.test import raises
-from sqlobject import *
try:
sorted
except NameError:
- # For Python 2.2 and 2.3:
+ # For Python 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 *
@@ -43,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"):
@@ -66,7 +67,6 @@
version.destroySelf()
def test_versioning():
-
#the simple case
setup()
mc = MyClass(name='fleem')
@@ -129,7 +129,6 @@
extra.versions[0].restore()
assert extra.name == "fleem"
-
def test_next():
setup()
base = Base(name='first', value=1)
@@ -166,4 +165,3 @@
setup()
extra = HasAltId(name="fleem", altid=5)
extra.name = "morx"
-
|