[grassyknoll commit] r980 - in branches/unhork/grassyknoll: collection/backends/sql lib

[codesite...@google.com]

Author: jemfinch
Date: Fri Jan 2 11:16:31 2009
New Revision: 980

Modified:
branches/unhork/grassyknoll/collection/backends/sql/TableMaker.py
branches/unhork/grassyknoll/lib/Norman.py

Log:
Issue #159: Oops, forgot this part of the last commit, pardon the interim
b0rkedness.

Modified: branches/unhork/grassyknoll/collection/backends/sql/TableMaker.py
==============================================================================
--- branches/unhork/grassyknoll/collection/backends/sql/TableMaker.py
(original)
+++ branches/unhork/grassyknoll/collection/backends/sql/TableMaker.py Fri
Jan 2 11:16:31 2009
@@ -105,10 +105,9 @@

def __init__(self, name):
assert validSqlColumn(name), 'Invalid table name: %r' % name
+ super(Table, self).__init__()
self.name = name
self.multi_indexes = []
- super(Table, self).__init__()
- # Must go after the super call so __fields__ is setup.
self.__id__ = Column('VARCHAR(255)', primary_key=True,
optional=False)

def __setattr__(self, name, value):

Modified: branches/unhork/grassyknoll/lib/Norman.py
==============================================================================
--- branches/unhork/grassyknoll/lib/Norman.py (original)
+++ branches/unhork/grassyknoll/lib/Norman.py Fri Jan 2 11:16:31 2009
@@ -133,13 +133,13 @@
@arg unknown: ignore, delete, error, <callable>. See L{__unknown}.
@type unknown: string
"""
+ Model.Schema.__init__(self)
+ Norman.__init__(self, **kwargs)
assert callable(unknown) or unknown in
('ignore', 'delete', 'error')
self.__unknown = unknown
self.__prohibited = set()
self.__required = []
self.__filled = {}
- Norman.__init__(self, **kwargs)
- Model.Schema.__init__(self)

def __repr__(self):
return '#Object(%r)' % self.__fields__ # Useful for debugging