Infra
/
tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

p8p

This commit is contained in:
Emmanuel Garette 2014-01-20 14:58:48 +01:00
parent 661f844ce6
commit 3b0b3cdfd9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tiramisu/option.py
View File

@ -35,7 +35,6 @@ from tiramisu.autolib import carry_out_calculation
#FIXME : need storage... #FIXME : need storage...
from tiramisu.storage.sqlalchemy.option import StorageBase, StorageOptionDescription from tiramisu.storage.sqlalchemy.option import StorageBase, StorageOptionDescription
from sqlalchemy.ext.declarative import declarative_base, declared_attr
name_regexp = re.compile(r'^\d+') name_regexp = re.compile(r'^\d+')
forbidden_names = ('iter_all', 'iter_group', 'find', 'find_first', forbidden_names = ('iter_all', 'iter_group', 'find', 'find_first',
@ -56,6 +55,8 @@ def valid_name(name):
return False return False
#____________________________________________________________ #____________________________________________________________
# #
class Base(StorageBase): class Base(StorageBase):
def __init__(self, name, doc, default=None, default_multi=None, def __init__(self, name, doc, default=None, default_multi=None,
requires=None, multi=False, callback=None, requires=None, multi=False, callback=None,
@ -1281,7 +1282,6 @@ class OptionDescription(BaseOption, StorageOptionDescription):
self._cache_consistencies[opt] = tuple(cons) self._cache_consistencies[opt] = tuple(cons)
self._readonly = True self._readonly = True
# ____________________________________________________________ # ____________________________________________________________
def impl_set_group_type(self, group_type): def impl_set_group_type(self, group_type):
"""sets a given group object to an OptionDescription """sets a given group object to an OptionDescription

7
tiramisu/storage/sqlalchemy/option.py
View File

@ -17,8 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# ____________________________________________________________ # ____________________________________________________________
from tiramisu.setting import multitypes from tiramisu.i18n import _
from sqlalchemy.ext.declarative import declarative_base, declared_attr from sqlalchemy.ext.declarative import declarative_base, declared_attr
from sqlalchemy import create_engine, Column, Integer, String, Boolean, \ from sqlalchemy import create_engine, Column, Integer, String, Boolean, \
@ -38,6 +37,7 @@ require_table = Table('require', SqlAlchemyBase.metadata,
Column('right_id', Integer, ForeignKey('baseoption.id')) Column('right_id', Integer, ForeignKey('baseoption.id'))
) )
class _RequireExpected(SqlAlchemyBase): class _RequireExpected(SqlAlchemyBase):
__tablename__ = 'expected' __tablename__ = 'expected'
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
@ -218,12 +218,13 @@ class _Base(SqlAlchemyBase):
def _add_callback(self, key, values): def _add_callback(self, key, values):
self._callback_params.append(_CallbackParam(key, values)) self._callback_params.append(_CallbackParam(key, values))
def _add_validator(self, key, values): def _add_validator(self, key, values):
self._validator_params.append(_CallbackParam(key, values)) self._validator_params.append(_CallbackParam(key, values))
def _add_consistency(self, func, all_cons_opts): def _add_consistency(self, func, all_cons_opts):
_Consistency(func, all_cons_opts) _Consistency(func, all_cons_opts)
# ____________________________________________________________ # ____________________________________________________________
# information # information
def impl_set_information(self, key, value): def impl_set_information(self, key, value):