From d3f42efe85546cabe3cd2fed6f9f666e0b0a5604 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 25 Jan 2014 18:38:51 +0100 Subject: [PATCH] typo --- tiramisu/setting.py | 1 - tiramisu/storage/sqlalchemy/option.py | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tiramisu/setting.py b/tiramisu/setting.py index 80bd064..b491d47 100644 --- a/tiramisu/setting.py +++ b/tiramisu/setting.py @@ -594,7 +594,6 @@ class Settings(object): # filters the callbacks calc_properties = set() -<<<<<<< HEAD context = self._getcontext() for require in opt.impl_getrequires(): expected = tuple(require.get_expected()) diff --git a/tiramisu/storage/sqlalchemy/option.py b/tiramisu/storage/sqlalchemy/option.py index b3a9042..54c3256 100644 --- a/tiramisu/storage/sqlalchemy/option.py +++ b/tiramisu/storage/sqlalchemy/option.py @@ -36,6 +36,13 @@ SqlAlchemyBase = declarative_base() #____________________________________________________________ # # require + + +#_Base : object dans la base de donnée +# => _RequireOption => il y a une liste d'espect dans _RequireExpected +# => _PropertyOption => liste des propriétés +# => _Information => dictionnaire avec clef valeur +# => _CallbackParam avec des Options require_table = Table('require', SqlAlchemyBase.metadata, Column('left_id', Integer, ForeignKey('requireoption.id')), Column('right_id', Integer, ForeignKey('baseoption.id'))