Author: phd
Date: 2007-01-09 09:14:09 -0700 (Tue, 09 Jan 2007)
New Revision: 2179
Modified:
SQLObject/trunk/sqlobject/versioning/__init__.py
SQLObject/trunk/sqlobject/versioning/test/test_version.py
Log:
Downgraded versioning to Python 2.3.
Modified: SQLObject/trunk/sqlobject/versioning/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/versioning/__init__.py 2007-01-08 21:32:46 UTC (rev 2178)
+++ SQLObject/trunk/sqlobject/versioning/__init__.py 2007-01-09 16:14:09 UTC (rev 2179)
@@ -25,20 +25,20 @@
if getattr(self, column) != getattr(next, column):
fields.append(column.title())
- return fields
+ return fields
- @classmethod
def select(cls, clause=None, *args, **kw):
if not getattr(cls, '_connection', None):
- cls._connection = cls.masterClass._connection
+ cls._connection = cls.masterClass._connection
return super(Version, cls).select(clause, *args, **kw)
+ select = classmethod(select)
def getColumns(columns, cls):
for column, defi in cls.sqlmeta.columnDefinitions.items():
if column.endswith("ID") and isinstance(defi, ForeignKey):
column = column[:-2]
columns[column] = defi.__class__(**defi._kw)
-
+
#ascend heirarchy
if cls.sqlmeta.parentClass:
getColumns(columns, cls.sqlmeta.parentClass)
@@ -52,13 +52,13 @@
self.name = name
self.soClass = soClass
- attrs = {'dateArchived': DateTimeCol(default=datetime.now),
+ attrs = {'dateArchived': DateTimeCol(default=datetime.now),
'master': ForeignKey(self.soClass.__name__),
'masterClass' : self.soClass,
}
-
+
getColumns (attrs, self.soClass)
-
+
self.versionClass = type(self.soClass.__name__+'Versions',
(Version,),
attrs)
Modified: SQLObject/trunk/sqlobject/versioning/test/test_version.py
===================================================================
--- SQLObject/trunk/sqlobject/versioning/test/test_version.py 2007-01-08 21:32:46 UTC (rev 2178)
+++ SQLObject/trunk/sqlobject/versioning/test/test_version.py 2007-01-09 16:14:09 UTC (rev 2179)
@@ -1,8 +1,9 @@
from py.test import raises
from sqlobject import *
-from sqlobject.tests.dbtest import *
+from sqlobject.events import sorted
from sqlobject.inheritance import InheritableSQLObject
from sqlobject.versioning import Versioning
+from sqlobject.tests.dbtest import *
from datetime import datetime
|