Merge branch 'master' into develop

debian/agpl-3

@@ -1,662 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
-

debian/changelog

@@ -1,5 +0,0 @@
-rougail (0.1) unstable; urgency=low
-
-  * first version
-
- -- Cadoles <contact@cadoles.com>  Tue, 31 Mar 2020 10:40:42 +0200

debian/compat

@@ -1 +0,0 @@
-11

debian/control

@@ -1,14 +0,0 @@
-Source: rougail
-Section: admin
-Priority: extra
-Maintainer: Cadoles <contact@cadoles.com>
-Build-depends: debhelper (>=11), python3-all, python3-setuptools
-Standards-Version: 3.9.4
-Homepage: https://forge.cadoles.com/Infra/rougail
-
-Package: rougail
-Architecture: any
-Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
-Depends: ${python:Depends}, ${misc:Depends}
-Description: configuration manager
-

debian/copyright

@@ -1,22 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: risotto
-Upstream-Contact: Cadoles <contact@cadoles.com>
-Source: https://forge.cadoles.com/Infra/rougail
-
-Files: *
-Copyright: 2019-2020 Cadoles <contact@cadoles.com>
-License: AGPL-3+
-
-License: AGPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU Affero General Public License for more details.
- .
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <https://www.gnu.org/licenses/>.

debian/rougail.dirs

@@ -1,3 +0,0 @@
-/var/rougail/patches
-/var/rougail/templates
-/var/rougail/manifests

debian/rules

@@ -1,10 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#DH_VERBOSE = 1
-
-export PYBUILD_NAME = rougail
-export PYBUILD_DISABLE_python3 = test
-
-%:
-	dh $@ --with python3 --buildsystem=pybuild

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

doc/auto.rst

@@ -1,23 +0,0 @@
-Valeur automatiquement modifiée
-===============================
-
-Une variable avec valeur automatiquement modifiée est une variable dont la valeur sera considéré comme modifié quand le serveur sera déployé.
-
-Voici un variable a valeur automatiquement modifiée :
-
-    <variable name="my_variable" type="oui/non" description="My variable" auto_save="True">
-
-Dans ce cas la valeur est fixée à la valeur actuelle.
-Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
-
-Valeur en lecture seule automatique
-===================================
-
-Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand le serveur sera déployé.
-
-Voici un variable à valeur en lecture seule automatique :
-
-    <variable name="my_variable" type="oui/non" description="My variable" auto_freeze="True">
-
-Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.
-Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.

doc/fill.rst

@@ -1,277 +0,0 @@
-Les variables calculées
-=======================
-
-Une variable calculée est une variable donc sa valeur est le résultat d'une fonction python.
-
-Variable avec une valeur par défaut calculée
---------------------------------------------
-
-Créons une variable de type "oui/non" donc la valeur est retournée par la fonction "return_no" :
-
-    <variables>
-        <family name="family">
-            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="return_no" target="my_calculated_variable"/>
-    </constraints>
-
-Puis créons la fonction "return_no" :
-
-    def return_no():
-        return 'non'
-
-Dans ce cas, la valeur par défaut est la valeur retournée par la fonction (ici "non"), elle sera calculée tant que l'utilisateur n'a pas de spécifié une valeur à cette variable.
-
-Si l'utilisateur à définit une valeur par défaut à "my_calculated_variable" :
-
-    <variable name="my_calculated_variable" type="oui/non" description="My calculated variable">
-        <value>oui</value>
-    </variable>
-
-Cette valeur par défaut sera complètement ignorée.
-
-Variable avec une valeur calculée
----------------------------------
-
-En ajoutant le paramètre "hidden" à "True" dans la variable précédente, l'utilisateur n'aura plus la possibilité de modifié la valeur. La valeur de la variable sera donc systématiquement calculée :
-
-    <variable name="my_calculated_variable" type="oui/non" description="My calculated variable" hidden="True"/>
-
-Si une condition "hidden_if_in" est spécifié à la variable, la valeur sera modifiable par l'utilisateur si elle n'est pas cachée mais elle sera systèmatiquement calculée (même si elle a déjà était modifiée) si la variable est cachée.
-
-Variable avec valeur calculée obligatoire
------------------------------------------
-
-Par défaut les variables calculées ne sont pas des varibles obligatoires.
-Dans ce cas un calcul peut retourner None, mais surtout un utilisateur peut spécifier une valeur nulle à cette variable. Dans ce cas le calcul ne sera pas réalisé.
-
-Fonction avec une valeur fixe comme paramètre positionnel
----------------------------------------------------------
-
-Déclarons un calcul avec paramètre :
-
-    <constraints>
-        <fill name="return_value" target="my_calculated_variable">
-            <param>non</param>
-        </fill>
-    </constraints>
-
-Créons la fonction correspondante :
-
-    def return_value(value):
-        return value
-
-La variable aura donc "non" comme valeur puisque le paramètre aura la valeur fixe "non".
-
-Paramètre nommée
-----------------
-
-Déclarons une contrainte avec un paramètre nommée :
-
-    <constraints>
-        <fill name="return_value" target="my_calculated_variable">
-            <param name="valeur">non</param>
-        </fill>
-    </constraints>
-
-Dans ce cas la fonction return_value sera exécuté avec le paramètre nommé "valeur" dont sa valeur sera "non".
-
-Paramètre avec un nombre
-------------------------
-
-Déclarons un calcul avec paramètre avec un nombre :
-
-    <constraints>
-        <fill name="return_value_with_number" target="my_calculated_variable">
-            <param type="number">1</param>
-        </fill>
-    </constraints>
-
-Créons la fonction correspondante :
-
-    def return_value_with_number(value):
-        if value == 1:
-            return 'non'
-        return 'oui'
-
-La variable aura donc "non" comme valeur puisque le paramètre aura la valeur fixe "1".
-
-Paramètre dont la valeur est issue d'une autre variable
--------------------------------------------------------
-
-Créons deux variables avec une contrainte de type variable qui contient le nom de la variable dont sa valeur sera utilisé comme paramètre :
-
-    <variables>
-        <family name="family">
-            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
-            <variable name="my_variable" type="number" description="My variable">
-                <value>1</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="return_value_with_number" target="my_calculated_variable">
-            <param type="variable">my_variable</param>
-        </fill>
-    </constraints>
-
-Si l'utilisateur laisse la valeur 1 à "my_variable", la valeur par défault de la variable "my_calculated_variable" sera "non".
-Si la valeur de "my_variable" est différent de 1, la valeur par défaut de la variable "my_calculated_variable" sera "oui".
-
-Paramètre dont la valeur est issue d'une information de la configuration
-------------------------------------------------------------------------
-
-Créons une variable et la contrainte :
-
-    <variables>
-        <family name="family">
-            <variable name="my_calculated_variable" type="string" description="My calculated variable"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="return_value" target="my_calculated_variable">
-            <param type="information">server_name</param>
-        </fill>
-    </constraints>
-
-Dans ce cas, l'information de la configuration "server_name" sera utilisé comme valeur de la variable "my_calculated_variable".
-Si l'information n'existe pas, la paramètre aura la valeur "None".
-
-Paramètre avec variable potentiellement non existante
------------------------------------------------------
-
-Suivant le contexte une variable peut exister ou ne pas exister.
-
-Un paramètre de type "variable" peut être "optional" :
-
-    <variables>
-        <family name="family">
-            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="return_value" target="my_calculated_variable">
-            <param type="variable" optional="True">unknow_variable</param>
-        </fill>
-    </constraints>
-
-Dans ce cas la fonction "return_value" est exécuté sans paramètre.
-
-
-Les variables suiveuses
------------------------
-
-FIXME : 
-
-- tests/flattener_dicos/10leadership_append/00-base.xml
-- tests/flattener_dicos/10leadership_auto/00-base.xml
-- tests/flattener_dicos/10leadership_autoleader/00-base.xml
-- tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml
-
-Les variables dynamiques
-------------------------
-
-Paramètre avec variable dynamique
-'''''''''''''''''''''''''''''''''
-
-Il est possible de faire un calcul avec comme paramètre une variable dynamique mais pour une suffix particulier :
-
-    <variables>
-        <family name='family'>
-            <variable name='suffixes' type='string' description="Suffixes of dynamic family" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-            <variable name="my_calculated_variable" type="string" description="My calculated variable"/>
-        </family>
-        <family name='dyn' dynamic="suffixes">
-            <variable name='vardyn' type='string' description="Dynamic variable">
-                <value>val</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="return_value" target="my_calculated_variable">
-            <param type="variable">vardynval1</param>
-        </fill>
-    </constraints>
-
-Dans ce cas, valeur du paramètre de la fonction "return_value" sera la valeur de la variable "vardyn" avec le suffix "val1".
-
-Calcule d'une variable dynamique
-''''''''''''''''''''''''''''''''
-
-Il est également possible de calculer une variable dynamique à partir d'une variable standard :
-
-    <variables>
-        <family name='family'>
-            <variable name='suffixes' type='string' description="Suffixes of dynamic family" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-            <variable name="my_variable" type="string" description="My variable">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="suffixes">
-            <variable name="my_calculated_variable_dyn_" type="string" description="My calculated variable"/>
-                <value>val</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="return_value" target="my_calculated_variable_dyn_">
-            <param type="variable">my_variable</param>
-        </fill>
-    </constraints>
-
-Dans ce cas, les variables dynamiques "my_calculated_variable_dyn_" seront calculés à partir de la valeur de la variable "my_variable".
-Que cela soit pour la variable "my_calculated_variable_dyn_val1" et "my_calculated_variable_dyn_val2".
-
-Par contre, il n'est pas possible de faire un calcul pour une seule des deux variables issues de la variable dynamique.
-Si c'est ce que vous cherchez à faire, il faudra prévoir un traitement particulier dans votre fonction.
-
-Dans ce cas, il faut explicitement demander la valeur du suffix dans la fonction :
-
-    <constraints>
-        <fill name="return_value_suffix" target="my_calculated_variable_dyn_">
-            <param type="variable">my_variable</param>
-            <param type="suffix"/>
-        </fill>
-    </constraints>
-
-Et ainsi faire un traitement spécifique pour ce suffix :
-
-    def return_value_suffix(value, suffix):
-        if suffix == 'val1':
-            return value
-
-Redéfinition des calcules
--------------------------
-
-Dans un premier dictionnaire déclarons notre variable et notre calcule :
-
-    <variables>
-        <family name="family">
-            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="return_no" target="my_calculated_variable"/>
-    </constraints>
-
-Dans un second dictionnaire il est possible de redéfinir le calcul :
-
-    <variables>
-        <family name="family">
-            <variable name="my_calculated_variable" redefine="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="return_yes" target="my_calculated_variable"/>
-    </constraints>
-
-Dans ce cas, à aucun moment la fonction "return_no" ne sera exécuté. Seul la fonction "return_yes" le sera.
-

doc/variable.rst

@@ -1,13 +0,0 @@
-Variable
-========
-
-Variable obligatoire
---------------------
-
-Variable dont une valeur est requise :
-
-    <variables>
-        <family name="family">
-            <variable name="my_variable" type="oui/non" description="My variable" mandatory="True"/>
-        </family>
-    </variables>

src/rougail/annotator.py

@@ -56,6 +56,9 @@ KEY_TYPE = {'variable': 'symlink',
             'URLOption': 'web_address',
             'FilenameOption': 'filename'}
 
+TYPE_PARAM_CHECK = ('string', 'python', 'variable')
+TYPE_PARAM_CONDITION = ('string', 'python', 'number', 'variable')
+TYPE_PARAM_FILL = ('string', 'number', 'variable')
 CONVERSION = {'number': int}
 
 FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie'
@@ -473,11 +476,9 @@ class VariableAnnotator:
                 check.name = 'valid_enum'
                 check.target = path
                 check.namespace = namespace
-                check.param = []
+                param = self.objectspace.param()
-                for value in FORCE_CHOICE[variable.type]:
+                param.text = str(FORCE_CHOICE[variable.type])
-                    param = self.objectspace.param()
+                check.param = [param]
-                    param.text = value
-                    check.param.append(param)
                 if not hasattr(self.objectspace.space, 'constraints'):
                     self.objectspace.space.constraints = self.objectspace.constraints()
                     self.objectspace.space.constraints.namespace = namespace
@@ -626,6 +627,8 @@ class ConstraintAnnotator:
             if hasattr(check, 'param'):
                 param_option_indexes = []
                 for idx, param in enumerate(check.param):
+                    if param.type not in TYPE_PARAM_CHECK:
+                        raise DictConsistencyError(_('cannot use {} type as a param in check for {}').format(param.type, check.target))
                     if param.type == 'variable' and not self.objectspace.paths.path_is_defined(param.text):
                         if param.optional is True:
                             param_option_indexes.append(idx)
@@ -658,50 +661,55 @@ class ConstraintAnnotator:
         remove_indexes = []
         for idx, check in enumerate(self.objectspace.space.constraints.check):
             if check.name == 'valid_enum':
+                if len(check.param) != 1:
+                    raise DictConsistencyError(_(f'cannot set more than one param for valid_enum for variable {check.target}'))
+                param = check.param[0]
                 if check.target in self.valid_enums:
                     raise DictConsistencyError(_(f'valid_enum already set for {check.target}'))
-                if not hasattr(check, 'param'):
+                if param.type not in ['string', 'python', 'number']:
-                    raise DictConsistencyError(_(f'param is mandatory for a valid_enum of variable {check.target}'))
+                    raise DictConsistencyError(_(f'unknown type {param.type} for param in valid_enum for {check.target}'))
                 variable = self.objectspace.paths.get_variable_obj(check.target)
-                values = self.load_params_in_valid_enum(check.param,
+                values = self.load_params_in_validenum(param,
-                                                        variable.name,
+                                                       variable.name,
-                                                        variable.type,
+                                                       variable.type,
-                                                        )
+                                                       )
+                self.valid_enums[check.target] = {'type': param.type,
+                                                  'values': values}
                 self._set_valid_enum(variable,
                                      values,
                                      variable.type,
-                                     check.target
                                      )
                 remove_indexes.append(idx)
         remove_indexes.sort(reverse=True)
         for idx in remove_indexes:
             del self.objectspace.space.constraints.check[idx]
 
-    def load_params_in_valid_enum(self,
+    def load_params_in_validenum(self,
-                                  params,
+                                 param,
-                                  variable_name,
+                                 variable_name,
-                                  variable_type,
+                                 variable_type,
-                                  ):
+                                 ):
-        has_variable = None
+        if not hasattr(param, 'text') and (param.type == 'python' or param.type == 'number'):
-        values = []
+            raise DictConsistencyError(_(f"All '{param.type}' variables shall be set in order to calculate valid_enum for variable {variable_name}"))
-        for param in params:
+        if variable_type == 'string' and param.type == 'number':
-            if param.type == 'variable':
+            raise DictConsistencyError(_(f'Unconsistency valid_enum type ({param.type}), for variable {variable_name}'))
-                if has_variable is not None:
+        if param.type == 'python':
-                    raise DictConsistencyError(_(f'only one "variable" parameter is allowed for valid_enum of variable {variable_name}'))
+            try:
-                has_variable = True
+                values = eval(param.text, {'eosfunc': self.eosfunc, '__builtins__': {'range': range, 'str': str}})
-                variable = self.objectspace.paths.get_variable_obj(param.text)
+            except NameError:
-                if not variable.multi:
+                raise DictConsistencyError(_('The function {} is unknown').format(param.text))
-                    raise DictConsistencyError(_(f'only multi "variable" parameter is allowed for valid_enum of variable {variable_name}'))
+        else:
-                values = param.text
+            try:
-            else:
+                values = literal_eval(param.text)
-                if has_variable:
+            except ValueError:
-                    raise DictConsistencyError(_(f'only one "variable" parameter is allowed for valid_enum of variable {variable_name}'))
+                raise DictConsistencyError(_(f'Cannot load {param.text} in valid_enum'))
-                if not hasattr(param, 'text'):
+        if not isinstance(values, list):
-                    if param.type == 'number':
+            raise DictConsistencyError(_('Function {} shall return a list').format(param.text))
-                        raise DictConsistencyError(_(f'value is mandatory for valid_enum of variable {variable_name}'))
+        for value in values:
-                    values.append(None)
+            if variable_type == 'string' and not isinstance(value, str):
-                else:
+                raise DictConsistencyError(_(f'Cannot load "{param.text}", "{value}" is not a string'))
-                    values.append(param.text)
+            if variable_type == 'number' and not isinstance(value, int):
+                raise DictConsistencyError(_(f'Cannot load "{param.text}", "{value}" is not a number'))
         return values
 
     def check_change_warning(self):
@@ -728,6 +736,9 @@ class ConstraintAnnotator:
 
     def check_params_target(self):
         for condition in self.objectspace.space.constraints.condition:
+            for param in condition.param:
+                if param.type not in TYPE_PARAM_CONDITION:
+                    raise DictConsistencyError(_(f'cannot use {param.type} type as a param in a condition'))
             if not hasattr(condition, 'target'):
                 raise DictConsistencyError(_('target is mandatory in condition'))
             for target in condition.target:
@@ -908,52 +919,40 @@ class ConstraintAnnotator:
                                 variable.property.append(prop)
         del self.objectspace.space.constraints.condition
 
-    def _set_valid_enum(self, variable, values, type_, target):
+    def _set_valid_enum(self, variable, values, type_):
         # value for choice's variable is mandatory
         variable.mandatory = True
         # build choice
         variable.choice = []
-        if isinstance(values, str):
+        choices = []
+        for value in values:
             choice = self.objectspace.choice()
-            choice.type = 'calculation'
+            try:
-            choice.name = values
+                choice.name = CONVERSION.get(type_, str)(value)
+            except:
+                raise DictConsistencyError(_(f'unable to change type of a valid_enum entry "{value}" is not a valid "{type_}" for "{variable.name}"'))
+            if choice.name == '':
+                choice.name = None
+            choices.append(choice.name)
+            choice.type = type_
             variable.choice.append(choice)
-        else:
-            self.valid_enums[target] = {'type': type_,
-                                        'values': values,
-                                        }
-            choices = []
-            for value in values:
-                choice = self.objectspace.choice()
-                try:
-                    if value is not None:
-                        choice.name = CONVERSION.get(type_, str)(value)
-                    else:
-                        choice.name = value
-                except:
-                    raise DictConsistencyError(_(f'unable to change type of a valid_enum entry "{value}" is not a valid "{type_}" for "{variable.name}"'))
-                if choice.name == '':
-                    choice.name = None
-                choices.append(choice.name)
-                choice.type = type_
-                variable.choice.append(choice)
-            # check value or set first choice value has default value
-            if hasattr(variable, 'value'):
-                for value in variable.value:
-                    value.type = type_
-                    try:
-                        cvalue = CONVERSION.get(type_, str)(value.name)
-                    except:
-                        raise DictConsistencyError(_(f'unable to change type of value "{value}" is not a valid "{type_}" for "{variable.name}"'))
-                    if cvalue not in choices:
-                        raise DictConsistencyError(_('value "{}" of variable "{}" is not in list of all expected values ({})').format(value.name, variable.name, choices))
-            else:
-                new_value = self.objectspace.value()
-                new_value.name = choices[0]
-                new_value.type = type_
-                variable.value = [new_value]
         if not variable.choice:
             raise DictConsistencyError(_('empty valid enum is not allowed for variable {}').format(variable.name))
+        # check value or set first choice value has default value
+        if hasattr(variable, 'value'):
+            for value in variable.value:
+                value.type = type_
+                try:
+                    cvalue = CONVERSION.get(type_, str)(value.name)
+                except:
+                    raise DictConsistencyError(_(f'unable to change type of value "{value}" is not a valid "{type_}" for "{variable.name}"'))
+                if cvalue not in choices:
+                    raise DictConsistencyError(_('value "{}" of variable "{}" is not in list of all expected values ({})').format(value.name, variable.name, choices))
+        else:
+            new_value = self.objectspace.value()
+            new_value.name = values[0]
+            new_value.type = type_
+            variable.value = [new_value]
         variable.type = 'choice'
 
     def convert_check(self):
@@ -1021,22 +1020,20 @@ class ConstraintAnnotator:
 
             namespace = fill.namespace
             # let's replace the target by the path
-            fill.target, suffix = self.objectspace.paths.get_variable_path(fill.target,
+            fill.target = self.objectspace.paths.get_variable_path(fill.target,
-                                                                           namespace,
+                                                                   namespace,
-                                                                           with_suffix=True,
+                                                                   )
-                                                                           )
+
-            if suffix is not None:
-                raise DictConsistencyError(_(f'Cannot add fill function to "{fill.target}" only with the suffix "{suffix}"'))
             value = self.objectspace.value()
             value.type = 'calculation'
             value.name = fill.name
             if hasattr(fill, 'param'):
                 param_to_delete = []
                 for fill_idx, param in enumerate(fill.param):
-                    if param.type not in ['suffix', 'string'] and not hasattr(param, 'text'):
+                    if param.type not in TYPE_PARAM_FILL:
-                        raise DictConsistencyError(_(f"All '{param.type}' variables must have a value in order to calculate {fill.target}"))
+                        raise DictConsistencyError(_(f'cannot use {param.type} type as a param in a fill/auto'))
-                    if param.type == 'suffix' and hasattr(param, 'text'):
+                    if param.type != 'string' and not hasattr(param, 'text'):
-                        raise DictConsistencyError(_(f"All '{param.type}' variables must not have a value in order to calculate {fill.target}"))
+                        raise DictConsistencyError(_(f"All '{param.type}' variables shall have a value in order to calculate {fill.target}"))
                     if param.type == 'variable':
                         try:
                             param.text, suffix = self.objectspace.paths.get_variable_path(param.text,
@@ -1139,9 +1136,9 @@ class FamilyAnnotator:
                             if param.type == 'variable':
                                 has_variable = True
                                 break
-                    #if not has_variable:
+                    if not has_variable:
-                    #    # if one parameter is a variable, let variable choice if it's mandatory
+                        # if one parameter is a variable, let variable choice if it's mandatory
-                    #    variable.mandatory = True
+                        variable.mandatory = True
             if has_value:
                 # if has value but without any calculation
                 variable.mandatory = True

src/rougail/data/rougail.dtd

@@ -141,7 +141,7 @@
 <!ATTLIST group description CDATA #IMPLIED>
 
 <!ELEMENT param (#PCDATA)>
-<!ATTLIST param type (string|number|variable|information|suffix) "string">
+<!ATTLIST param type (string|variable|number|python) "string">
 <!ATTLIST param name CDATA #IMPLIED>
 <!ATTLIST param notraisepropertyerror (True|False) "False">
 <!ATTLIST param optional (True|False) "False">

src/rougail/path.py

@@ -191,16 +191,12 @@ class Path:
             if name not in self.variables:
                 for var_name, variable in self.variables.items():
                     if variable['is_dynamic'] and name.startswith(var_name):
-                        if not with_suffix:
-                            raise Exception('This option is dynamic, should use "with_suffix" attribute')
                         return variable, name[len(var_name):]
                 if '.' not in name:
                     for var_name, path in self.full_paths.items():
                         if name.startswith(var_name):
                             variable = self.variables[self.full_paths[var_name]]
                             if variable['is_dynamic']:
-                                if not with_suffix:
-                                    raise Exception('This option is dynamic, should use "with_suffix" attribute')
                                 return variable, name[len(var_name):]
                 raise DictConsistencyError(_('unknown option {}').format(name))
         if with_suffix:

src/rougail/tiramisureflector.py

@@ -252,7 +252,7 @@ class Common:
                 if not self.attrib[key]:
                     continue
                 value = "frozenset({" + self.attrib[key] + "})"
-            elif key in ['default', 'multi', 'suffixes', 'validators', 'values']:
+            elif key in ['default', 'multi', 'suffixes', 'validators']:
                 value = self.attrib[key]
             elif isinstance(value, str) and key != 'opt' and not value.startswith('['):
                 value = "'" + value.replace("'", "\\\'") + "'"
@@ -368,16 +368,9 @@ class Variable(Common):
                 elif tag == 'check':
                     self.attrib['validators'].append(self.calculation_value(child, ['ParamSelfOption()']))
                 elif tag == 'choice':
-                    if child.type == 'calculation':
+                    choices.append(child.name)
-                        value = self.storage.get(child.name).get()
-                        choices = f"Calculation(func.calc_value, Params((ParamOption({value}))))"
-                    else:
-                        choices.append(child.name)
         if choices:
-            if isinstance(choices, list):
+            self.attrib['values'] = tuple(choices)
-                self.attrib['values'] = str(tuple(choices))
-            else:
-                self.attrib['values'] = choices
         if self.attrib['default'] == []:
             del self.attrib['default']
         elif not self.attrib['multi'] and isinstance(self.attrib['default'], list):
@@ -422,10 +415,6 @@ class Variable(Common):
             if hasattr(param, 'suffix'):
                 value['suffix'] = param.suffix
             return self.build_param(value)
-        elif param.type == 'information':
-            return f'ParamInformation("{param.text}", None)'
-        elif param.type == 'suffix':
-            return f'ParamSuffix()'
         raise LoaderError(_('unknown param type {}').format(param.type))
 
     def populate_value(self,

tests/eosfunc/test.py

@@ -1,8 +1,7 @@
 from tiramisu import valid_not_equal, valid_ip_netmask, calc_value
 
 def calc_val(*args, **kwargs):
-    if len(args) > 0:
+    pass
-        return args[0]
 
 
 def concat(*args, **kwargs):
@@ -59,4 +58,4 @@ def device_type(*args, **kwargs):
 
 
 def calc_list(*args, **kwargs):
-    return list(args)
+    return []

tests/flattener_dicos/01auto_base/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}
+{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

tests/flattener_dicos/01fill_autofreeze/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.module_instancie": "non"}
+{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non", "rougail.general.module_instancie": "non"}

tests/flattener_dicos/01fill_autosave/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}
+{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

tests/flattener_dicos/01fill_base/00-base.xml

@@ -5,7 +5,9 @@
 
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change"/>
+            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+                <value>non</value>
+            </variable>
             <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
                 <value>non</value>
             </variable>

tests/flattener_dicos/01fill_base/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}
+{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

tests/flattener_dicos/01fill_base/tiramisu/base.py

@@ -3,7 +3,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
+option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/01fill_base_hidden/00-base.xml

@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-
-    <services/>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <separators/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val" target="mode_conteneur_actif">
-            <param type="variable">mode_conteneur_actif1</param>
-        </fill>
-    </constraints>
-
-    <help/>
-
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/flattener_dicos/01fill_base_hidden/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}

tests/flattener_dicos/01fill_base_hidden/tiramisu/base.py

@@ -1,9 +0,0 @@
-from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-import imp
-func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
-option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
-option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
-option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/01fill_baseaccent/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}
+{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

tests/flattener_dicos/01fill_information/00-base.xml

@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-
-    <services/>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
-        </family>
-        <separators/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val" target="mode_conteneur_actif">
-            <param type="information">info</param>
-        </fill>
-    </constraints>
-
-    <help/>
-
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/flattener_dicos/01fill_information/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "value"}

tests/flattener_dicos/01fill_information_unknown/tiramisu/base.py

@@ -1,8 +0,0 @@
-from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-import imp
-func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamInformation("unknown", None)), kwargs={})))
-option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
-option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
-option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/01fill_mandatory/00-base.xml

@@ -5,7 +5,7 @@
 
     <variables>
         <family name="general" mode="basic">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" mandatory="True" mode="expert"/>
+            <variable name="mode_conteneur_actif" type="domain" description="No change" mandatory="True" mode="expert"/>
             <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
                 <value>non</value>
             </variable>

tests/flattener_dicos/01fill_mandatory/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}
+{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

tests/flattener_dicos/01fill_mandatory/tiramisu/base.py

@@ -3,7 +3,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
+option_3 = DomainnameOption(type='domainname', allow_ip=False, properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/01fill_number/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": 3, "rougail.general.mode_conteneur_actif1": "non"}
+{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

tests/flattener_dicos/01fill_number/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = IntOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={})))
+option_3 = IntOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={})))
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/flattener_dicos/01fill_optional/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}
+{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

tests/flattener_dicos/10autosave_hidden/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": "oui"}
+{"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": null}

tests/flattener_dicos/10autosave_hidden/tiramisu/base.py

@@ -3,7 +3,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})))
+option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden', 'mandatory'}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})))
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": "oui"}
+{"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": null}

tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/base.py

@@ -3,7 +3,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})))
+option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})))
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/10leadership_append/tiramisu/base.py

@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_9 = StrOption(properties=frozenset({'normal'}), name='follower3', doc='follower3', multi=True)
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8, option_9])

tests/flattener_dicos/10leadership_auto/tiramisu/base.py

@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_8 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower3', doc='follower3', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7, option_8])

tests/flattener_dicos/10leadership_autoleader/tiramisu/base.py

@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7])
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])

tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/base.py

@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
-option_6 = StrOption(name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'expert'}), name='follower1', doc='follower1', multi=True)
 option_8 = StrOption(properties=frozenset({'expert'}), name='follower2', doc='follower2', multi=True)
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'expert'}), children=[option_6, option_7, option_8])

tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/base.py

@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'expert'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7])
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])

tests/flattener_dicos/10leadership_familyaccent/tiramisu/base.py

@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7])
 option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4])

tests/flattener_dicos/10leadership_leader_hidden/tiramisu/base.py

@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
-option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower1', doc='follower1', multi=True)
 option_8 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower2', doc='follower2', multi=True)
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'hidden', 'normal'}), children=[option_6, option_7, option_8])

tests/flattener_dicos/10leadership_leadermandatory/tiramisu/base.py

@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'basic', 'mandatory'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'basic'}), children=[option_5, option_6, option_7])
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4])

tests/flattener_dicos/10leadership_multi/tiramisu/base.py

@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8])
 option_10 = StrOption(name='leader1', doc='leader', multi=True)

tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"}
+{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif2": "non"}

tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml

@@ -20,9 +20,7 @@
 
     <constraints>
         <check name="valid_enum" target="condition">
-            <param>tous</param>
+            <param>['tous', 'authentifié', 'aucun']</param>
-            <param>authentifié</param>
-            <param>aucun</param>
         </check>
         <condition name="hidden_if_in" source="condition">
             <param>tous</param>

tests/flattener_dicos/10load_frozenifin_noexist/00-base.xml

@@ -19,9 +19,7 @@
 
     <constraints>
         <check name="valid_enum" target="condition">
-            <param>tous</param>
+            <param>['tous', 'authentifié', 'aucun']</param>
-            <param>authentifié</param>
-            <param>aucun</param>
         </check>
         <condition name='hidden_if_in' source='condition'>
             <param>oui</param>

tests/flattener_dicos/10load_leadership/tiramisu/base.py

@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8])
 option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5])

tests/flattener_dicos/10load_leadership_description/tiramisu/base.py

@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_5 = Leadership(name='leader', doc='other description', properties=frozenset({'normal'}), children=[option_6, option_7, option_8])
 option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5])

tests/flattener_dicos/10load_leadership_submulti/tiramisu/base.py

@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=submulti, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), default_multi=[])
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8])
 option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5])

tests/flattener_dicos/10valid_enum_accent/00-base.xml

@@ -19,10 +19,7 @@
 
     <constraints>
         <check name="valid_enum" target="enumvar">
-            <param>a</param>
+            <param>['a', 'b', 'c', 'é']</param>
-            <param>b</param>
-            <param>c</param>
-            <param>é</param>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_base/00-base.xml

@@ -19,9 +19,7 @@
 
     <constraints>
         <check name="valid_enum" target="enumvar">
-            <param>a</param>
+            <param>['a','b','c']</param>
-            <param>b</param>
-            <param>c</param>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_base_redefine/00-base.xml

@@ -22,14 +22,10 @@
 
     <constraints>
         <check name="valid_enum" target="enumvar">
-            <param>a</param>
+            <param>['a','b','c']</param>
-            <param>b</param>
-            <param>c</param>
         </check>
         <check name="valid_enum" target="enumvar2">
-            <param>a</param>
+            <param>['a','b','c']</param>
-            <param>b</param>
-            <param>c</param>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_base_redefine/01-base.xml

@@ -14,8 +14,7 @@
 
     <constraints>
         <check name="valid_enum" target="enumvar">
-            <param>a</param>
+            <param>['a','c']</param>
-            <param>c</param>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_eosfunc/00-base.xml

@@ -5,15 +5,17 @@
 
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
+            <variable name="mode_conteneur_actif" type="string" description="No change">
+                <value>non</value>
+            </variable>
         </family>
         <separators/>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="mode_conteneur_actif">
+        <check name="valid_enum" target="mode_conteneur_actif">
-            <param type="information">unknown</param>
+            <param type="python">eosfunc.list_files('/notexists', default=['oui', 'non'])</param>
-        </fill>
+        </check>
     </constraints>
 
     <help/>

tests/flattener_dicos/10valid_enum_eosfunc/makedict/base.json

@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "non"}

tests/flattener_dicos/10valid_enum_eosfunc/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = StrOption(properties=frozenset({'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})))
+option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/10valid_enum_leader/00-base.xml

@@ -17,9 +17,7 @@
 
     <constraints>
         <check name="valid_enum" target="follower1">
-            <param>a</param>
+            <param>['a','b','c']</param>
-            <param>b</param>
-            <param>c</param>
         </check>
         <group leader="leader">
             <follower>follower1</follower>

tests/flattener_dicos/10valid_enum_mandatory/00-base.xml

@@ -15,9 +15,7 @@
 
     <constraints>
         <check name="valid_enum" target="enumvar">
-            <param>a</param>
+            <param>['a','b','c']</param>
-            <param>b</param>
-            <param>c</param>
         </check>
     </constraints>
 </rougail>

tests/flattener_dicos/10valid_enum_multi/00-base.xml

@@ -15,9 +15,7 @@
 
     <constraints>
         <check name="valid_enum" target="multi">
-            <param>a</param>
+            <param>['a','b','c']</param>
-            <param>b</param>
-            <param>c</param>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_none/00-base.xml

@@ -19,9 +19,7 @@
 
     <constraints>
         <check name="valid_enum" target="enumvar">
-            <param>a</param>
+            <param>['a','b','']</param>
-            <param>b</param>
-            <param/>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_number/00-base.xml

@@ -17,9 +17,7 @@
 
     <constraints>
         <check name="valid_enum" target="enumvar">
-            <param>1</param>
+            <param>[1, 2, 3]</param>
-            <param>2</param>
-            <param>3</param>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_numberdefault/00-base.xml

@@ -19,9 +19,7 @@
 
     <constraints>
         <check name="valid_enum" target="enumvar">
-            <param>1</param>
+            <param>[1, 2, 3]</param>
-            <param>2</param>
-            <param>3</param>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_python/00-base.xml

@@ -11,7 +11,7 @@
         </family>
         <family name="enumfam" mode="expert">
             <variable name="enumvar" type="string" description="multi">
-                <value>b</value>
+                <value>test</value>
             </variable>
         </family>
         <separators/>
@@ -19,9 +19,7 @@
 
     <constraints>
         <check name="valid_enum" target="enumvar">
-            <param>a</param>
+            <param type="python">eosfunc.calc_multi_val(['test'])</param>
-            <param>b</param>
-            <param></param>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_python/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": "b"}
+{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": "test"}

tests/flattener_dicos/10valid_enum_python/tiramisu/base.py

@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
-option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='b', values=('a', 'b', None))
+option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='test', values=('test',))
 option_5.impl_set_information("help", "bla bla bla")
 option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4])

tests/flattener_dicos/10valid_enum_value/00-base.xml

@@ -14,9 +14,7 @@
 
     <constraints>
         <check name="valid_enum" target="mode_conteneur_actif">
-            <param>a</param>
+            <param>['a','b','c']</param>
-            <param>b</param>
-            <param>c</param>
         </check>
     </constraints>
 

tests/flattener_dicos/10valid_enum_variable/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.varmulti": ["test"], "rougail.enumfam.enumvar": "test"}

tests/flattener_dicos/10valid_enum_variable/tiramisu/base.py

@@ -1,12 +0,0 @@
-from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-import imp
-func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
-option_5 = StrOption(properties=frozenset({'expert', 'force_default_on_freeze', 'frozen', 'hidden'}), name='varmulti', doc='multi', multi=True, default=Calculation(func.calc_list, Params((ParamValue("test")), kwargs={})))
-option_6 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='test', values=Calculation(func.calc_value, Params((ParamOption(option_5)))))
-option_6.impl_set_information("help", "bla bla bla")
-option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5, option_6])
-option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4])
-option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/00-base.xml

@@ -25,8 +25,7 @@
 
     <constraints>
         <check name="valid_enum" target="condition">
-            <param>non</param>
+            <param>['non','statique']</param>
-            <param>statique</param>
         </check>
         <condition name="disabled_if_not_in" source="condition">
             <param>statique</param>

tests/flattener_dicos/20family_dynamic_calc/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": "val", "rougail.dynval2.vardynval2": "val", "rougail.new.newvar": "val"}
+{"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": "val", "rougail.dynval2.vardynval2": "val", "rougail.new.newvar": null}

tests/flattener_dicos/20family_dynamic_fill_dynamic/00-base.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail>
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val" target="vardyn">
-            <param type="variable">newvar</param>
-        </fill>
-    </constraints>
-</rougail>

tests/flattener_dicos/20family_dynamic_fill_dynamic/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": "val", "rougail.dynval2.vardynval2": "val", "rougail.new.newvar": "val"}

tests/flattener_dicos/20family_dynamic_fill_dynamic/tiramisu/base.py

@@ -1,12 +0,0 @@
-from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-import imp
-func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2')
-option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
-option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='newvar', doc='No change', multi=False, default='val')
-option_5 = StrOption(properties=frozenset({'normal'}), name='vardyn', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
-option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), properties=frozenset({'normal'}), children=[option_5])
-option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7])
-option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6])
-option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/00-base.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail>
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val" target="vardyn">
-            <param type="suffix"/>
-        </fill>
-    </constraints>
-</rougail>

tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": "val1", "rougail.dynval2.vardynval2": "val2", "rougail.new.newvar": "val"}

tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/tiramisu/base.py

@@ -1,12 +0,0 @@
-from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-import imp
-func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2')
-option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
-option_5 = StrOption(properties=frozenset({'normal'}), name='vardyn', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamSuffix()), kwargs={})))
-option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), properties=frozenset({'normal'}), children=[option_5])
-option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='newvar', doc='No change', multi=False, default='val')
-option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7])
-option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6])
-option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/flattener_dicos/20family_dynamic_number/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.varname": [1, 2], "rougail.dyn1.vardyn1": "val", "rougail.dyn2.vardyn2": "val", "rougail.new.newvar": "val"}
+{"rougail.general.varname": [1, 2], "rougail.dyn1.vardyn1": "val", "rougail.dyn2.vardyn2": "val", "rougail.new.newvar": null}

tests/flattener_dicos/30mandatory_withoutvalue_fill/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "value"}

tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamInformation("info", None)), kwargs={})))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])