Author: ianb
Date: 2006-10-10 14:21:19 -0600 (Tue, 10 Oct 2006)
New Revision: 2005
Modified:
FormEncode/trunk/formencode/formgen.py
FormEncode/trunk/formencode/sqlformgen.py
Log:
Removed/replaced decorator syntax
Modified: FormEncode/trunk/formencode/formgen.py
===================================================================
--- FormEncode/trunk/formencode/formgen.py 2006-10-10 20:18:56 UTC (rev 2004)
+++ FormEncode/trunk/formencode/formgen.py 2006-10-10 20:21:19 UTC (rev 2005)
@@ -9,7 +9,7 @@
pkg_resources.require('RuleDispatch')
import dispatch
-@dispatch.generic()
+#@dispatch.generic()
def makeform(obj, context):
"""
Return ``(field_obj, Schema)``.
@@ -20,3 +20,5 @@
"""
raise NotImplementedError
+makeform = dispatch.generic()(makeform)
+
Modified: FormEncode/trunk/formencode/sqlformgen.py
===================================================================
--- FormEncode/trunk/formencode/sqlformgen.py 2006-10-10 20:18:56 UTC (rev 2004)
+++ FormEncode/trunk/formencode/sqlformgen.py 2006-10-10 20:21:19 UTC (rev 2005)
@@ -8,7 +8,7 @@
from sqlobject import col
-@makeform.when('isinstance(obj, SQLObject) or (isinstance(obj, type) and issubclass(obj, SQLObject))')
+#@makeform.when('isinstance(obj, SQLObject) or (isinstance(obj, type) and issubclass(obj, SQLObject))')
def makeform_new_sqlobject(obj, context):
isinst = isinstance(obj, SQLObject)
sqlmeta = obj.sqlmeta
@@ -43,18 +43,27 @@
restore.pop_attr()
return layout, s
+makeform_new_sqlobject = makeform.when('isinstance(obj, SQLObject) or (isinstance(obj, type) and issubclass(obj, SQLObject))')(makeform_new_sqlobject)
+
def coldesc(col):
return getattr(col, 'description', col.name)
-@makeform.when('isinstance(obj, col.SOStringLikeCol)')
+#@makeform.when('isinstance(obj, col.SOStringLikeCol)')
def makeform_string_col(obj, context):
return fields.Text(context, description=coldesc(obj)), None
-@makeform.when('isinstance(obj, col.SOBoolCol)')
+makeform_string_col = makeform.when('isinstance(obj, col.SOStringLikeCol)')(makeform_string_col)
+
+#@makeform.when('isinstance(obj, col.SOBoolCol)')
def makeform_bool_col(obj, context):
return (fields.Checkbox(context, description=coldesc(obj)),
validators.Bool())
-@makeform.when('isinstance(obj, col.SOForeignKey) and getattr(obj, "editinline", False)')
+makeform_bool_col = makeform.when('isinstance(obj, col.SOBoolCol)')(makeform_bool_col)
+
+#@makeform.when('isinstance(obj, col.SOForeignKey) and getattr(obj, "editinline", False)')
def makeform_foreign(obj, context):
external_class = col.findClass(obj.foreignKey)
+
+makeform_foreign = makeform.when('isinstance(obj, col.SOForeignKey) and getattr(obj, "editinline", False)')(makeform_foreign)
+
|
