Commit c59ef581 authored by Yoshinori Okuji's avatar Yoshinori Okuji

Confirm to the naming convention.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1907 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e44fe9b2
......@@ -93,12 +93,12 @@ class Setter(Method):
method(*args, **kw)
if self._reindex: instance.reindexObject()
def _evaluate_tales(instance=None, value=None):
def _evaluateTales(instance=None, value=None):
expression = Expression(value)
econtext = createExpressionContext(instance)
return expression(econtext)
evaluate_tales = CachingMethod(_evaluate_tales, id = 'evaluate_tales', cache_duration=300)
evaluateTales = CachingMethod(_evaluateTales, id = 'evaluateTales', cache_duration=300)
class Getter(Method):
"""
......@@ -134,7 +134,7 @@ class Getter(Method):
value = getattr(instance, self._storage_id, None)
if value is not None:
if self._is_tales_type and kw.get('evaluate', 1):
return evaluate_tales(instance, value)
return evaluateTales(instance, value)
else:
return value
return default
......
......@@ -205,12 +205,12 @@ class SetSetter(Method):
if self._reindex: instance.reindexObject()
def _evaluate_tales(instance=None, value=None):
def _evaluateTales(instance=None, value=None):
expression = Expression(value)
econtext = createExpressionContext(instance)
return expression(econtext)
evaluate_tales = CachingMethod(_evaluate_tales, id = 'evaluate_tales', cache_duration=300)
evaluateTales = CachingMethod(_evaluateTales, id = 'evaluateTales', cache_duration=300)
class DefaultGetter(Method):
"""
......@@ -246,7 +246,7 @@ class DefaultGetter(Method):
if list_value is not None:
if self._is_tales_type:
if kw.get('evaluate', 1):
list_value = evaluate_tales(instance=instance, value=list_value)
list_value = evaluateTales(instance=instance, value=list_value)
else:
return list_value
if len(list_value) > 0:
......@@ -291,7 +291,7 @@ class ListGetter(Method):
if list_value not in self._null:
if self._is_tales_type:
if kw.get('evaluate', 1):
list_value = evaluate_tales(instance=instance, value=list_value)
list_value = evaluateTales(instance=instance, value=list_value)
else:
return list_value
return list(list_value)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment