create a new Rougail object

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/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, dh-python
-Standards-Version: 3.9.4
-Homepage: https://forge.cadoles.com/Infra/rougail
-
-Package: python3-rougail
-Architecture: any
-Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
-Depends: ${python:Depends}, ${misc:Depends}, python3-cheetah, python3-tiramisu3
-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)

src/rougail/__init__.py

@@ -1,5 +1,5 @@
 #from .loader import load
-from .objspace import CreoleObjSpace
+from .rougail import Rougail
 from .annotator import modes
 
-__ALL__ = ('CreoleObjSpace', 'modes')
+__ALL__ = ('RougailObjSpace', 'modes')

src/rougail/annotator.py

@@ -1,1293 +0,0 @@
-# coding: utf-8
-from copy import copy
-from typing import List
-
-from collections import OrderedDict
-from os.path import join, basename
-from ast import literal_eval
-import imp
-
-
-from .i18n import _
-from .utils import normalize_family
-from .error import DictConsistencyError
-
-#mode order is important
-modes_level = ('basic', 'normal', 'expert')
-
-
-class Mode(object):
-    def __init__(self, name, level):
-        self.name = name
-        self.level = level
-    def __gt__(self, other):
-        return other.level < self.level
-
-
-def mode_factory():
-    mode_obj = {}
-    for idx in range(len(modes_level)):
-        name = modes_level[idx]
-        mode_obj[name] = Mode(name, idx)
-    return mode_obj
-
-modes = mode_factory()
-
-
-CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
-                  'float': dict(opttype="FloatOption", func=float),
-                  'choice': dict(opttype="ChoiceOption"),
-                  'string': dict(opttype="StrOption"),
-                  'password': dict(opttype="PasswordOption"),
-                  'mail': dict(opttype="EmailOption"),
-                  'boolean': dict(opttype="BoolOption"),
-                  'symlink': dict(opttype="SymLinkOption"),
-                  'filename': dict(opttype="FilenameOption"),
-                  'date': dict(opttype="DateOption"),
-                  'unix_user': dict(opttype="UsernameOption"),
-                  'ip': dict(opttype="IPOption", initkwargs={'allow_reserved': True}),
-                  'local_ip': dict(opttype="IPOption", initkwargs={'private_only': True, 'warnings_only': True}),
-                  'netmask': dict(opttype="NetmaskOption"),
-                  'network': dict(opttype="NetworkOption"),
-                  'broadcast': dict(opttype="BroadcastOption"),
-                  'netbios': dict(opttype="DomainnameOption", initkwargs={'type': 'netbios', 'warnings_only': True}),
-                  'domain': dict(opttype="DomainnameOption", initkwargs={'type': 'domainname', 'allow_ip': False}),
-                  'hostname': dict(opttype="DomainnameOption", initkwargs={'type': 'hostname', 'allow_ip': False}),
-                  'web_address': dict(opttype="URLOption", initkwargs={'allow_ip': True, 'allow_without_dot': True}),
-                  'port': dict(opttype="PortOption", initkwargs={'allow_private': True}),
-                  'mac': dict(opttype="MACOption"),
-                  'cidr': dict(opttype="IPOption", initkwargs={'cidr': True}),
-                  'network_cidr': dict(opttype="NetworkOption", initkwargs={'cidr': True}),
-                  }
-
-
-# a CreoleObjSpace's attribute has some annotations
-# that shall not be present in the exported (flatened) XML
-ERASED_ATTRIBUTES = ('redefine', 'exists', 'fallback', 'optional', 'remove_check', 'namespace',
-                     'remove_condition', 'path', 'instance_mode', 'index', 'is_in_leadership',
-                     'level', 'remove_fill', 'xmlfiles')
-ERASED_CONTAINER_ATTRIBUTES = ('id', 'container', 'group_id', 'group', 'container_group')
-
-FORCE_CHOICE = {'oui/non': ['oui', 'non'],
-                'on/off': ['on', 'off'],
-                'yes/no': ['yes', 'no'],
-                'schedule': ['none', 'daily', 'weekly', 'monthly'],
-                'schedulemod': ['pre', 'post']}
-
-KEY_TYPE = {'variable': 'symlink',
-            'SymLinkOption': 'symlink',
-            'PortOption': 'port',
-            'UnicodeOption': 'string',
-            'NetworkOption': 'network',
-            'NetmaskOption': 'netmask',
-            'URLOption': 'web_address',
-            'FilenameOption': 'filename'}
-
-FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie'
-
-PROPERTIES = ('hidden', 'frozen', 'auto_freeze', 'auto_save', 'force_default_on_freeze',
-              'force_store_value', 'disabled', 'mandatory')
-CONVERT_PROPERTIES = {'auto_save': ['force_store_value'], 'auto_freeze': ['force_store_value', 'auto_freeze']}
-
-RENAME_ATTIBUTES = {'description': 'doc'}
-INTERNAL_FUNCTIONS = ['valid_enum', 'valid_in_network', 'valid_differ', 'valid_entier']
-
-class SpaceAnnotator:
-    """Transformations applied on a CreoleObjSpace instance
-    """
-    def __init__(self, objectspace, eosfunc_file):
-        self.objectspace = objectspace
-        GroupAnnotator(objectspace)
-        ServiceAnnotator(objectspace)
-        VariableAnnotator(objectspace)
-        ConstraintAnnotator(objectspace,
-                            eosfunc_file,
-                            )
-        FamilyAnnotator(objectspace)
-        PropertyAnnotator(objectspace)
-
-
-class GroupAnnotator:
-    def __init__(self,
-                 objectspace,
-                 ):
-        self.objectspace = objectspace
-        if not hasattr(self.objectspace.space, 'constraints') or not hasattr(self.objectspace.space.constraints, 'group'):
-            return
-        self.convert_groups()
-
-    def convert_groups(self):  # pylint: disable=C0111
-        for group in self.objectspace.space.constraints.group:
-            leader_fullname = group.leader
-            leader_family_name = self.objectspace.paths.get_variable_family_name(leader_fullname)
-            leader_name = self.objectspace.paths.get_variable_name(leader_fullname)
-            namespace = self.objectspace.paths.get_variable_namespace(leader_fullname)
-            if '.' not in leader_fullname:
-                leader_fullname = '.'.join([namespace, leader_family_name, leader_fullname])
-            follower_names = list(group.follower.keys())
-            has_a_leader = False
-            ori_leader_family = self.objectspace.paths.get_family_obj(leader_fullname.rsplit('.', 1)[0])
-            for variable in list(ori_leader_family.variable.values()):
-                if has_a_leader:
-                    # it's a follower
-                    self.manage_follower(namespace,
-                                         leader_family_name,
-                                         variable,
-                                         leadership_name,
-                                         follower_names,
-                                         leader_space,
-                                         leader_is_hidden,
-                                         )
-                    ori_leader_family.variable.pop(variable.name)
-                    if follower_names == []:
-                        # no more follower
-                        break
-                elif variable.name == leader_name:
-                    # it's a leader
-                    if isinstance(variable, self.objectspace.Leadership):
-                        # append follower to an existed leadership
-                        leader_space = variable
-                        # if variable.hidden:
-                        #     leader_is_hidden = True
-                    else:
-                        leader_space = self.objectspace.Leadership(variable.xmlfiles)
-                        if hasattr(group, 'name'):
-                            leadership_name = group.name
-                        else:
-                            leadership_name = leader_name
-                        leader_is_hidden = self.manage_leader(leader_space,
-                                                              leader_family_name,
-                                                              leadership_name,
-                                                              leader_name,
-                                                              namespace,
-                                                              variable,
-                                                              group,
-                                                              leader_fullname,
-                                                              )
-                    has_a_leader = True
-            else:
-                raise DictConsistencyError(_('cannot found followers {}').format(follower_names))
-        del self.objectspace.space.constraints.group
-
-    def manage_leader(self,
-                      leader_space: 'Leadership',
-                      leader_family_name: str,
-                      leadership_name: str,
-                      leader_name: str,
-                      namespace: str,
-                      variable: 'Variable',
-                      group: 'Group',
-                      leader_fullname: str,
-                      ) -> None:
-        # manage leader's variable
-        if variable.multi is not True:
-            raise DictConsistencyError(_('the variable {} in a group must be multi').format(variable.name))
-        leader_space.variable = []
-        leader_space.name = leadership_name
-        leader_space.hidden = variable.hidden
-        if variable.hidden:
-            leader_is_hidden = True
-            variable.frozen = True
-            variable.force_default_on_freeze = True
-        else:
-            leader_is_hidden = False
-        variable.hidden = None
-        if hasattr(group, 'description'):
-            leader_space.doc = group.description
-        elif hasattr(variable, 'description'):
-            leader_space.doc = variable.description
-        else:
-            leader_space.doc = variable.name
-        leadership_path = namespace + '.' + leader_family_name + '.' + leadership_name
-        self.objectspace.paths.add_family(namespace,
-                                          leadership_path,
-                                          leader_space,
-                                          )
-        leader_family = self.objectspace.space.variables[namespace].family[leader_family_name]
-        leader_family.variable[leader_name] = leader_space
-        leader_space.variable.append(variable)
-        self.objectspace.paths.set_leader(namespace,
-                                          leader_family_name,
-                                          leader_name,
-                                          leader_name,
-                                          )
-        leader_space.path = leader_fullname
-        return leader_is_hidden
-
-    def manage_follower(self,
-                        namespace: str,
-                        leader_family_name: str,
-                        variable: 'Variable',
-                        leader_name: str,
-                        follower_names: List[str],
-                        leader_space: 'Leadership',
-                        leader_is_hidden: bool,
-                        ) -> None:
-        if variable.name != follower_names[0]:
-            raise DictConsistencyError(_('cannot found this follower {}').format(follower_names[0]))
-        follower_names.remove(variable.name)
-        if leader_is_hidden:
-            variable.frozen = True
-            variable.force_default_on_freeze = True
-        leader_space.variable.append(variable)  # pylint: disable=E1101
-        self.objectspace.paths.set_leader(namespace,
-                                          leader_family_name,
-                                          variable.name,
-                                          leader_name,
-                                          )
-
-
-class ServiceAnnotator:
-    """Manage service's object
-    for example::
-        <services>
-            <service name="test">
-                <service_access service='ntp'>
-                    <port protocol='udp' service_accesslist='ntp_udp'>123</port>
-                </service_access>
-            </service>
-        </services>
-    """
-    def __init__(self, objectspace):
-        self.objectspace = objectspace
-        self.convert_services()
-
-    def convert_services(self):
-        if not hasattr(self.objectspace.space, 'services'):
-            return
-        if not hasattr(self.objectspace.space.services, 'service'):
-            del self.objectspace.space.services
-            return
-        self.objectspace.space.services.hidden = True
-        self.objectspace.space.services.name = 'services'
-        self.objectspace.space.services.doc = 'services'
-        families = {}
-        for idx, service_name in enumerate(self.objectspace.space.services.service.keys()):
-            service = self.objectspace.space.services.service[service_name]
-            new_service = self.objectspace.service(service.xmlfiles)
-            for elttype, values in vars(service).items():
-                if not isinstance(values, (dict, list)) or elttype in ERASED_ATTRIBUTES:
-                    setattr(new_service, elttype, values)
-                    continue
-                eltname = elttype + 's'
-                path = '.'.join(['services', service_name, eltname])
-                family = self.gen_family(eltname,
-                                         path,
-                                         service.xmlfiles,
-                                         )
-                if isinstance(values, dict):
-                    values = list(values.values())
-                family.family = self.make_group_from_elts(service_name,
-                                                          elttype,
-                                                          values,
-                                                          path,
-                                                          )
-                setattr(new_service, elttype, family)
-            new_service.doc = new_service.name
-            families[service_name] = new_service
-        self.objectspace.space.services.service = families
-
-    def gen_family(self,
-                   name,
-                   path,
-                   xmlfiles
-                   ):
-        family = self.objectspace.family(xmlfiles)
-        family.name = normalize_family(name)
-        family.doc = name
-        family.mode = None
-        self.objectspace.paths.add_family('services',
-                                          path,
-                                          family,
-                                          )
-        return family
-
-    def make_group_from_elts(self,
-                             service_name,
-                             name,
-                             elts,
-                             path,
-                             ):
-        """Splits each objects into a group (and `OptionDescription`, in tiramisu terms)
-        and build elements and its attributes (the `Options` in tiramisu terms)
-        """
-        families = []
-        new_elts = self._reorder_elts(name,
-                                      elts,
-                                      )
-        for index, elt_info in enumerate(new_elts):
-            elt = elt_info['elt']
-            elt_name = elt_info['elt_name']
-
-            # try to launch _update_xxxx() function
-            update_elt = '_update_' + elt_name
-            if hasattr(self, update_elt):
-                getattr(self, update_elt)(elt,
-                                          index,
-                                          path,
-                                          service_name,
-                                          )
-
-            idx = 0
-            while True:
-                if hasattr(elt, 'source'):
-                    c_name = elt.source
-                else:
-                    c_name = elt.name
-                if idx:
-                    c_name += f'_{idx}'
-                subpath = '{}.{}'.format(path, c_name)
-                if not self.objectspace.paths.family_is_defined(subpath):
-                    break
-                idx += 1
-            family = self.gen_family(c_name,
-                                     subpath,
-                                     elt.xmlfiles,
-                                     )
-            family.variable = []
-            listname = '{}list'.format(name)
-            activate_path = '.'.join([subpath, 'activate'])
-            for key in dir(elt):
-                if key.startswith('_') or key.endswith('_type') or key in ERASED_ATTRIBUTES:
-                    continue
-                value = getattr(elt, key)
-                if key == listname:
-                    self.objectspace.list_conditions.setdefault(listname,
-                                                                {}).setdefault(
-                                                                    value,
-                                                                    []).append(activate_path)
-                    continue
-                family.variable.append(self._generate_element(elt_name,
-                                                              key,
-                                                              value,
-                                                              elt,
-                                                              f'{subpath}.{key}'
-                                                              ))
-            # FIXME ne devrait pas etre True par défaut
-            # devrait etre un calcule
-            family.variable.append(self._generate_element(elt_name,
-                                                         'activate',
-                                                          True,
-                                                          elt,
-                                                          activate_path,
-                                                          ))
-            families.append(family)
-        return families
-
-    def _generate_element(self,
-                          elt_name,
-                          key,
-                          value,
-                          elt,
-                          path,
-                          ):
-        variable = self.objectspace.variable(elt.xmlfiles)
-        variable.name = normalize_family(key)
-        variable.mode = None
-        if key == 'name':
-            true_key = elt_name
-        else:
-            true_key = key
-        dtd_key_type = true_key + '_type'
-        if key == 'activate':
-            type_ = 'boolean'
-        elif hasattr(elt, dtd_key_type):
-            type_ = KEY_TYPE[getattr(elt, dtd_key_type)]
-        elif key in self.objectspace.booleans_attributs:
-            type_ = 'boolean'
-        else:
-            type_ = 'string'
-        variable.type = type_
-        if type_ == 'symlink':
-            variable.opt = self.objectspace.paths.get_variable_path(value,
-                                                                    'services',
-                                                                    )
-#            variable.opt = value
-            variable.multi = None
-        else:
-            variable.doc = key
-            val = self.objectspace.value(elt.xmlfiles)
-            val.type = type_
-            val.name = value
-            variable.value = [val]
-        self.objectspace.paths.add_variable('services',
-                                            path,
-                                            'service',
-                                            False,
-                                            variable,
-                                            )
-        return variable
-
-    def _reorder_elts(self,
-                      name,
-                      elts,
-                      ):
-        """Reorders by index the elts
-        """
-        new_elts = {}
-        # reorder elts by index
-        for idx, elt in enumerate(elts):
-            new_elts.setdefault(idx, []).append(elt)
-        idxes = list(new_elts.keys())
-        idxes.sort()
-        result_elts = []
-        for idx in idxes:
-            for elt in new_elts[idx]:
-                result_elts.append({'elt_name': name, 'elt': elt})
-        return result_elts
-
-    def _update_override(self,
-                         file_,
-                         index,
-                         service_path,
-                         service_name,
-                         ):
-        file_.name = f'/systemd/system/{service_name}.service.d/rougail.conf'
-        # retrieve default value from File object
-        for attr in ['owner', 'group', 'mode']:
-            setattr(file_, attr, getattr(self.objectspace.file, attr))
-        if not hasattr(file_, 'source'):
-            file_.source = f'{service_name}.service'
-        self._update_file(file_,
-                          index,
-                          service_path,
-                          service_name,
-                          )
-
-    def _update_file(self,
-                     file_,
-                     index,
-                     service_path,
-                     service_name,
-                     ):
-        if not hasattr(file_, 'file_type') or file_.file_type == "UnicodeOption":
-            if not hasattr(file_, 'source'):
-                file_.source = basename(file_.name)
-        elif not hasattr(file_, 'source'):
-            raise DictConsistencyError(_('attribute source mandatory for file with variable name '
-                                               'for {}').format(file_.name))
-
-
-class VariableAnnotator:
-    def __init__(self,
-                 objectspace,
-                 ):
-        self.objectspace = objectspace
-        self.convert_variable()
-        self.convert_helps()
-        self.convert_auto_freeze()
-        self.convert_separators()
-
-    def convert_variable(self):
-        def _convert_variable(variable,
-                              variable_type,
-                              ):
-            if not hasattr(variable, 'type'):
-                variable.type = 'string'
-            if variable.type != 'symlink' and not hasattr(variable, 'description'):
-                variable.description = variable.name
-            if hasattr(variable, 'value'):
-                for value in variable.value:
-                    if not hasattr(value, 'type'):
-                        value.type = variable.type
-                    value.name = CONVERT_OPTION.get(value.type, {}).get('func', str)(value.name)
-            for key, value in RENAME_ATTIBUTES.items():
-                setattr(variable, value, getattr(variable, key))
-                setattr(variable, key, None)
-            if variable_type == 'follower':
-                if variable.multi is True:
-                    variable.multi = 'submulti'
-                else:
-                    variable.multi = True
-
-        def _convert_valid_enum(namespace,
-                                variable,
-                                path,
-                                ):
-            if variable.type in FORCE_CHOICE:
-                check = self.objectspace.check(variable.xmlfiles)
-                check.name = 'valid_enum'
-                check.target = path
-                check.namespace = namespace
-                check.param = []
-                for value in FORCE_CHOICE[variable.type]:
-                    param = self.objectspace.param(variable.xmlfiles)
-                    param.text = value
-                    check.param.append(param)
-                if not hasattr(self.objectspace.space, 'constraints'):
-                    self.objectspace.space.constraints = self.objectspace.constraints(variable.xmlfiles)
-                    self.objectspace.space.constraints.namespace = namespace
-                if not hasattr(self.objectspace.space.constraints, 'check'):
-                    self.objectspace.space.constraints.check = []
-                self.objectspace.space.constraints.check.append(check)
-                variable.type = 'string'
-
-        def _valid_type(variable):
-            if variable.type not in CONVERT_OPTION:
-                xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
-                raise DictConsistencyError(_(f'unvalid type "{variable.type}" for variable "{variable.name}" in {xmlfiles}'))
-
-        if not hasattr(self.objectspace.space, 'variables'):
-            return
-        for families in self.objectspace.space.variables.values():
-            namespace = families.name
-            if hasattr(families, 'family'):
-                families.doc = families.name
-                for family in families.family.values():
-                    family.doc = family.name
-                    for key, value in RENAME_ATTIBUTES.items():
-                        if hasattr(family, key):
-                            setattr(family, value, getattr(family, key))
-                            setattr(family, key, None)
-                    family.name = normalize_family(family.name)
-                    if hasattr(family, 'variable'):
-                        for variable in family.variable.values():
-                            if isinstance(variable, self.objectspace.Leadership):
-                                for idx, follower in enumerate(variable.variable):
-                                    if idx == 0:
-                                        variable_type = 'master'
-                                    else:
-                                        variable_type = 'follower'
-                                    path = '{}.{}.{}.{}'.format(namespace, normalize_family(family.name), variable.name, follower.name)
-                                    _convert_variable(follower,
-                                                      variable_type,
-                                                      )
-                                    _convert_valid_enum(namespace,
-                                                        follower,
-                                                        path,
-                                                        )
-                                    _valid_type(follower)
-                            else:
-                                path = '{}.{}.{}'.format(namespace, normalize_family(family.name), variable.name)
-                                _convert_variable(variable,
-                                                  'variable',
-                                                  )
-                                _convert_valid_enum(namespace,
-                                                    variable,
-                                                    path,
-                                                    )
-                                _valid_type(variable)
-
-    def convert_helps(self):
-        if not hasattr(self.objectspace.space, 'help'):
-            return
-        helps = self.objectspace.space.help
-        if hasattr(helps, 'variable'):
-            for hlp in helps.variable.values():
-                variable = self.objectspace.paths.get_variable_obj(hlp.name)
-                variable.help = hlp.text
-        if hasattr(helps, 'family'):
-            for hlp in helps.family.values():
-                variable = self.objectspace.paths.get_family_obj(hlp.name)
-                variable.help = hlp.text
-        del self.objectspace.space.help
-
-    def convert_auto_freeze(self):  # pylint: disable=C0111
-        def _convert_auto_freeze(variable, namespace):
-            if variable.auto_freeze:
-                new_condition = self.objectspace.condition(variable.xmlfiles)
-                new_condition.name = 'auto_hidden_if_not_in'
-                new_condition.namespace = namespace
-                new_condition.source = FREEZE_AUTOFREEZE_VARIABLE
-                new_param = self.objectspace.param(variable.xmlfiles)
-                new_param.text = 'oui'
-                new_condition.param = [new_param]
-                new_target = self.objectspace.target(variable.xmlfiles)
-                new_target.type = 'variable'
-                path = variable.namespace + '.' + normalize_family(family.name) + '.' + variable.name
-                new_target.name = path
-                new_condition.target = [new_target]
-                if not hasattr(self.objectspace.space.constraints, 'condition'):
-                    self.objectspace.space.constraints.condition = []
-                self.objectspace.space.constraints.condition.append(new_condition)
-        if hasattr(self.objectspace.space, 'variables'):
-            for variables in self.objectspace.space.variables.values():
-                if hasattr(variables, 'family'):
-                    namespace = variables.name
-                    for family in variables.family.values():
-                        if hasattr(family, 'variable'):
-                            for variable in family.variable.values():
-                                if isinstance(variable, self.objectspace.Leadership):
-                                    for follower in variable.variable:
-                                        _convert_auto_freeze(follower, namespace)
-                                else:
-                                    _convert_auto_freeze(variable, namespace)
-
-    def convert_separators(self):  # pylint: disable=C0111,R0201
-        if not hasattr(self.objectspace.space, 'variables'):
-            return
-        for family in self.objectspace.space.variables.values():
-            if not hasattr(family, 'separators'):
-                continue
-            if hasattr(family.separators, 'separator'):
-                for idx, separator in enumerate(family.separators.separator):
-                    option = self.objectspace.paths.get_variable_obj(separator.name)
-                    if hasattr(option, 'separator'):
-                        subpath = self.objectspace.paths.get_variable_path(separator.name,
-                                                                           separator.namespace,
-                                                                           )
-                        xmlfiles = self.objectspace.display_xmlfiles(separator.xmlfiles)
-                        raise DictConsistencyError(_(f'{subpath} already has a separator in {xmlfiles}'))
-                    option.separator = separator.text
-            del family.separators
-
-
-class ConstraintAnnotator:
-    def __init__(self,
-                 objectspace,
-                 eosfunc_file,
-                 ):
-        if not hasattr(objectspace.space, 'constraints'):
-            return
-        self.objectspace = objectspace
-        eosfunc = imp.load_source('eosfunc', eosfunc_file)
-        self.functions = dir(eosfunc)
-        self.functions.extend(INTERNAL_FUNCTIONS)
-        self.valid_enums = {}
-        if hasattr(self.objectspace.space.constraints, 'check'):
-            self.check_check()
-            self.check_replace_text()
-            self.check_valid_enum()
-            self.check_change_warning()
-            self.convert_check()
-        if hasattr(self.objectspace.space.constraints, 'condition'):
-            self.check_params_target()
-            self.filter_targets()
-            self.convert_xxxlist_to_variable()
-            self.check_condition_fallback_optional()
-            self.check_choice_option_condition()
-            self.remove_condition_with_empty_target()
-            self.convert_condition()
-        if hasattr(self.objectspace.space.constraints, 'fill'):
-            self.convert_fill()
-        self.remove_constraints()
-
-    def check_check(self):
-        remove_indexes = []
-        for check_idx, check in enumerate(self.objectspace.space.constraints.check):
-            if not check.name in self.functions:
-                xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
-                raise DictConsistencyError(_(f'cannot find check function "{check.name}" in {xmlfiles}'))
-            if hasattr(check, 'param'):
-                param_option_indexes = []
-                for idx, param in enumerate(check.param):
-                    if param.type == 'variable' and not self.objectspace.paths.path_is_defined(param.text):
-                        if param.optional is True:
-                            param_option_indexes.append(idx)
-                        else:
-                            xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
-                            raise DictConsistencyError(_(f'cannot find check param "{param.text}" in {xmlfiles}'))
-                    if param.type != 'variable':
-                        param.notraisepropertyerror = None
-                param_option_indexes = list(set(param_option_indexes))
-                param_option_indexes.sort(reverse=True)
-                for idx in param_option_indexes:
-                    check.param.pop(idx)
-                if check.param == []:
-                    remove_indexes.append(check_idx)
-        remove_indexes.sort(reverse=True)
-        for idx in remove_indexes:
-            del self.objectspace.space.constraints.check[idx]
-
-    def check_replace_text(self):
-        for check_idx, check in enumerate(self.objectspace.space.constraints.check):
-            namespace = check.namespace
-            if hasattr(check, 'param'):
-                for idx, param in enumerate(check.param):
-                    if param.type == 'variable':
-                        param.text = self.objectspace.paths.get_variable_path(param.text, namespace)
-            check.is_in_leadership = self.objectspace.paths.get_leader(check.target) != None
-            # let's replace the target by the path
-            check.target = self.objectspace.paths.get_variable_path(check.target, namespace)
-
-    def check_valid_enum(self):
-        remove_indexes = []
-        for idx, check in enumerate(self.objectspace.space.constraints.check):
-            if check.name == 'valid_enum':
-                if check.target in self.valid_enums:
-                    raise DictConsistencyError(_(f'valid_enum already set for {check.target}'))
-                if not hasattr(check, 'param'):
-                    raise DictConsistencyError(_(f'param is mandatory for a valid_enum of variable {check.target}'))
-                variable = self.objectspace.paths.get_variable_obj(check.target)
-                values = self.load_params_in_valid_enum(check.param,
-                                                        variable.name,
-                                                        variable.type,
-                                                        )
-                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,
-                                  params,
-                                  variable_name,
-                                  variable_type,
-                                  ):
-        has_variable = None
-        values = []
-        for param in params:
-            if param.type == 'variable':
-                if has_variable is not None:
-                    raise DictConsistencyError(_(f'only one "variable" parameter is allowed for valid_enum of variable {variable_name}'))
-                has_variable = True
-                variable = self.objectspace.paths.get_variable_obj(param.text)
-                if not variable.multi:
-                    raise DictConsistencyError(_(f'only multi "variable" parameter is allowed for valid_enum of variable {variable_name}'))
-                values = param.text
-            else:
-                if has_variable:
-                    raise DictConsistencyError(_(f'only one "variable" parameter is allowed for valid_enum of variable {variable_name}'))
-                if not hasattr(param, 'text'):
-                    if param.type == 'number':
-                        raise DictConsistencyError(_(f'value is mandatory for valid_enum of variable {variable_name}'))
-                    values.append(None)
-                else:
-                    values.append(param.text)
-        return values
-
-    def check_change_warning(self):
-        #convert level to "warnings_only"
-        for check in self.objectspace.space.constraints.check:
-            if check.level == 'warning':
-                check.warnings_only = True
-            else:
-                check.warnings_only = False
-            check.level = None
-
-    def _get_family_variables_from_target(self,
-                                          target,
-                                          ):
-        if target.type == 'variable':
-            variable = self.objectspace.paths.get_variable_obj(target.name)
-            family = self.objectspace.paths.get_family_obj(target.name.rsplit('.', 1)[0])
-            if isinstance(family, self.objectspace.Leadership) and family.name == variable.name:
-                return family, family.variable
-            return variable, [variable]
-        # it's a family
-        variable = self.objectspace.paths.get_family_obj(target.name)
-        return variable, list(variable.variable.values())
-
-    def check_params_target(self):
-        for condition in self.objectspace.space.constraints.condition:
-            if not hasattr(condition, 'target'):
-                raise DictConsistencyError(_('target is mandatory in condition'))
-            for target in condition.target:
-                if target.type.endswith('list') and condition.name not in ['disabled_if_in', 'disabled_if_not_in']:
-                    raise DictConsistencyError(_(f'target in condition for {target.type} not allow in {condition.name}'))
-
-    def filter_targets(self):  # pylint: disable=C0111
-        for condition_idx, condition in enumerate(self.objectspace.space.constraints.condition):
-            namespace = condition.namespace
-            for idx, target in enumerate(condition.target):
-                if target.type == 'variable':
-                    if condition.source == target.name:
-                        raise DictConsistencyError(_('target name and source name must be different: {}').format(condition.source))
-                    try:
-                        target.name = self.objectspace.paths.get_variable_path(target.name, namespace)
-                    except DictConsistencyError:
-                        # for optional variable
-                        pass
-                elif target.type == 'family':
-                    try:
-                        target.name = self.objectspace.paths.get_family_path(target.name, namespace)
-                    except KeyError:
-                        raise DictConsistencyError(_('cannot found family {}').format(target.name))
-
-    def convert_xxxlist_to_variable(self):  # pylint: disable=C0111
-        # transform *list to variable or family
-        for condition_idx, condition in enumerate(self.objectspace.space.constraints.condition):
-            new_targets = []
-            remove_targets = []
-            for target_idx, target in enumerate(condition.target):
-                if target.type.endswith('list'):
-                    listname = target.type
-                    listvars = self.objectspace.list_conditions.get(listname,
-                                                                    {}).get(target.name)
-                    if listvars:
-                        for listvar in listvars:
-                            variable = self.objectspace.paths.get_variable_obj(listvar)
-                            type_ = 'variable'
-                            new_target = self.objectspace.target(variable.xmlfiles)
-                            new_target.type = type_
-                            new_target.name = listvar
-                            new_target.index = target.index
-                            new_targets.append(new_target)
-                    remove_targets.append(target_idx)
-            remove_targets.sort(reverse=True)
-            for target_idx in remove_targets:
-                condition.target.pop(target_idx)
-            condition.target.extend(new_targets)
-
-    def check_condition_fallback_optional(self):
-        # a condition with a fallback **and** the source variable doesn't exist
-        remove_conditions = []
-        for idx, condition in enumerate(self.objectspace.space.constraints.condition):
-            # fallback
-            if condition.fallback is True and not self.objectspace.paths.path_is_defined(condition.source):
-                apply_action = False
-                if condition.name in ['disabled_if_in', 'mandatory_if_in', 'hidden_if_in']:
-                    apply_action = not condition.force_condition_on_fallback
-                else:
-                    apply_action = condition.force_inverse_condition_on_fallback
-                if apply_action:
-                    actions = self._get_condition_actions(condition.name)
-                    for target in condition.target:
-                        leader_or_variable, variables = self._get_family_variables_from_target(target)
-                        for action_idx, action in enumerate(actions):
-                            if action_idx == 0:
-                                setattr(leader_or_variable, action, True)
-                            else:
-                                for variable in variables:
-                                    setattr(variable, action, True)
-                remove_conditions.append(idx)
-                continue
-
-            remove_targets = []
-            # optional
-            for idx, target in enumerate(condition.target):
-                if target.optional is True and not self.objectspace.paths.path_is_defined(target.name):
-                    remove_targets.append(idx)
-            remove_targets = list(set(remove_targets))
-            remove_targets.sort(reverse=True)
-            for idx in remove_targets:
-                condition.target.pop(idx)
-        remove_conditions = list(set(remove_conditions))
-        remove_conditions.sort(reverse=True)
-        for idx in remove_conditions:
-            self.objectspace.space.constraints.condition.pop(idx)
-
-    def _get_condition_actions(self, condition_name):
-        if condition_name.startswith('disabled_if_'):
-            return ['disabled']
-        elif condition_name.startswith('hidden_if_'):
-            return ['hidden', 'frozen', 'force_default_on_freeze']
-        elif condition_name.startswith('mandatory_if_'):
-            return ['mandatory']
-        elif condition_name == 'auto_hidden_if_not_in':
-            return ['auto_frozen']
-
-    def check_choice_option_condition(self):
-        # remove condition for ChoiceOption that don't have param
-        remove_conditions = []
-        for condition_idx, condition in enumerate(self.objectspace.space.constraints.condition):
-            namespace = condition.namespace
-            condition.source = self.objectspace.paths.get_variable_path(condition.source, namespace, allow_source=True)
-            src_variable = self.objectspace.paths.get_variable_obj(condition.source)
-            valid_enum = None
-            if condition.source in self.valid_enums and self.valid_enums[condition.source]['type'] == 'string':
-                valid_enum = self.valid_enums[condition.source]['values']
-            if valid_enum is not None:
-                remove_param = []
-                for param_idx, param in enumerate(condition.param):
-                    if param.text not in valid_enum:
-                        remove_param.append(param_idx)
-                remove_param.sort(reverse=True)
-                for idx in remove_param:
-                    del condition.param[idx]
-                if condition.param == []:
-                    remove_targets = []
-                    for target in condition.target:
-                        leader_or_variable, variables = self._get_family_variables_from_target(target)
-                        if condition.name == 'disabled_if_not_in':
-                            leader_or_variable.disabled = True
-                        elif condition.name == 'hidden_if_not_in':
-                            leader_or_variable.hidden = True
-                            for variable in variables:
-                                variable.frozen = True
-                                variable.force_default_on_freeze = True
-                        elif condition.name == 'mandatory_if_not_in':
-                            variable.mandatory = True
-                    remove_targets = list(set(remove_targets))
-                    remove_targets.sort(reverse=True)
-                    for target_idx in remove_targets:
-                        condition.target.pop(target_idx)
-                    remove_conditions.append(condition_idx)
-        remove_conditions = list(set(remove_conditions))
-        remove_conditions.sort(reverse=True)
-        for idx in remove_conditions:
-            self.objectspace.space.constraints.condition.pop(idx)
-
-    def remove_condition_with_empty_target(self):
-        remove_conditions = []
-        for condition_idx, condition in enumerate(self.objectspace.space.constraints.condition):
-            if not condition.target:
-                remove_conditions.append(condition_idx)
-        remove_conditions = list(set(remove_conditions))
-        remove_conditions.sort(reverse=True)
-        for idx in remove_conditions:
-            self.objectspace.space.constraints.condition.pop(idx)
-
-    def convert_condition(self):
-        for condition in self.objectspace.space.constraints.condition:
-            inverse = condition.name.endswith('_if_not_in')
-            actions = self._get_condition_actions(condition.name)
-            for param in condition.param:
-                if hasattr(param, 'text'):
-                    param = param.text
-                else:
-                    param = None
-                for target in condition.target:
-                    leader_or_variable, variables = self._get_family_variables_from_target(target)
-                    # if option is already disable, do not apply disable_if_in
-                    if hasattr(leader_or_variable, actions[0]) and getattr(leader_or_variable, actions[0]) is True:
-                        continue
-                    for idx, action in enumerate(actions):
-                        prop = self.objectspace.property_(leader_or_variable.xmlfiles)
-                        prop.type = 'calculation'
-                        prop.inverse = inverse
-                        prop.source = condition.source
-                        prop.expected = param
-                        prop.name = action
-                        if idx == 0:
-                            if not hasattr(leader_or_variable, 'property'):
-                                leader_or_variable.property = []
-                            leader_or_variable.property.append(prop)
-                        else:
-                            for variable in variables:
-                                if not hasattr(variable, 'property'):
-                                    variable.property = []
-                                variable.property.append(prop)
-        del self.objectspace.space.constraints.condition
-
-    def _set_valid_enum(self, variable, values, type_, target):
-        # value for choice's variable is mandatory
-        variable.mandatory = True
-        # build choice
-        variable.choice = []
-        if isinstance(values, str):
-            choice = self.objectspace.choice()
-            choice.type = 'calculation'
-            choice.name = values
-            variable.choice.append(choice)
-        else:
-            self.valid_enums[target] = {'type': type_,
-                                        'values': values,
-                                        }
-            choices = []
-            for value in values:
-                choice = self.objectspace.choice(variable.xmlfiles)
-                try:
-                    if value is not None:
-                        choice.name = CONVERT_OPTION[type_].get('func', 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 = CONVERT_OPTION[type_].get('func', 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(variable.xmlfiles)
-                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))
-        variable.type = 'choice'
-
-    def convert_check(self):
-        for check in self.objectspace.space.constraints.check:
-            variable = self.objectspace.paths.get_variable_obj(check.target)
-            name = check.name
-            if name == 'valid_entier':
-                if not hasattr(check, 'param'):
-                    raise DictConsistencyError(_('{} must have, at least, 1 param').format(name))
-                for param in check.param:
-                    if param.type not in ['string', 'number']:
-                        raise DictConsistencyError(_(f'param in "valid_entier" must not be a "{param.type}"'))
-                    if param.name == 'mini':
-                        variable.min_number = int(param.text)
-                    elif param.name == 'maxi':
-                        variable.max_number = int(param.text)
-                    else:
-                        raise DictConsistencyError(_(f'unknown parameter {param.text} in check "valid_entier" for variable {check.target}'))
-            else:
-                check_ = self.objectspace.check(variable.xmlfiles)
-                if name == 'valid_differ':
-                    name = 'valid_not_equal'
-                elif name == 'valid_network_netmask':
-                    params_len = 1
-                    if len(check.param) != params_len:
-                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
-                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'))
-                elif name == 'valid_ipnetmask':
-                    params_len = 1
-                    if len(check.param) != params_len:
-                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
-                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'))
-                    name = 'valid_ip_netmask'
-                elif name == 'valid_broadcast':
-                    params_len = 2
-                    if len(check.param) != params_len:
-                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
-                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'))
-                elif name == 'valid_in_network':
-                    if len(check.param) not in (1, 2):
-                        params_len = 2
-                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
-                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'))
-                check_.name = name
-                check_.warnings_only = check.warnings_only
-                if hasattr(check, 'param'):
-                    check_.param = check.param
-                if not hasattr(variable, 'check'):
-                    variable.check = []
-                variable.check.append(check_)
-        del self.objectspace.space.constraints.check
-
-    def convert_fill(self):  # pylint: disable=C0111,R0912
-        # sort fill/auto by index
-        fills = {fill.index: fill for idx, fill in enumerate(self.objectspace.space.constraints.fill)}
-        indexes = list(fills.keys())
-        indexes.sort()
-        targets = []
-        for idx in indexes:
-            fill = fills[idx]
-            # test if it's redefined calculation
-            if fill.target in targets and not fill.redefine:
-                raise DictConsistencyError(_(f"A fill already exists for the target: {fill.target}"))
-            targets.append(fill.target)
-            #
-            if fill.name not in self.functions:
-                raise DictConsistencyError(_('cannot find fill function {}').format(fill.name))
-
-            namespace = fill.namespace
-            # let's replace the target by the path
-            fill.target, suffix = self.objectspace.paths.get_variable_path(fill.target,
-                                                                           namespace,
-                                                                           with_suffix=True,
-                                                                           )
-            if suffix is not None:
-                raise DictConsistencyError(_(f'Cannot add fill function to "{fill.target}" only with the suffix "{suffix}"'))
-            variable = self.objectspace.paths.get_variable_obj(fill.target)
-            value = self.objectspace.value(variable.xmlfiles)
-            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'):
-                        raise DictConsistencyError(_(f"All '{param.type}' variables must have a value in order to calculate {fill.target}"))
-                    if param.type == 'suffix' and hasattr(param, 'text'):
-                        raise DictConsistencyError(_(f"All '{param.type}' variables must not have a value in order to calculate {fill.target}"))
-                    if param.type == 'string':
-                        if not hasattr(param, 'text'):
-                            param.text = None
-                    if param.type == 'variable':
-                        try:
-                            param.text, suffix = self.objectspace.paths.get_variable_path(param.text,
-                                                                                          namespace,
-                                                                                          with_suffix=True,
-                                                                                          )
-                            if suffix:
-                                param.suffix = suffix
-                        except DictConsistencyError as err:
-                            if param.optional is False:
-                                raise err
-                            param_to_delete.append(fill_idx)
-                            continue
-                    else:
-                        param.notraisepropertyerror = None
-                param_to_delete.sort(reverse=True)
-                for param_idx in param_to_delete:
-                    fill.param.pop(param_idx)
-                value.param = fill.param
-            variable.value = [value]
-        del self.objectspace.space.constraints.fill
-
-    def remove_constraints(self):
-        if hasattr(self.objectspace.space.constraints, 'index'):
-            del self.objectspace.space.constraints.index
-        del self.objectspace.space.constraints.namespace
-        del self.objectspace.space.constraints.xmlfiles
-        if vars(self.objectspace.space.constraints):
-            raise Exception('constraints again?')
-        del self.objectspace.space.constraints
-
-
-class FamilyAnnotator:
-    def __init__(self,
-                 objectspace,
-                 ):
-        self.objectspace = objectspace
-        self.remove_empty_families()
-        self.change_variable_mode()
-        self.change_family_mode()
-        self.dynamic_families()
-
-    def remove_empty_families(self):  # pylint: disable=C0111,R0201
-        if hasattr(self.objectspace.space, 'variables'):
-            for family in self.objectspace.space.variables.values():
-                if hasattr(family, 'family'):
-                    space = family.family
-                    removed_families = []
-                    for family_name, family in space.items():
-                        if not hasattr(family, 'variable') or len(family.variable) == 0:
-                            removed_families.append(family_name)
-                    for family_name in removed_families:
-                        del space[family_name]
-
-    def change_family_mode(self):  # pylint: disable=C0111
-        if not hasattr(self.objectspace.space, 'variables'):
-            return
-        for family in self.objectspace.space.variables.values():
-            if hasattr(family, 'family'):
-                for family in family.family.values():
-                    mode = modes_level[-1]
-                    for variable in family.variable.values():
-                        if isinstance(variable, self.objectspace.Leadership):
-                            variable_mode = variable.variable[0].mode
-                            variable.variable[0].mode = None
-                            variable.mode = variable_mode
-                        else:
-                            variable_mode = variable.mode
-                        if variable_mode is not None and modes[mode] > modes[variable_mode]:
-                            mode = variable_mode
-                    family.mode = mode
-
-    def dynamic_families(self):  # pylint: disable=C0111
-        if not hasattr(self.objectspace.space, 'variables'):
-            return
-        for family in self.objectspace.space.variables.values():
-            if hasattr(family, 'family'):
-                for family in family.family.values():
-                    if 'dynamic' in vars(family):
-                        namespace = self.objectspace.paths.get_variable_namespace(family.dynamic)
-                        varpath = self.objectspace.paths.get_variable_path(family.dynamic, namespace)
-                        family.dynamic = varpath
-
-    def annotate_variable(self, variable, family_mode, path, is_follower=False):
-        # if the variable is mandatory and doesn't have any value
-        # then the variable's mode is set to 'basic'
-        if not hasattr(variable, 'value') and variable.type == 'boolean':
-            new_value = self.objectspace.value(variable.xmlfiles)
-            new_value.name = True
-            new_value.type = 'boolean'
-            variable.value = [new_value]
-        if hasattr(variable, 'value') and variable.value:
-            has_value = True
-            for value in variable.value:
-                if value.type == 'calculation':
-                    has_value = False
-                    has_variable = False
-                    if hasattr(value, 'param'):
-                        for param in value.param:
-                            if param.type == 'variable':
-                                has_variable = True
-                                break
-                    #if not has_variable:
-                    #    # if one parameter is a variable, let variable choice if it's mandatory
-                    #    variable.mandatory = True
-            if has_value:
-                # if has value but without any calculation
-                variable.mandatory = True
-        if variable.mandatory is True and (not hasattr(variable, 'value') or is_follower):
-            variable.mode = modes_level[0]
-        if variable.mode != None and modes[variable.mode] < modes[family_mode] and (not is_follower or variable.mode != modes_level[0]):
-            variable.mode = family_mode
-        if variable.hidden is True:
-            variable.frozen = True
-            if not variable.auto_save is True and 'force_default_on_freeze' not in vars(variable):
-                variable.force_default_on_freeze = True
-
-    def change_variable_mode(self):  # pylint: disable=C0111
-        if not hasattr(self.objectspace.space, 'variables'):
-            return
-        for variables in self.objectspace.space.variables.values():
-            namespace = variables.name
-            if hasattr(variables, 'family'):
-                for family in variables.family.values():
-                    family_mode = family.mode
-                    if hasattr(family, 'variable'):
-                        for variable in family.variable.values():
-
-                            if isinstance(variable, self.objectspace.Leadership):
-                                mode = modes_level[-1]
-                                for idx, follower in enumerate(variable.variable):
-                                    if follower.auto_save is True:
-                                        raise DictConsistencyError(_(f'leader/followers {follower.name} could not be auto_save'))
-                                    if follower.auto_freeze is True:
-                                        raise DictConsistencyError(_('leader/followers {follower.name} could not be auto_freeze'))
-                                    is_follower = idx != 0
-                                    path = '{}.{}.{}'.format(family.path, variable.name, follower.name)
-                                    self.annotate_variable(follower, family_mode, path, is_follower)
-                                    # leader's mode is minimum level
-                                    if modes[variable.variable[0].mode] > modes[follower.mode]:
-                                        follower.mode = variable.variable[0].mode
-                                variable.mode = variable.variable[0].mode
-                            else:
-                                # auto_save's variable is set in 'basic' mode if its mode is 'normal'
-                                if variable.auto_save is True and variable.mode != modes_level[-1]:
-                                    variable.mode = modes_level[0]
-                                # auto_freeze's variable is set in 'basic' mode if its mode is 'normal'
-                                if variable.auto_freeze is True and variable.mode != modes_level[-1]:
-                                    variable.mode = modes_level[0]
-                                path = '{}.{}'.format(family.path, variable.name)
-                                self.annotate_variable(variable, family_mode, path)
-
-class PropertyAnnotator:
-    def __init__(self, objectspace):
-        self.objectspace = objectspace
-        self.convert_annotator()
-
-    def convert_property(self,
-                         variable,
-                         ):
-        properties = []
-        for prop in PROPERTIES:
-            if hasattr(variable, prop):
-                if getattr(variable, prop) == True:
-                    for subprop in CONVERT_PROPERTIES.get(prop, [prop]):
-                        properties.append(subprop)
-                setattr(variable, prop, None)
-        if hasattr(variable, 'mode') and variable.mode:
-            properties.append(variable.mode)
-            variable.mode = None
-        if properties:
-            variable.properties = frozenset(properties)
-
-    def convert_annotator(self):  # pylint: disable=C0111
-        if hasattr(self.objectspace.space, 'services'):
-            self.convert_property(self.objectspace.space.services)
-            for services in self.objectspace.space.services.service.values():
-                self.convert_property(services)
-                for service in vars(services).values():
-                    if isinstance(service, self.objectspace.family):
-                        self.convert_property(service)
-                        if hasattr(service, 'family'):
-                            self.convert_property(service)
-                            for family in service.family:
-                                self.convert_property(family)
-                                if hasattr(family, 'variable'):
-                                    for variable in family.variable:
-                                        self.convert_property(variable)
-        if hasattr(self.objectspace.space, 'variables'):
-            for variables in self.objectspace.space.variables.values():
-                if hasattr(variables, 'family'):
-                    for family in variables.family.values():
-                        self.convert_property(family)
-                        if hasattr(family, 'variable'):
-                            for variable in family.variable.values():
-                                if isinstance(variable, self.objectspace.Leadership):
-                                    self.convert_property(variable)
-                                    for follower in variable.variable:
-                                        self.convert_property(follower)
-                                else:
-                                    self.convert_property(variable)

src/rougail/annotator/__init__.py

@@ -0,0 +1,23 @@
+from .group import GroupAnnotator
+from .service import ServiceAnnotator, ERASED_ATTRIBUTES
+from .variable import VariableAnnotator, CONVERT_OPTION
+from .constrainte import ConstrainteAnnotator
+from .family import FamilyAnnotator, modes
+from .property import PropertyAnnotator
+
+class SpaceAnnotator:
+    """Transformations applied on a CreoleObjSpace instance
+    """
+    def __init__(self, objectspace, eosfunc_file):
+        self.objectspace = objectspace
+        GroupAnnotator(objectspace)
+        ServiceAnnotator(objectspace)
+        VariableAnnotator(objectspace)
+        ConstrainteAnnotator(objectspace,
+                             eosfunc_file,
+                             )
+        FamilyAnnotator(objectspace)
+        PropertyAnnotator(objectspace)
+
+
+__all__ = ('SpaceAnnotator', 'ERASED_ATTRIBUTES', 'CONVERT_OPTION', 'modes')

src/rougail/annotator/constrainte.py

@@ -0,0 +1,563 @@
+from typing import List
+from importlib.machinery import SourceFileLoader
+
+from .variable import CONVERT_OPTION
+
+from ..i18n import _
+from ..utils import normalize_family
+from ..error import DictConsistencyError
+from ..config import Config
+
+FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie'
+
+INTERNAL_FUNCTIONS = ['valid_enum', 'valid_in_network', 'valid_differ', 'valid_entier']
+
+
+class ConstrainteAnnotator:
+    def __init__(self,
+                 objectspace,
+                 eosfunc_file,
+                 ):
+        if not hasattr(objectspace.space, 'constraints'):
+            return
+        self.objectspace = objectspace
+        eosfunc = SourceFileLoader('eosfunc', eosfunc_file).load_module()
+        self.functions = dir(eosfunc)
+        self.functions.extend(INTERNAL_FUNCTIONS)
+
+        self.convert_auto_freeze()
+        self.valid_enums = {}
+        if hasattr(self.objectspace.space.constraints, 'check'):
+            self.check_check()
+            self.check_replace_text()
+            self.check_valid_enum()
+            self.check_change_warning()
+            self.convert_check()
+        if hasattr(self.objectspace.space.constraints, 'condition'):
+            self.check_params_target()
+            self.filter_targets()
+            self.convert_xxxlist_to_variable()
+            self.check_condition_fallback_optional()
+            self.check_choice_option_condition()
+            self.remove_condition_with_empty_target()
+            self.convert_condition()
+        if hasattr(self.objectspace.space.constraints, 'fill'):
+            self.convert_fill()
+        self.remove_constraints()
+
+    def convert_auto_freeze(self):  # pylint: disable=C0111
+        if not hasattr(self.objectspace.space, 'variables'):
+            return
+        def _convert_auto_freeze(variable, namespace):
+            if variable.auto_freeze:
+                if namespace != Config['variable_namespace']:
+                    xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
+                    raise DictConsistencyError(_(f'auto_freeze is not allowed in extra "{namespace}" in {xmlfiles}'), 49)
+                new_condition = self.objectspace.condition(variable.xmlfiles)
+                new_condition.name = 'auto_hidden_if_not_in'
+                new_condition.namespace = namespace
+                new_condition.source = FREEZE_AUTOFREEZE_VARIABLE
+                new_param = self.objectspace.param(variable.xmlfiles)
+                new_param.text = 'oui'
+                new_condition.param = [new_param]
+                new_target = self.objectspace.target(variable.xmlfiles)
+                new_target.type = 'variable'
+                new_target.name = variable.name
+                new_condition.target = [new_target]
+                if not hasattr(self.objectspace.space.constraints, 'condition'):
+                    self.objectspace.space.constraints.condition = []
+                self.objectspace.space.constraints.condition.append(new_condition)
+        for variables in self.objectspace.space.variables.values():
+            if hasattr(variables, 'family'):
+                namespace = variables.name
+                for family in variables.family.values():
+                    if hasattr(family, 'variable'):
+                        for variable in family.variable.values():
+                            if isinstance(variable, self.objectspace.leadership):
+                                for follower in variable.variable:
+                                    _convert_auto_freeze(follower, namespace)
+                            else:
+                                _convert_auto_freeze(variable, namespace)
+
+    def check_check(self):
+        remove_indexes = []
+        for check_idx, check in enumerate(self.objectspace.space.constraints.check):
+            if not check.name in self.functions:
+                xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                raise DictConsistencyError(_(f'cannot find check function "{check.name}" in {xmlfiles}'), 1)
+            if hasattr(check, 'param'):
+                param_option_indexes = []
+                for idx, param in enumerate(check.param):
+                    if param.type == 'variable' and not self.objectspace.paths.path_is_defined(param.text):
+                        if param.optional is True:
+                            param_option_indexes.append(idx)
+                        else:
+                            xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                            raise DictConsistencyError(_(f'cannot find check param "{param.text}" in {xmlfiles}'), 2)
+                    if param.type != 'variable':
+                        param.notraisepropertyerror = None
+                param_option_indexes = list(set(param_option_indexes))
+                param_option_indexes.sort(reverse=True)
+                for idx in param_option_indexes:
+                    check.param.pop(idx)
+                if check.param == []:
+                    remove_indexes.append(check_idx)
+        remove_indexes.sort(reverse=True)
+        for idx in remove_indexes:
+            del self.objectspace.space.constraints.check[idx]
+
+    def check_replace_text(self):
+        for check_idx, check in enumerate(self.objectspace.space.constraints.check):
+            namespace = check.namespace
+            if hasattr(check, 'param'):
+                for idx, param in enumerate(check.param):
+                    if param.type == 'variable':
+                        param.text = self.objectspace.paths.get_variable_path(param.text, namespace)
+            check.is_in_leadership = self.objectspace.paths.get_leader(check.target) != None
+            # let's replace the target by the path
+            check.target = self.objectspace.paths.get_variable_path(check.target, namespace)
+
+    def check_valid_enum(self):
+        remove_indexes = []
+        for idx, check in enumerate(self.objectspace.space.constraints.check):
+            if check.name == 'valid_enum':
+                if check.target in self.valid_enums:
+                    old_xmlfiles = self.objectspace.display_xmlfiles(self.valid_enums[check.target]['xmlfiles'])
+                    xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                    raise DictConsistencyError(_(f'valid_enum define in {xmlfiles} but already set in {old_xmlfiles} for "{check.target}", did you forget remove_check?'), 3)
+                if not hasattr(check, 'param'):
+                    raise DictConsistencyError(_(f'param is mandatory for a valid_enum of variable {check.target}'), 4)
+                variable = self.objectspace.paths.get_variable_obj(check.target)
+                values = self.load_params_in_valid_enum(check.param,
+                                                        variable.name,
+                                                        variable.type,
+                                                        )
+                self._set_valid_enum(variable,
+                                     values,
+                                     variable.type,
+                                     check.target,
+                                     check.xmlfiles,
+                                     )
+                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,
+                                  params,
+                                  variable_name,
+                                  variable_type,
+                                  ):
+        has_variable = None
+        values = []
+        for param in params:
+            if param.type == 'variable':
+                if has_variable is not None:
+                    raise DictConsistencyError(_(f'only one "variable" parameter is allowed for valid_enum of variable {variable_name}'), 5)
+                has_variable = True
+                variable = self.objectspace.paths.get_variable_obj(param.text)
+                if not variable.multi:
+                    raise DictConsistencyError(_(f'only multi "variable" parameter is allowed for valid_enum of variable {variable_name}'), 6)
+                values = param.text
+            else:
+                if has_variable:
+                    raise DictConsistencyError(_(f'only one "variable" parameter is allowed for valid_enum of variable {variable_name}'), 7)
+                if not hasattr(param, 'text'):
+                    if param.type == 'number':
+                        raise DictConsistencyError(_(f'value is mandatory for valid_enum of variable {variable_name}'), 8)
+                    values.append(None)
+                else:
+                    values.append(param.text)
+        return values
+
+    def check_change_warning(self):
+        #convert level to "warnings_only"
+        for check in self.objectspace.space.constraints.check:
+            if check.level == 'warning':
+                check.warnings_only = True
+            else:
+                check.warnings_only = False
+            check.level = None
+
+    def _get_family_variables_from_target(self,
+                                          target,
+                                          ):
+        if target.type == 'variable':
+            variable = self.objectspace.paths.get_variable_obj(target.name)
+            family = self.objectspace.paths.get_family_obj(target.name.rsplit('.', 1)[0])
+            # it's a leader, so apply property to leadership
+            if isinstance(family, self.objectspace.leadership) and family.name == variable.name:
+                return family, family.variable
+            return variable, [variable]
+        # it's a family
+        variable = self.objectspace.paths.get_family_obj(target.name)
+        return variable, list(variable.variable.values())
+
+    def check_params_target(self):
+        for condition in self.objectspace.space.constraints.condition:
+            if not hasattr(condition, 'target'):
+                raise DictConsistencyError(_('target is mandatory in condition'), 9)
+            for target in condition.target:
+                if target.type.endswith('list') and condition.name not in ['disabled_if_in', 'disabled_if_not_in']:
+                    xmlfiles = self.objectspace.display_xmlfiles(target.xmlfiles)
+                    raise DictConsistencyError(_(f'target "{target.type}" not allow in condition "{condition.name}" in {xmlfiles}'), 10)
+
+    def filter_targets(self):  # pylint: disable=C0111
+        for condition_idx, condition in enumerate(self.objectspace.space.constraints.condition):
+            namespace = condition.namespace
+            for idx, target in enumerate(condition.target):
+                if target.type == 'variable':
+                    if condition.source == target.name:
+                        raise DictConsistencyError(_('target name and source name must be different: {}').format(condition.source), 11)
+                    try:
+                        target_names = [normalize_family(name) for name in target.name.split('.')]
+                        target.name = self.objectspace.paths.get_variable_path('.'.join(target_names), namespace)
+                    except DictConsistencyError:
+                        # for optional variable
+                        pass
+                elif target.type == 'family':
+                    try:
+                        target_names = [normalize_family(name) for name in target.name.split('.')]
+                        target.name = self.objectspace.paths.get_family_path('.'.join(target_names), namespace)
+                    except KeyError:
+                        raise DictConsistencyError(_('cannot found family {}').format(target.name), 12)
+
+    def convert_xxxlist_to_variable(self):  # pylint: disable=C0111
+        # transform *list to variable or family
+        for condition_idx, condition in enumerate(self.objectspace.space.constraints.condition):
+            new_targets = []
+            remove_targets = []
+            for target_idx, target in enumerate(condition.target):
+                if target.type.endswith('list'):
+                    listname = target.type
+                    listvars = self.objectspace.list_conditions.get(listname,
+                                                                    {}).get(target.name)
+                    if listvars:
+                        for listvar in listvars:
+                            variable = self.objectspace.paths.get_variable_obj(listvar)
+                            type_ = 'variable'
+                            new_target = self.objectspace.target(variable.xmlfiles)
+                            new_target.type = type_
+                            new_target.name = listvar
+                            new_target.index = target.index
+                            new_targets.append(new_target)
+                    remove_targets.append(target_idx)
+            remove_targets.sort(reverse=True)
+            for target_idx in remove_targets:
+                condition.target.pop(target_idx)
+            condition.target.extend(new_targets)
+
+    def check_condition_fallback_optional(self):
+        # a condition with a fallback **and** the source variable doesn't exist
+        remove_conditions = []
+        for idx, condition in enumerate(self.objectspace.space.constraints.condition):
+            # fallback
+            if condition.fallback is True and not self.objectspace.paths.path_is_defined(condition.source):
+                apply_action = False
+                if condition.name in ['disabled_if_in', 'mandatory_if_in', 'hidden_if_in']:
+                    apply_action = not condition.force_condition_on_fallback
+                else:
+                    apply_action = condition.force_inverse_condition_on_fallback
+                if apply_action:
+                    actions = self._get_condition_actions(condition.name)
+                    for target in condition.target:
+                        leader_or_variable, variables = self._get_family_variables_from_target(target)
+                        for action_idx, action in enumerate(actions):
+                            if action_idx == 0:
+                                setattr(leader_or_variable, action, True)
+                            else:
+                                for variable in variables:
+                                    setattr(variable, action, True)
+                remove_conditions.append(idx)
+                continue
+
+            remove_targets = []
+            # optional
+            for idx, target in enumerate(condition.target):
+                if target.optional is True and not self.objectspace.paths.path_is_defined(target.name):
+                    remove_targets.append(idx)
+            remove_targets = list(set(remove_targets))
+            remove_targets.sort(reverse=True)
+            for idx in remove_targets:
+                condition.target.pop(idx)
+        remove_conditions = list(set(remove_conditions))
+        remove_conditions.sort(reverse=True)
+        for idx in remove_conditions:
+            self.objectspace.space.constraints.condition.pop(idx)
+
+    def _get_condition_actions(self, condition_name):
+        if condition_name.startswith('disabled_if_'):
+            return ['disabled']
+        elif condition_name.startswith('hidden_if_'):
+            return ['hidden', 'frozen', 'force_default_on_freeze']
+        elif condition_name.startswith('mandatory_if_'):
+            return ['mandatory']
+        elif condition_name == 'auto_hidden_if_not_in':
+            return ['auto_frozen']
+
+    def check_choice_option_condition(self):
+        # remove condition for ChoiceOption that don't have param
+        remove_conditions = []
+        for condition_idx, condition in enumerate(self.objectspace.space.constraints.condition):
+            namespace = condition.namespace
+            condition.source = self.objectspace.paths.get_variable_path(condition.source, namespace, allow_source=True)
+            src_variable = self.objectspace.paths.get_variable_obj(condition.source)
+            valid_enum = None
+            if condition.source in self.valid_enums and self.valid_enums[condition.source]['type'] == 'string':
+                valid_enum = self.valid_enums[condition.source]['values']
+            if valid_enum is not None:
+                remove_param = []
+                for param_idx, param in enumerate(condition.param):
+                    if param.text not in valid_enum:
+                        remove_param.append(param_idx)
+                remove_param.sort(reverse=True)
+                for idx in remove_param:
+                    del condition.param[idx]
+                if condition.param == []:
+                    remove_targets = []
+                    for target in condition.target:
+                        leader_or_variable, variables = self._get_family_variables_from_target(target)
+                        if condition.name == 'disabled_if_not_in':
+                            leader_or_variable.disabled = True
+                        elif condition.name == 'hidden_if_not_in':
+                            leader_or_variable.hidden = True
+                            for variable in variables:
+                                variable.frozen = True
+                                variable.force_default_on_freeze = True
+                        elif condition.name == 'mandatory_if_not_in':
+                            variable.mandatory = True
+                    remove_targets = list(set(remove_targets))
+                    remove_targets.sort(reverse=True)
+                    for target_idx in remove_targets:
+                        condition.target.pop(target_idx)
+                    remove_conditions.append(condition_idx)
+        remove_conditions = list(set(remove_conditions))
+        remove_conditions.sort(reverse=True)
+        for idx in remove_conditions:
+            self.objectspace.space.constraints.condition.pop(idx)
+
+    def remove_condition_with_empty_target(self):
+        remove_conditions = []
+        for condition_idx, condition in enumerate(self.objectspace.space.constraints.condition):
+            if not condition.target:
+                remove_conditions.append(condition_idx)
+        remove_conditions = list(set(remove_conditions))
+        remove_conditions.sort(reverse=True)
+        for idx in remove_conditions:
+            self.objectspace.space.constraints.condition.pop(idx)
+
+    def convert_condition(self):
+        for condition in self.objectspace.space.constraints.condition:
+            inverse = condition.name.endswith('_if_not_in')
+            actions = self._get_condition_actions(condition.name)
+            for param in condition.param:
+                text = getattr(param, 'text', None)
+                for target in condition.target:
+                    leader_or_variable, variables = self._get_family_variables_from_target(target)
+                    # if option is already disable, do not apply disable_if_in
+                    # check only the first action (example of multiple actions: 'hidden', 'frozen', 'force_default_on_freeze')
+                    main_action = actions[0]
+                    if getattr(leader_or_variable, main_action, False) is True:
+                        continue
+                    if isinstance(leader_or_variable, self.objectspace.variable) and \
+                            (leader_or_variable.auto_save or leader_or_variable.auto_freeze) and \
+                            'force_default_on_freeze' in actions:
+                        xmlfiles = self.objectspace.display_xmlfiles(leader_or_variable.xmlfiles)
+                        raise DictConsistencyError(_(f'cannot have auto_freeze or auto_store with the hidden_if_in or hidden_if_not_in variable "{leader_or_variable.name}" in {xmlfiles}'), 51)
+                    for idx, action in enumerate(actions):
+                        prop = self.objectspace.property_(leader_or_variable.xmlfiles)
+                        prop.type = 'calculation'
+                        prop.inverse = inverse
+                        prop.source = condition.source
+                        prop.expected = text
+                        prop.name = action
+                        if idx == 0:
+                            # main action is for the variable or family
+                            if not hasattr(leader_or_variable, 'property'):
+                                leader_or_variable.property = []
+                            leader_or_variable.property.append(prop)
+                        else:
+                            # other actions are set to the variable or children of family
+                            for variable in variables:
+                                if not hasattr(variable, 'property'):
+                                    variable.property = []
+                                variable.property.append(prop)
+        del self.objectspace.space.constraints.condition
+
+    def _set_valid_enum(self,
+                        variable,
+                        values,
+                        type_,
+                        target: str,
+                        xmlfiles: List[str],
+                        ):
+        # value for choice's variable is mandatory
+        variable.mandatory = True
+        # build choice
+        variable.choice = []
+        if isinstance(values, str):
+            choice = self.objectspace.choice()
+            choice.type = 'calculation'
+            choice.name = values
+            variable.choice.append(choice)
+        else:
+            self.valid_enums[target] = {'type': type_,
+                                        'values': values,
+                                        'xmlfiles': xmlfiles,
+                                        }
+            choices = []
+            for value in values:
+                choice = self.objectspace.choice(variable.xmlfiles)
+                try:
+                    if value is not None:
+                        choice.name = CONVERT_OPTION[type_].get('func', 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}"'), 13)
+                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 = CONVERT_OPTION[type_].get('func', str)(value.name)
+                    except:
+                        raise DictConsistencyError(_(f'unable to change type of value "{value}" is not a valid "{type_}" for "{variable.name}"'), 14)
+                    if cvalue not in choices:
+                        raise DictConsistencyError(_('value "{}" of variable "{}" is not in list of all expected values ({})').format(value.name, variable.name, choices), 15)
+            else:
+                new_value = self.objectspace.value(variable.xmlfiles)
+                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), 16)
+        variable.type = 'choice'
+
+    def convert_check(self):
+        for check in self.objectspace.space.constraints.check:
+            variable = self.objectspace.paths.get_variable_obj(check.target)
+            name = check.name
+            if name == 'valid_entier':
+                if not hasattr(check, 'param'):
+                    raise DictConsistencyError(_('{} must have, at least, 1 param').format(name), 17)
+                for param in check.param:
+                    if param.type not in ['string', 'number']:
+                        raise DictConsistencyError(_(f'param in "valid_entier" must not be a "{param.type}"'), 18)
+                    if param.name == 'mini':
+                        variable.min_number = int(param.text)
+                    elif param.name == 'maxi':
+                        variable.max_number = int(param.text)
+                    else:
+                        raise DictConsistencyError(_(f'unknown parameter {param.text} in check "valid_entier" for variable {check.target}'), 19)
+            else:
+                check_ = self.objectspace.check(variable.xmlfiles)
+                if name == 'valid_differ':
+                    name = 'valid_not_equal'
+                elif name == 'valid_network_netmask':
+                    params_len = 1
+                    if len(check.param) != params_len:
+                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'), 20)
+                elif name == 'valid_ipnetmask':
+                    params_len = 1
+                    if len(check.param) != params_len:
+                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'), 21)
+                    name = 'valid_ip_netmask'
+                elif name == 'valid_broadcast':
+                    params_len = 2
+                    if len(check.param) != params_len:
+                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'), 22)
+                elif name == 'valid_in_network':
+                    if len(check.param) not in (1, 2):
+                        params_len = 2
+                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'), 23)
+                check_.name = name
+                check_.warnings_only = check.warnings_only
+                if hasattr(check, 'param'):
+                    check_.param = check.param
+                if not hasattr(variable, 'check'):
+                    variable.check = []
+                variable.check.append(check_)
+        del self.objectspace.space.constraints.check
+
+    def convert_fill(self):  # pylint: disable=C0111,R0912
+        # sort fill/auto by index
+        fills = {fill.index: fill for idx, fill in enumerate(self.objectspace.space.constraints.fill)}
+        indexes = list(fills.keys())
+        indexes.sort()
+        targets = []
+        for idx in indexes:
+            fill = fills[idx]
+            # test if it's redefined calculation
+            if fill.target in targets:
+                xmlfiles = self.objectspace.display_xmlfiles(fill.xmlfiles)
+                raise DictConsistencyError(_(f'A fill already exists for the target of "{fill.target}" created in {xmlfiles}'), 24)
+            targets.append(fill.target)
+            #
+            if fill.name not in self.functions:
+                raise DictConsistencyError(_('cannot find fill function {}').format(fill.name), 25)
+
+            namespace = fill.namespace
+            # let's replace the target by the path
+            fill.target, suffix = self.objectspace.paths.get_variable_path(fill.target,
+                                                                           namespace,
+                                                                           with_suffix=True,
+                                                                           )
+            if suffix is not None:
+                raise DictConsistencyError(_(f'Cannot add fill function to "{fill.target}" only with the suffix "{suffix}"'), 26)
+            variable = self.objectspace.paths.get_variable_obj(fill.target)
+            value = self.objectspace.value(variable.xmlfiles)
+            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'):
+                        raise DictConsistencyError(_(f"All '{param.type}' variables must have a value in order to calculate {fill.target}"), 27)
+                    if param.type == 'suffix' and hasattr(param, 'text'):
+                        raise DictConsistencyError(_(f"All '{param.type}' variables must not have a value in order to calculate {fill.target}"), 28)
+                    if param.type == 'string':
+                        if not hasattr(param, 'text'):
+                            param.text = None
+                    if param.type == 'variable':
+                        try:
+                            param.text, suffix = self.objectspace.paths.get_variable_path(param.text,
+                                                                                          namespace,
+                                                                                          with_suffix=True,
+                                                                                          )
+                            if suffix:
+                                param.suffix = suffix
+                        except DictConsistencyError as err:
+                            if err.errno != 42:
+                                raise err
+                            if param.optional is False:
+                                raise err
+                            param_to_delete.append(fill_idx)
+                            continue
+                    else:
+                        param.notraisepropertyerror = None
+                param_to_delete.sort(reverse=True)
+                for param_idx in param_to_delete:
+                    fill.param.pop(param_idx)
+                value.param = fill.param
+            variable.value = [value]
+        del self.objectspace.space.constraints.fill
+
+    def remove_constraints(self):
+        if hasattr(self.objectspace.space.constraints, 'index'):
+            del self.objectspace.space.constraints.index
+        del self.objectspace.space.constraints.namespace
+        del self.objectspace.space.constraints.xmlfiles
+        if vars(self.objectspace.space.constraints):
+            raise Exception('constraints again?')
+        del self.objectspace.space.constraints
+

src/rougail/annotator/family.py

@@ -0,0 +1,148 @@
+from ..i18n import _
+from ..error import DictConsistencyError
+
+
+#mode order is important
+modes_level = ('basic', 'normal', 'expert')
+
+
+class Mode(object):
+    def __init__(self, name, level):
+        self.name = name
+        self.level = level
+    def __gt__(self, other):
+        return other.level < self.level
+
+
+def mode_factory():
+    mode_obj = {}
+    for idx in range(len(modes_level)):
+        name = modes_level[idx]
+        mode_obj[name] = Mode(name, idx)
+    return mode_obj
+
+modes = mode_factory()
+
+
+class FamilyAnnotator:
+    def __init__(self,
+                 objectspace,
+                 ):
+        self.objectspace = objectspace
+        self.remove_empty_families()
+        self.change_variable_mode()
+        self.change_family_mode()
+        self.dynamic_families()
+
+    def remove_empty_families(self):  # pylint: disable=C0111,R0201
+        if hasattr(self.objectspace.space, 'variables'):
+            for family in self.objectspace.space.variables.values():
+                if hasattr(family, 'family'):
+                    space = family.family
+                    removed_families = []
+                    for family_name, family in space.items():
+                        if not hasattr(family, 'variable') or len(family.variable) == 0:
+                            removed_families.append(family_name)
+                    for family_name in removed_families:
+                        del space[family_name]
+
+    def change_family_mode(self):  # pylint: disable=C0111
+        if not hasattr(self.objectspace.space, 'variables'):
+            return
+        for family in self.objectspace.space.variables.values():
+            if hasattr(family, 'family'):
+                for family in family.family.values():
+                    mode = modes_level[-1]
+                    for variable in family.variable.values():
+                        if isinstance(variable, self.objectspace.leadership):
+                            variable_mode = variable.variable[0].mode
+                            variable.variable[0].mode = None
+                            variable.mode = variable_mode
+                        else:
+                            variable_mode = variable.mode
+                        if variable_mode is not None and modes[mode] > modes[variable_mode]:
+                            mode = variable_mode
+                    family.mode = mode
+
+    def dynamic_families(self):  # pylint: disable=C0111
+        if not hasattr(self.objectspace.space, 'variables'):
+            return
+        for family in self.objectspace.space.variables.values():
+            if hasattr(family, 'family'):
+                for family in family.family.values():
+                    if 'dynamic' in vars(family):
+                        namespace = self.objectspace.paths.get_variable_namespace(family.dynamic)
+                        varpath = self.objectspace.paths.get_variable_path(family.dynamic, namespace)
+                        family.dynamic = varpath
+
+    def annotate_variable(self, variable, family_mode, path, is_follower=False):
+        # if the variable is mandatory and doesn't have any value
+        # then the variable's mode is set to 'basic'
+        if not hasattr(variable, 'value') and variable.type == 'boolean':
+            new_value = self.objectspace.value(variable.xmlfiles)
+            new_value.name = True
+            new_value.type = 'boolean'
+            variable.value = [new_value]
+        if hasattr(variable, 'value') and variable.value:
+            has_value = True
+            for value in variable.value:
+                if value.type == 'calculation':
+                    has_value = False
+                    has_variable = False
+                    if hasattr(value, 'param'):
+                        for param in value.param:
+                            if param.type == 'variable':
+                                has_variable = True
+                                break
+                    #if not has_variable:
+                    #    # if one parameter is a variable, let variable choice if it's mandatory
+                    #    variable.mandatory = True
+            if has_value:
+                # if has value but without any calculation
+                variable.mandatory = True
+        if variable.mandatory is True and (not hasattr(variable, 'value') or is_follower):
+            variable.mode = modes_level[0]
+        if variable.mode != None and modes[variable.mode] < modes[family_mode] and (not is_follower or variable.mode != modes_level[0]):
+            variable.mode = family_mode
+        if variable.hidden is True:
+            variable.frozen = True
+            if not variable.auto_save is True and 'force_default_on_freeze' not in vars(variable):
+                variable.force_default_on_freeze = True
+
+    def change_variable_mode(self):  # pylint: disable=C0111
+        if not hasattr(self.objectspace.space, 'variables'):
+            return
+        for variables in self.objectspace.space.variables.values():
+            namespace = variables.name
+            if hasattr(variables, 'family'):
+                for family in variables.family.values():
+                    family_mode = family.mode
+                    if hasattr(family, 'variable'):
+                        for variable in family.variable.values():
+
+                            if isinstance(variable, self.objectspace.leadership):
+                                mode = modes_level[-1]
+                                for idx, follower in enumerate(variable.variable):
+                                    if follower.auto_save is True:
+                                        xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
+                                        raise DictConsistencyError(_(f'leader/followers "{follower.name}" could not be auto_save in {xmlfiles}'), 29)
+                                    if follower.auto_freeze is True:
+                                        xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
+                                        raise DictConsistencyError(_(f'leader/followers "{follower.name}" could not be auto_freeze in {xmlfiles}'), 30)
+                                    is_follower = idx != 0
+                                    path = '{}.{}.{}'.format(family.path, variable.name, follower.name)
+                                    self.annotate_variable(follower, family_mode, path, is_follower)
+                                    # leader's mode is minimum level
+                                    if modes[variable.variable[0].mode] > modes[follower.mode]:
+                                        follower.mode = variable.variable[0].mode
+                                variable.mode = variable.variable[0].mode
+                            else:
+                                # auto_save's variable is set in 'basic' mode if its mode is 'normal'
+                                if variable.auto_save is True and variable.mode != modes_level[-1]:
+                                    variable.mode = modes_level[0]
+                                # auto_freeze's variable is set in 'basic' mode if its mode is 'normal'
+                                if variable.auto_freeze is True and variable.mode != modes_level[-1]:
+                                    variable.mode = modes_level[0]
+                                path = '{}.{}'.format(family.path, variable.name)
+                                self.annotate_variable(variable, family_mode, path)
+

src/rougail/annotator/group.py

@@ -0,0 +1,139 @@
+from typing import List
+
+from ..i18n import _
+from ..error import DictConsistencyError
+
+
+class GroupAnnotator:
+    def __init__(self,
+                 objectspace,
+                 ):
+        self.objectspace = objectspace
+        if not hasattr(self.objectspace.space, 'constraints') or not hasattr(self.objectspace.space.constraints, 'group'):
+            return
+        self.convert_groups()
+
+    def convert_groups(self):  # pylint: disable=C0111
+        for group in self.objectspace.space.constraints.group:
+            leader_fullname = group.leader
+            leader_family_name = self.objectspace.paths.get_variable_family_name(leader_fullname)
+            leader_name = self.objectspace.paths.get_variable_name(leader_fullname)
+            namespace = self.objectspace.paths.get_variable_namespace(leader_fullname)
+            if '.' not in leader_fullname:
+                leader_fullname = '.'.join([namespace, leader_family_name, leader_fullname])
+            follower_names = list(group.follower.keys())
+            has_a_leader = False
+            ori_leader_family = self.objectspace.paths.get_family_obj(leader_fullname.rsplit('.', 1)[0])
+            for variable in list(ori_leader_family.variable.values()):
+                if has_a_leader:
+                    # it's a follower
+                    self.manage_follower(namespace,
+                                         leader_family_name,
+                                         variable,
+                                         leadership_name,
+                                         follower_names,
+                                         leader_space,
+                                         leader_is_hidden,
+                                         )
+                    ori_leader_family.variable.pop(variable.name)
+                    if follower_names == []:
+                        # no more follower
+                        break
+                elif variable.name == leader_name:
+                    # it's a leader
+                    if isinstance(variable, self.objectspace.leadership):
+                        # append follower to an existed leadership
+                        leader_space = variable
+                        # if variable.hidden:
+                        #     leader_is_hidden = True
+                    else:
+                        leader_space = self.objectspace.leadership(variable.xmlfiles)
+                        if hasattr(group, 'name'):
+                            leadership_name = group.name
+                        else:
+                            leadership_name = leader_name
+                        leader_is_hidden = self.manage_leader(leader_space,
+                                                              leader_family_name,
+                                                              leadership_name,
+                                                              leader_name,
+                                                              namespace,
+                                                              variable,
+                                                              group,
+                                                              leader_fullname,
+                                                              )
+                    has_a_leader = True
+            else:
+                xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
+                joined = '", "'.join(follower_names)
+                raise DictConsistencyError(_(f'when parsing leadership, we espect to find those followers "{joined}" in {xmlfiles}'), 31)
+        del self.objectspace.space.constraints.group
+
+    def manage_leader(self,
+                      leader_space: 'Leadership',
+                      leader_family_name: str,
+                      leadership_name: str,
+                      leader_name: str,
+                      namespace: str,
+                      variable: 'Variable',
+                      group: 'Group',
+                      leader_fullname: str,
+                      ) -> None:
+        # manage leader's variable
+        if variable.multi is not True:
+            xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
+            raise DictConsistencyError(_(f'the variable "{variable.name}" in a group must be multi in {xmlfiles}'), 32)
+        leader_space.variable = []
+        leader_space.name = leadership_name
+        leader_space.hidden = variable.hidden
+        if variable.hidden:
+            leader_is_hidden = True
+            variable.frozen = True
+            variable.force_default_on_freeze = True
+        else:
+            leader_is_hidden = False
+        variable.hidden = None
+        if hasattr(group, 'description'):
+            leader_space.doc = group.description
+        elif hasattr(variable, 'description'):
+            leader_space.doc = variable.description
+        else:
+            leader_space.doc = variable.name
+        leadership_path = namespace + '.' + leader_family_name + '.' + leadership_name
+        self.objectspace.paths.add_family(namespace,
+                                          leadership_path,
+                                          leader_space,
+                                          )
+        leader_family = self.objectspace.space.variables[namespace].family[leader_family_name]
+        leader_family.variable[leader_name] = leader_space
+        leader_space.variable.append(variable)
+        self.objectspace.paths.set_leader(namespace,
+                                          leader_family_name,
+                                          leader_name,
+                                          leader_name,
+                                          )
+        leader_space.path = leader_fullname
+        return leader_is_hidden
+
+    def manage_follower(self,
+                        namespace: str,
+                        leader_family_name: str,
+                        variable: 'Variable',
+                        leader_name: str,
+                        follower_names: List[str],
+                        leader_space: 'Leadership',
+                        leader_is_hidden: bool,
+                        ) -> None:
+        if variable.name != follower_names[0]:
+            xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
+            raise DictConsistencyError(_(f'when parsing leadership, we espect to find the follower "{follower_names[0]}" but we found "{variable.name}" in {xmlfiles}'), 33)
+        follower_names.remove(variable.name)
+        if leader_is_hidden:
+            variable.frozen = True
+            variable.force_default_on_freeze = True
+        leader_space.variable.append(variable)  # pylint: disable=E1101
+        self.objectspace.paths.set_leader(namespace,
+                                          leader_family_name,
+                                          variable.name,
+                                          leader_name,
+                                          )
+

src/rougail/annotator/property.py

@@ -0,0 +1,61 @@
+from ..i18n import _
+from ..error import DictConsistencyError
+
+
+PROPERTIES = ('hidden', 'frozen', 'auto_freeze', 'auto_save', 'force_default_on_freeze',
+              'force_store_value', 'disabled', 'mandatory')
+CONVERT_PROPERTIES = {'auto_save': ['force_store_value'], 'auto_freeze': ['force_store_value', 'auto_freeze']}
+
+
+class PropertyAnnotator:
+    def __init__(self, objectspace):
+        self.objectspace = objectspace
+        self.convert_annotator()
+
+    def convert_property(self,
+                         variable,
+                         ):
+        properties = []
+        for prop in PROPERTIES:
+            if hasattr(variable, prop):
+                if getattr(variable, prop) == True:
+                    for subprop in CONVERT_PROPERTIES.get(prop, [prop]):
+                        properties.append(subprop)
+                setattr(variable, prop, None)
+        if hasattr(variable, 'mode') and variable.mode:
+            properties.append(variable.mode)
+            variable.mode = None
+        if 'force_store_value' in properties and 'force_default_on_freeze' in properties:
+            xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
+            raise DictConsistencyError(_(f'cannot have auto_freeze or auto_store with the hidden variable "{variable.name}" in {xmlfiles}'), 50)
+        if properties:
+            variable.properties = frozenset(properties)
+
+    def convert_annotator(self):  # pylint: disable=C0111
+        if hasattr(self.objectspace.space, 'services'):
+            self.convert_property(self.objectspace.space.services)
+            for services in self.objectspace.space.services.service.values():
+                self.convert_property(services)
+                for service in vars(services).values():
+                    if isinstance(service, self.objectspace.family):
+                        self.convert_property(service)
+                        if hasattr(service, 'family'):
+                            self.convert_property(service)
+                            for family in service.family:
+                                self.convert_property(family)
+                                if hasattr(family, 'variable'):
+                                    for variable in family.variable:
+                                        self.convert_property(variable)
+        if hasattr(self.objectspace.space, 'variables'):
+            for variables in self.objectspace.space.variables.values():
+                if hasattr(variables, 'family'):
+                    for family in variables.family.values():
+                        self.convert_property(family)
+                        if hasattr(family, 'variable'):
+                            for variable in family.variable.values():
+                                if isinstance(variable, self.objectspace.leadership):
+                                    self.convert_property(variable)
+                                    for follower in variable.variable:
+                                        self.convert_property(follower)
+                                else:
+                                    self.convert_property(variable)

src/rougail/annotator/service.py

@@ -0,0 +1,252 @@
+from os.path import basename
+
+from ..i18n import _
+from ..utils import normalize_family
+from ..error import DictConsistencyError
+# a CreoleObjSpace's attribute has some annotations
+# that shall not be present in the exported (flatened) XML
+ERASED_ATTRIBUTES = ('redefine', 'exists', 'fallback', 'optional', 'remove_check', 'namespace',
+                     'remove_condition', 'path', 'instance_mode', 'index', 'is_in_leadership',
+                     'level', 'remove_fill', 'xmlfiles')
+
+
+KEY_TYPE = {'variable': 'symlink',
+            'SymLinkOption': 'symlink',
+            'PortOption': 'port',
+            'UnicodeOption': 'string',
+            'NetworkOption': 'network',
+            'NetmaskOption': 'netmask',
+            'URLOption': 'web_address',
+            'FilenameOption': 'filename'}
+
+
+class ServiceAnnotator:
+    """Manage service's object
+    for example::
+        <services>
+            <service name="test">
+                <service_access service='ntp'>
+                    <port protocol='udp' service_accesslist='ntp_udp'>123</port>
+                </service_access>
+            </service>
+        </services>
+    """
+    def __init__(self, objectspace):
+        self.objectspace = objectspace
+        self.convert_services()
+
+    def convert_services(self):
+        if not hasattr(self.objectspace.space, 'services'):
+            return
+        if not hasattr(self.objectspace.space.services, 'service'):
+            del self.objectspace.space.services
+            return
+        self.objectspace.space.services.hidden = True
+        self.objectspace.space.services.name = 'services'
+        self.objectspace.space.services.doc = 'services'
+        families = {}
+        for idx, service_name in enumerate(self.objectspace.space.services.service.keys()):
+            service = self.objectspace.space.services.service[service_name]
+            new_service = self.objectspace.service(service.xmlfiles)
+            for elttype, values in vars(service).items():
+                if not isinstance(values, (dict, list)) or elttype in ERASED_ATTRIBUTES:
+                    setattr(new_service, elttype, values)
+                    continue
+                eltname = elttype + 's'
+                path = '.'.join(['services', service_name, eltname])
+                family = self.gen_family(eltname,
+                                         path,
+                                         service.xmlfiles,
+                                         )
+                if isinstance(values, dict):
+                    values = list(values.values())
+                family.family = self.make_group_from_elts(service_name,
+                                                          elttype,
+                                                          values,
+                                                          path,
+                                                          )
+                setattr(new_service, elttype, family)
+            new_service.doc = new_service.name
+            families[service_name] = new_service
+        self.objectspace.space.services.service = families
+
+    def gen_family(self,
+                   name,
+                   path,
+                   xmlfiles
+                   ):
+        family = self.objectspace.family(xmlfiles)
+        family.name = normalize_family(name)
+        family.doc = name
+        family.mode = None
+        self.objectspace.paths.add_family('services',
+                                          path,
+                                          family,
+                                          )
+        return family
+
+    def make_group_from_elts(self,
+                             service_name,
+                             name,
+                             elts,
+                             path,
+                             ):
+        """Splits each objects into a group (and `OptionDescription`, in tiramisu terms)
+        and build elements and its attributes (the `Options` in tiramisu terms)
+        """
+        families = []
+        new_elts = self._reorder_elts(name,
+                                      elts,
+                                      )
+        for index, elt_info in enumerate(new_elts):
+            elt = elt_info['elt']
+            elt_name = elt_info['elt_name']
+
+            # try to launch _update_xxxx() function
+            update_elt = '_update_' + elt_name
+            if hasattr(self, update_elt):
+                getattr(self, update_elt)(elt,
+                                          index,
+                                          path,
+                                          service_name,
+                                          )
+
+            idx = 0
+            while True:
+                if hasattr(elt, 'source'):
+                    c_name = elt.source
+                else:
+                    c_name = elt.name
+                if idx:
+                    c_name += f'_{idx}'
+                subpath = '{}.{}'.format(path, c_name)
+                if not self.objectspace.paths.family_is_defined(subpath):
+                    break
+                idx += 1
+            family = self.gen_family(c_name,
+                                     subpath,
+                                     elt.xmlfiles,
+                                     )
+            family.variable = []
+            listname = '{}list'.format(name)
+            activate_path = '.'.join([subpath, 'activate'])
+            for key in dir(elt):
+                if key.startswith('_') or key.endswith('_type') or key in ERASED_ATTRIBUTES:
+                    continue
+                value = getattr(elt, key)
+                if key == listname:
+                    self.objectspace.list_conditions.setdefault(listname,
+                                                                {}).setdefault(
+                                                                    value,
+                                                                    []).append(activate_path)
+                    continue
+                family.variable.append(self._generate_element(elt_name,
+                                                              key,
+                                                              value,
+                                                              elt,
+                                                              f'{subpath}.{key}'
+                                                              ))
+            # FIXME ne devrait pas etre True par défaut
+            # devrait etre un calcule
+            family.variable.append(self._generate_element(elt_name,
+                                                         'activate',
+                                                          True,
+                                                          elt,
+                                                          activate_path,
+                                                          ))
+            families.append(family)
+        return families
+
+    def _generate_element(self,
+                          elt_name,
+                          key,
+                          value,
+                          elt,
+                          path,
+                          ):
+        variable = self.objectspace.variable(elt.xmlfiles)
+        variable.name = normalize_family(key)
+        variable.mode = None
+        if key == 'name':
+            true_key = elt_name
+        else:
+            true_key = key
+        dtd_key_type = true_key + '_type'
+        if key == 'activate':
+            type_ = 'boolean'
+        elif hasattr(elt, dtd_key_type):
+            type_ = KEY_TYPE[getattr(elt, dtd_key_type)]
+        elif key in self.objectspace.booleans_attributs:
+            type_ = 'boolean'
+        else:
+            type_ = 'string'
+        variable.type = type_
+        if type_ == 'symlink':
+            variable.opt = self.objectspace.paths.get_variable_path(value,
+                                                                    'services',
+                                                                    )
+#            variable.opt = value
+            variable.multi = None
+        else:
+            variable.doc = key
+            val = self.objectspace.value(elt.xmlfiles)
+            val.type = type_
+            val.name = value
+            variable.value = [val]
+        self.objectspace.paths.add_variable('services',
+                                            path,
+                                            'service',
+                                            False,
+                                            variable,
+                                            )
+        return variable
+
+    def _reorder_elts(self,
+                      name,
+                      elts,
+                      ):
+        """Reorders by index the elts
+        """
+        new_elts = {}
+        # reorder elts by index
+        for idx, elt in enumerate(elts):
+            new_elts.setdefault(idx, []).append(elt)
+        idxes = list(new_elts.keys())
+        idxes.sort()
+        result_elts = []
+        for idx in idxes:
+            for elt in new_elts[idx]:
+                result_elts.append({'elt_name': name, 'elt': elt})
+        return result_elts
+
+    def _update_override(self,
+                         file_,
+                         index,
+                         service_path,
+                         service_name,
+                         ):
+        file_.name = f'/systemd/system/{service_name}.service.d/rougail.conf'
+        # retrieve default value from File object
+        for attr in ['owner', 'group', 'mode']:
+            setattr(file_, attr, getattr(self.objectspace.file, attr))
+        if not hasattr(file_, 'source'):
+            file_.source = f'{service_name}.service'
+        self._update_file(file_,
+                          index,
+                          service_path,
+                          service_name,
+                          )
+
+    def _update_file(self,
+                     file_,
+                     index,
+                     service_path,
+                     service_name,
+                     ):
+        if not hasattr(file_, 'file_type') or file_.file_type == "UnicodeOption":
+            if not hasattr(file_, 'source'):
+                file_.source = basename(file_.name)
+        elif not hasattr(file_, 'source'):
+            xmlfiles = self.objectspace.display_xmlfiles(file_.xmlfiles)
+            raise DictConsistencyError(_(f'attribute "source" is mandatory for the file "{file_.name}" in {xmlfiles}'), 34)
+

src/rougail/annotator/variable.py

@@ -0,0 +1,154 @@
+from ..i18n import _
+from ..utils import normalize_family
+from ..error import DictConsistencyError
+
+
+CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
+                  'float': dict(opttype="FloatOption", func=float),
+                  'choice': dict(opttype="ChoiceOption"),
+                  'string': dict(opttype="StrOption"),
+                  'password': dict(opttype="PasswordOption"),
+                  'mail': dict(opttype="EmailOption"),
+                  'boolean': dict(opttype="BoolOption"),
+                  'symlink': dict(opttype="SymLinkOption"),
+                  'filename': dict(opttype="FilenameOption"),
+                  'date': dict(opttype="DateOption"),
+                  'unix_user': dict(opttype="UsernameOption"),
+                  'ip': dict(opttype="IPOption", initkwargs={'allow_reserved': True}),
+                  'local_ip': dict(opttype="IPOption", initkwargs={'private_only': True, 'warnings_only': True}),
+                  'netmask': dict(opttype="NetmaskOption"),
+                  'network': dict(opttype="NetworkOption"),
+                  'broadcast': dict(opttype="BroadcastOption"),
+                  'netbios': dict(opttype="DomainnameOption", initkwargs={'type': 'netbios', 'warnings_only': True}),
+                  'domain': dict(opttype="DomainnameOption", initkwargs={'type': 'domainname', 'allow_ip': False}),
+                  'hostname': dict(opttype="DomainnameOption", initkwargs={'type': 'hostname', 'allow_ip': False}),
+                  'web_address': dict(opttype="URLOption", initkwargs={'allow_ip': True, 'allow_without_dot': True}),
+                  'port': dict(opttype="PortOption", initkwargs={'allow_private': True}),
+                  'mac': dict(opttype="MACOption"),
+                  'cidr': dict(opttype="IPOption", initkwargs={'cidr': True}),
+                  'network_cidr': dict(opttype="NetworkOption", initkwargs={'cidr': True}),
+                  }
+
+
+FORCE_CHOICE = {'oui/non': ['oui', 'non'],
+                'on/off': ['on', 'off'],
+                'yes/no': ['yes', 'no'],
+                'schedule': ['none', 'daily', 'weekly', 'monthly'],
+                'schedulemod': ['pre', 'post']}
+
+
+RENAME_ATTIBUTES = {'description': 'doc'}
+
+
+class VariableAnnotator:
+    def __init__(self,
+                 objectspace,
+                 ):
+        self.objectspace = objectspace
+        self.convert_variable()
+        self.convert_separators()
+
+    def convert_variable(self):
+        def _convert_variable(variable,
+                              variable_type,
+                              ):
+            if not hasattr(variable, 'type'):
+                variable.type = 'string'
+            if variable.type != 'symlink' and not hasattr(variable, 'description'):
+                variable.description = variable.name
+            if hasattr(variable, 'value'):
+                for value in variable.value:
+                    if not hasattr(value, 'type'):
+                        value.type = variable.type
+                    value.name = CONVERT_OPTION.get(value.type, {}).get('func', str)(value.name)
+            for key, value in RENAME_ATTIBUTES.items():
+                setattr(variable, value, getattr(variable, key))
+                setattr(variable, key, None)
+            if variable_type == 'follower':
+                if variable.multi is True:
+                    variable.multi = 'submulti'
+                else:
+                    variable.multi = True
+
+        def _convert_valid_enum(namespace,
+                                variable,
+                                path,
+                                ):
+            if variable.type in FORCE_CHOICE:
+                check = self.objectspace.check(variable.xmlfiles)
+                check.name = 'valid_enum'
+                check.target = path
+                check.namespace = namespace
+                check.param = []
+                for value in FORCE_CHOICE[variable.type]:
+                    param = self.objectspace.param(variable.xmlfiles)
+                    param.text = value
+                    check.param.append(param)
+                if not hasattr(self.objectspace.space, 'constraints'):
+                    self.objectspace.space.constraints = self.objectspace.constraints(variable.xmlfiles)
+                    self.objectspace.space.constraints.namespace = namespace
+                if not hasattr(self.objectspace.space.constraints, 'check'):
+                    self.objectspace.space.constraints.check = []
+                self.objectspace.space.constraints.check.append(check)
+                variable.type = 'string'
+
+        def _valid_type(variable):
+            if variable.type not in CONVERT_OPTION:
+                xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
+                raise DictConsistencyError(_(f'unvalid type "{variable.type}" for variable "{variable.name}" in {xmlfiles}'), 36)
+
+        if not hasattr(self.objectspace.space, 'variables'):
+            return
+        for families in self.objectspace.space.variables.values():
+            namespace = families.name
+            if hasattr(families, 'family'):
+                families.doc = families.name
+                for family in families.family.values():
+                    family.doc = family.name
+                    family.name = normalize_family(family.name)
+                    if hasattr(family, 'variable'):
+                        for variable in family.variable.values():
+                            if isinstance(variable, self.objectspace.leadership):
+                                for idx, follower in enumerate(variable.variable):
+                                    if idx == 0:
+                                        variable_type = 'master'
+                                    else:
+                                        variable_type = 'follower'
+                                    path = '{}.{}.{}.{}'.format(namespace, normalize_family(family.name), variable.name, follower.name)
+                                    _convert_variable(follower,
+                                                      variable_type,
+                                                      )
+                                    _convert_valid_enum(namespace,
+                                                        follower,
+                                                        path,
+                                                        )
+                                    _valid_type(follower)
+                            else:
+                                path = '{}.{}.{}'.format(namespace, normalize_family(family.name), variable.name)
+                                _convert_variable(variable,
+                                                  'variable',
+                                                  )
+                                _convert_valid_enum(namespace,
+                                                    variable,
+                                                    path,
+                                                    )
+                                _valid_type(variable)
+
+    def convert_separators(self):  # pylint: disable=C0111,R0201
+        if not hasattr(self.objectspace.space, 'variables'):
+            return
+        for family in self.objectspace.space.variables.values():
+            if not hasattr(family, 'separators'):
+                continue
+            if hasattr(family.separators, 'separator'):
+                for idx, separator in enumerate(family.separators.separator):
+                    option = self.objectspace.paths.get_variable_obj(separator.name)
+                    if hasattr(option, 'separator'):
+                        subpath = self.objectspace.paths.get_variable_path(separator.name,
+                                                                           separator.namespace,
+                                                                           )
+                        xmlfiles = self.objectspace.display_xmlfiles(separator.xmlfiles)
+                        raise DictConsistencyError(_(f'{subpath} already has a separator in {xmlfiles}'), 35)
+                    option.separator = separator.text
+            del family.separators
+

src/rougail/data/rougail.dtd

@@ -50,21 +50,21 @@
 <!ATTLIST service manage (True|False) "True">
 
 <!ELEMENT port (#PCDATA)>
-<!ATTLIST port port_type (PortOption|SymLinkOption|variable) "PortOption">
+<!ATTLIST port port_type (PortOption|variable) "PortOption">
 <!ATTLIST port portlist CDATA #IMPLIED >
 <!ATTLIST port protocol (tcp|udp) "tcp">
 
 <!ELEMENT ip (#PCDATA)>
 <!ATTLIST ip iplist CDATA #IMPLIED >
-<!ATTLIST ip ip_type (NetworkOption|SymLinkOption|variable) "NetworkOption">
-<!ATTLIST ip interface_type (UnicodeOption|SymLinkOption|variable) "UnicodeOption">
+<!ATTLIST ip ip_type (NetworkOption|variable) "NetworkOption">
+<!ATTLIST ip interface_type (UnicodeOption|variable) "UnicodeOption">
 <!ATTLIST ip interface CDATA #REQUIRED>
-<!ATTLIST ip netmask_type (NetmaskOption|SymLinkOption|variable) "NetmaskOption">
+<!ATTLIST ip netmask_type (NetmaskOption|variable) "NetmaskOption">
 <!ATTLIST ip netmask CDATA "255.255.255.255">
 
 <!ELEMENT file EMPTY>
 <!ATTLIST file name CDATA #REQUIRED >
-<!ATTLIST file file_type (UnicodeOption|SymLinkOption|variable) "UnicodeOption">
+<!ATTLIST file file_type (UnicodeOption|variable) "UnicodeOption">
 <!ATTLIST file variable CDATA #IMPLIED>
 <!ATTLIST file variable_type (variable) "variable">
 <!ATTLIST file source CDATA #IMPLIED>
@@ -80,17 +80,19 @@
 <!ATTLIST override templating (True|False) "True">
 
 <!ELEMENT variables (family*, separators*)>
-<!ELEMENT family (#PCDATA | variable)*>
+<!ELEMENT family (variable*)>
 <!ATTLIST family name CDATA #REQUIRED>
 <!ATTLIST family description CDATA #IMPLIED>
+<!ATTLIST family help CDATA #IMPLIED>
 <!ATTLIST family mode (basic|normal|expert) "basic">
 <!ATTLIST family hidden (True|False) "False">
 <!ATTLIST family dynamic CDATA #IMPLIED>
 
-<!ELEMENT variable (#PCDATA | value)*>
+<!ELEMENT variable (value*)>
 <!ATTLIST variable name CDATA #REQUIRED>
 <!ATTLIST variable type CDATA #IMPLIED>
 <!ATTLIST variable description CDATA #IMPLIED>
+<!ATTLIST variable help CDATA #IMPLIED>
 <!ATTLIST variable hidden (True|False) "False">
 <!ATTLIST variable disabled (True|False) "False">
 <!ATTLIST variable multi (True|False) "False">
@@ -145,5 +147,3 @@
 <!ATTLIST target optional (True|False) "False">
 
 <!ELEMENT follower (#PCDATA)>
-
-<!ELEMENT help ((variable* | family*)*)>

src/rougail/error.py

@@ -29,6 +29,9 @@ class DictConsistencyError(Exception):
     """It's not only that the Creole XML is valid against the Creole DTD
     it's that it is not consistent.
     """
+    def __init__(self, msg, errno):
+        super().__init__(msg)
+        self.errno = errno
 
 
 class LoaderError(Exception):

src/rougail/objspace.py

@@ -1,140 +1,101 @@
-"""
-Creole flattener. Takes a bunch of Creole XML dispatched in differents folders
-as an input and outputs a human readable flatened XML
 
-Sample usage::
-
-    >>> from rougail.objspace import CreoleObjSpace
-    >>> eolobj = CreoleObjSpace('/usr/share/rougail/rougail.dtd')
-    >>> eolobj.create_or_populate_from_xml('rougail', ['/usr/share/eole/rougail/dicos'])
-    >>> eolobj.space_visitor()
-    >>> eolobj.save('/tmp/rougail_flatened_output.xml')
-
-The CreoleObjSpace
-
-- loads the XML into an internal CreoleObjSpace representation
-- visits/annotates the objects
-- dumps the object space as XML output into a single XML target
-
-The visit/annotation stage is a complex step that corresponds to the Creole
-procedures.
-
-For example: a variable is redefined and shall be moved to another family
-means that a variable1 = Variable() object in the object space who lives in the family1 parent
-has to be moved in family2. The visit procedure changes the varable1's object space's parent.
-"""
-from lxml.etree import Element, SubElement  # pylint: disable=E0611
+from typing import List
 
 from .i18n import _
 from .xmlreflector import XMLReflector
-from .annotator import ERASED_ATTRIBUTES, SpaceAnnotator
-from .tiramisureflector import TiramisuReflector
 from .utils import normalize_family
-from .error import OperationError, SpaceObjShallNotBeUpdated, DictConsistencyError
+from .error import SpaceObjShallNotBeUpdated, DictConsistencyError
 from .path import Path
 from .config import Config
 
-# CreoleObjSpace's elements like 'family' or 'follower', that shall be forced to the Redefinable type
+# RougailObjSpace's elements that shall be forced to the Redefinable type
 FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables')
-# CreoleObjSpace's elements that shall be forced to the UnRedefinable type
+# RougailObjSpace's elements that shall be forced to the UnRedefinable type
 FORCE_UNREDEFINABLES = ('value',)
-# CreoleObjSpace's elements that shall be set to the UnRedefinable type
+# RougailObjSpace's elements that shall not be modify
 UNREDEFINABLE = ('multi', 'type')
-
-CONVERT_PROPERTIES = {'auto_save': ['force_store_value'], 'auto_freeze': ['force_store_value', 'auto_freeze']}
-
-RENAME_ATTIBUTES = {'description': 'doc'}
-
+# RougailObjSpace's elements that did not created automaticly
+FORCE_ELEMENTS = ('choice', 'property_', 'leadership')
+# XML text are convert has name
 FORCED_TEXT_ELTS_AS_NAME = ('choice', 'property', 'value', 'target')
 
-CONVERT_EXPORT = {'Leadership': 'leader',
-                  'Variable': 'variable',
-                  'Value': 'value',
-                  'Property': 'property',
-                  'Choice': 'choice',
-                  'Param': 'param',
-                  'Check': 'check',
-                  }
 
 # _____________________________________________________________________________
 # special types definitions for the Object Space's internal representation
-class RootCreoleObject:
+class RootRougailObject:
     def __init__(self, xmlfiles):
         if not isinstance(xmlfiles, list):
             xmlfiles = [xmlfiles]
         self.xmlfiles = xmlfiles
 
 
-class CreoleObjSpace:
-    """DOM XML reflexion free internal representation of a Creole Dictionary
-    """
-    choice = type('Choice', (RootCreoleObject,), dict())
-    property_ = type('Property', (RootCreoleObject,), dict())
-    # Creole ObjectSpace's Leadership variable class type
-    Leadership = type('Leadership', (RootCreoleObject,), dict())
-    """
-    This Atom type stands for singleton, that is
-    an Object Space's atom object is present only once in the
-    object space's tree
-    """
-    Atom = type('Atom', (RootCreoleObject,), dict())
-    "A variable that can't be redefined"
-    Redefinable = type('Redefinable', (RootCreoleObject,), dict())
-    "A variable can be redefined"
-    UnRedefinable = type('UnRedefinable', (RootCreoleObject,), dict())
+class Atom(RootRougailObject):
+    pass
 
 
-    def __init__(self, dtdfilename):  # pylint: disable=R0912
+class Redefinable(RootRougailObject):
+    pass
+
+
+class UnRedefinable(RootRougailObject):
+    pass
+
+
+class ObjSpace:
+    """
+    Base object space
+    """
+    pass
+
+
+class RougailObjSpace:
+    """Rougail ObjectSpace is an object's reflexion of the XML elements
+    """
+
+    def __init__(self,
+                 xmlreflector: XMLReflector,
+                 ) -> None:
         self.index = 0
-        class ObjSpace:  # pylint: disable=R0903
-            """
-            Base object space
-            """
+        self.xmlreflector = xmlreflector
         self.space = ObjSpace()
         self.paths = Path()
-        self.xmlreflector = XMLReflector()
-        self.xmlreflector.parse_dtd(dtdfilename)
         self.redefine_variables = None
-        self.fill_removed = None
-        self.check_removed = None
-        self.condition_removed = None
 
-        # ['variable', 'separator', 'family']
         self.forced_text_elts = set()
         self.forced_text_elts_as_name = set(FORCED_TEXT_ELTS_AS_NAME)
         self.list_conditions = {}
         self.booleans_attributs = []
 
-        self.make_object_space_class()
+        self.make_object_space_classes()
 
-    def make_object_space_class(self):
-        """Create Rougail ObjectSpace class types, it enables us to create objects like:
+    def make_object_space_classes(self):
+        """Create Rougail ObjectSpace class types from DDT file
+        It enables us to create objects like:
         File(), Variable(), Ip(), Family(), Constraints()... and so on.
-        
-        Creole ObjectSpace is an object's reflexion of the XML elements"""
+        """
 
         for dtd_elt in self.xmlreflector.dtd.iterelements():
             attrs = {}
             if dtd_elt.name in FORCE_REDEFINABLES:
-                clstype = self.Redefinable
+                clstype = Redefinable
+            elif not dtd_elt.attributes() and dtd_elt.name not in FORCE_UNREDEFINABLES:
+                clstype = Atom
             else:
-                clstype = self.UnRedefinable
-            atomic = dtd_elt.name not in FORCE_UNREDEFINABLES and dtd_elt.name not in FORCE_REDEFINABLES
+                clstype = UnRedefinable
             forced_text_elt = dtd_elt.type == 'mixed'
             for dtd_attr in dtd_elt.iterattributes():
-                atomic = False
-                if set(dtd_attr.itervalues()) == set(['True', 'False']):
+                if set(dtd_attr.itervalues()) == {'True', 'False'}:
                     # it's a boolean
                     self.booleans_attributs.append(dtd_attr.name)
                 if dtd_attr.default_value:
                     # set default value for this attribute
                     default_value = dtd_attr.default_value
                     if dtd_attr.name in self.booleans_attributs:
-                        default_value = self.convert_boolean(dtd_attr.default_value)
+                        default_value = self.convert_boolean(default_value)
                     attrs[dtd_attr.name] = default_value
                 if dtd_attr.name == 'redefine':
                     # has a redefine attribute, so it's a Redefinable object
-                    clstype = self.Redefinable
+                    clstype = Redefinable
                 if dtd_attr.name == 'name' and forced_text_elt:
                     # child.text should be transform has a "name" attribute
                     self.forced_text_elts.add(dtd_elt.name)
@@ -142,29 +103,22 @@ class CreoleObjSpace:
 
             if forced_text_elt is True:
                 self.forced_text_elts_as_name.add(dtd_elt.name)
-            if atomic:
-                # has any attribute so it's an Atomic object
-                clstype = self.Atom
 
             # create ObjectSpace object
             setattr(self, dtd_elt.name, type(dtd_elt.name.capitalize(), (clstype,), attrs))
+        for elt in FORCE_ELEMENTS:
+            name = elt.capitalize()
+            if name.endswith('_'):
+                name = name[:-1]
+            setattr(self, elt, type(name, (RootRougailObject,), dict()))
+        self.Leadership = self.leadership
 
-    def create_or_populate_from_xml(self,
-                                    namespace,
-                                    xmlfolders):
-        """Parses a bunch of XML files
-        populates the CreoleObjSpace
-        """
-        for xmlfile, document in self.xmlreflector.load_xml_from_folders(xmlfolders):
-            self.redefine_variables = []
-            self.fill_removed = []
-            self.check_removed = []
-            self.condition_removed = []
-            self.xml_parse_document(xmlfile,
-                                    document,
-                                    self.space,
-                                    namespace,
-                                    )
+    def display_xmlfiles(self,
+                         xmlfiles: list,
+                         ) -> str:
+        if len(xmlfiles) == 1:
+            return '"' + xmlfiles[0] + '"'
+        return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"'
 
     def xml_parse_document(self,
                            xmlfile,
@@ -172,54 +126,55 @@ class CreoleObjSpace:
                            space,
                            namespace,
                            ):
-        """Parses a Creole XML file
-        populates the CreoleObjSpace
+        """Parses a Rougail XML file and populates the RougailObjSpace
         """
+        # var to check unique family name in a XML file
         family_names = []
         for child in document:
             # this index enables us to reorder objects
-            self.index += 1
-            # doesn't proceed the XML commentaries
             if not isinstance(child.tag, str):
+                # doesn't proceed the XML commentaries
                 continue
             if child.tag == 'family':
                 if child.attrib['name'] in family_names:
-                    raise DictConsistencyError(_(f'Family "{child.attrib["name"]}" is set several times in "{xmlfile}"'))
+                    raise DictConsistencyError(_(f'Family "{child.attrib["name"]}" is set several times in "{xmlfile}"'), 44)
                 family_names.append(child.attrib['name'])
             if child.tag == 'variables':
+                # variables has no name, so force namespace name
                 child.attrib['name'] = namespace
-            if child.tag == 'value' and child.text == None:
-                # FIXME should not be here
+            if child.tag == 'value' and child.text is None:
+                # remove empty value
                 continue
             # variable objects creation
             try:
-                variableobj = self.generate_variableobj(xmlfile,
-                                                        child,
-                                                        space,
-                                                        namespace,
-                                                        )
+                variableobj = self.get_variableobj(xmlfile,
+                                                   child,
+                                                   space,
+                                                   namespace,
+                                                   )
             except SpaceObjShallNotBeUpdated:
                 continue
-            self.set_text_to_obj(child,
-                                 variableobj,
-                                 )
-            self.set_xml_attributes_to_obj(xmlfile,
-                                           child,
-                                           variableobj,
-                                           )
-            self.variableobj_tree_visitor(child,
-                                          variableobj,
-                                          namespace,
-                                          )
-            self.fill_variableobj_path_attribute(space,
-                                                 child,
-                                                 namespace,
-                                                 document,
-                                                 variableobj,
-                                                 )
+            self.index += 1
+            self.set_text(child,
+                          variableobj,
+                          )
+            self.set_attributes(xmlfile,
+                                child,
+                                variableobj,
+                                )
+            self.remove(child,
+                        variableobj,
+                        )
+            self.set_path(space,
+                          child,
+                          namespace,
+                          document,
+                          variableobj,
+                          )
             self.add_to_tree_structure(variableobj,
                                        space,
                                        child,
+                                       namespace,
                                        )
             if list(child) != []:
                 self.xml_parse_document(xmlfile,
@@ -228,34 +183,32 @@ class CreoleObjSpace:
                                         namespace,
                                         )
 
-    def generate_variableobj(self,
-                             xmlfile,
-                             child,
-                             space,
-                             namespace,
-                             ):
+    def get_variableobj(self,
+                        xmlfile: str,
+                        child: list,
+                        space,
+                        namespace,
+                        ):
         """
-        instanciates or creates Creole Object Subspace objects
+        retrieves or creates Rougail Object Subspace objects
         """
-        variableobj = getattr(self, child.tag)(xmlfile)
-        if isinstance(variableobj, self.Redefinable):
-            variableobj = self.create_or_update_redefinable_object(xmlfile,
-                                                                   child.attrib,
-                                                                   space,
-                                                                   child,
-                                                                   namespace,
-                                                                   )
-        elif isinstance(variableobj, self.Atom) and child.tag in vars(space):
-            # instanciates an object from the CreoleObjSpace's builtins types
-            # example : child.tag = constraints -> a self.Constraints() object is created
-            # this Atom instance has to be a singleton here
-            # we do not re-create it, we reuse it
-            variableobj = getattr(space, child.tag)
-        self.create_tree_structure(space,
-                                   child,
-                                   variableobj,
-                                   )
-        return variableobj
+        obj = getattr(self, child.tag)
+        if Redefinable in obj.__mro__:
+            return self.create_or_update_redefinable_object(xmlfile,
+                                                            child.attrib,
+                                                            space,
+                                                            child,
+                                                            namespace,
+                                                            )
+        elif Atom in obj.__mro__:
+            if child.tag in vars(space):
+                # Atom instance has to be a singleton here
+                # we do not re-create it, we reuse it
+                return getattr(space, child.tag)
+            return obj(xmlfile)
+        if child.tag not in vars(space):
+            setattr(space, child.tag, [])
+        return obj(xmlfile)
 
     def create_or_update_redefinable_object(self,
                                             xmlfile,
@@ -264,251 +217,113 @@ class CreoleObjSpace:
                                             child,
                                             namespace,
                                             ):
-        """Creates or retrieves the space object that corresponds
-        to the `child` XML object
-
-        Two attributes of the `child` XML object are important:
-
-        - with the `redefine` boolean flag attribute we know whether
-          the corresponding space object shall be created or updated
-
-            - `True` means that the corresponding space object shall be updated
-            - `False` means that the corresponding space object shall be created
-
-        - with the `exists` boolean flag attribute we know whether
-          the corresponding space object shall be created
-          (or nothing -- that is the space object isn't modified)
-
-            - `True` means that the corresponding space object shall be created
-            - `False` means that the corresponding space object is not updated
-
-        In the special case `redefine` is True and `exists` is False,
-        we create the corresponding space object if it doesn't exist
-        and we update it if it exists.
-
-        :return: the corresponding space object of the `child` XML object
-        """
         if child.tag in self.forced_text_elts_as_name:
             name = child.text
         else:
             name = subspace['name']
-        existed_var = self.is_already_exists(name,
-                                             space,
-                                             child,
-                                             namespace,
-                                             )
+        if child.tag == 'family':
+            name = normalize_family(name)
+        existed_var = self.get_existed_obj(name,
+                                           space,
+                                           child,
+                                           namespace,
+                                           )
         if existed_var:
+            # if redefine is set to object, default value is False
+            # otherwise it's always a redefinable object
             default_redefine = child.tag in FORCE_REDEFINABLES
             redefine = self.convert_boolean(subspace.get('redefine', default_redefine))
-            exists = self.convert_boolean(subspace.get('exists', True))
             if redefine is True:
                 existed_var.xmlfiles.append(xmlfile)
-                return self.translate_in_space(name,
-                                               space,
-                                               child,
-                                               namespace,
-                                               )
-            elif exists is False:
+                return existed_var
+            exists = self.convert_boolean(subspace.get('exists', True))
+            if exists is False:
                 raise SpaceObjShallNotBeUpdated()
             xmlfiles = self.display_xmlfiles(existed_var.xmlfiles)
-            raise DictConsistencyError(_(f'"{child.tag}" named "{name}" cannot be re-created in "{xmlfile}", already defined in {xmlfiles}'))
-        redefine = self.convert_boolean(subspace.get('redefine', False))
+            raise DictConsistencyError(_(f'"{child.tag}" named "{name}" cannot be re-created in "{xmlfile}", already defined in {xmlfiles}'), 45)
+        # if this object must only be modified if object already exists
         exists = self.convert_boolean(subspace.get('exists', False))
-        if redefine is False or exists is True:
+        if exists is True:
+            raise SpaceObjShallNotBeUpdated()
+        redefine = self.convert_boolean(subspace.get('redefine', False))
+        if redefine is False:
+            if child.tag not in vars(space):
+                setattr(space, child.tag, {})
             return getattr(self, child.tag)(xmlfile)
-        raise DictConsistencyError(_(f'Redefined object in "{xmlfile}": "{name}" does not exist yet'))
+        raise DictConsistencyError(_(f'Redefined object in "{xmlfile}": "{name}" does not exist yet'), 46)
 
-    def display_xmlfiles(self,
-                         xmlfiles: list,
-                         ) -> str:
-        if len(xmlfiles) == 1:
-            return '"' + xmlfiles[0] + '"'
-        else:
-            return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"'
-
-    def create_tree_structure(self,
-                              space,
-                              child,
-                              variableobj,
-                              ):  # pylint: disable=R0201
-        """
-        Builds the tree structure of the object space here
-        we set services attributes in order to be populated later on
-        for example::
-
-            space = Family()
-            space.variable = dict()
-            another example:
-            space = Variable()
-            space.value = list()
-        """
-        if child.tag not in vars(space):
-            if isinstance(variableobj, self.Redefinable):
-                setattr(space, child.tag, dict())
-            elif isinstance(variableobj, self.UnRedefinable):
-                setattr(space, child.tag, [])
-            elif not isinstance(variableobj, self.Atom):  # pragma: no cover
-                raise OperationError(_("Creole object {} "
-                                             "has a wrong type").format(type(variableobj)))
-
-    def is_already_exists(self,
-                          name: str,
-                          space: str,
-                          child,
-                          namespace: str,
-                          ):
-        if isinstance(space, self.family):  # pylint: disable=E1101
+    def get_existed_obj(self,
+                        name: str,
+                        space: str,
+                        child,
+                        namespace: str,
+                        ):
+        if isinstance(space, self.family):
             if namespace != Config['variable_namespace']:
                 name = space.path + '.' + name
-            if self.paths.path_is_defined(name):
-                return self.paths.get_variable_obj(name)
-            return
-        if child.tag == 'family':
-            norm_name = normalize_family(name)
-        else:
-            norm_name = name
+            if not self.paths.path_is_defined(name):
+                return
+            old_family_name = self.paths.get_variable_family_name(name)
+            if namespace != Config['variable_namespace']:
+                old_family_name = namespace + '.' + old_family_name
+            if space.path != old_family_name:
+                xmlfiles = self.display_xmlfiles(space.xmlfiles)
+                raise DictConsistencyError(_(f'Variable was previously create in family "{old_family_name}", now it is in "{space.path}" in {xmlfiles}'), 47)
+            return self.paths.get_variable_obj(name)
         children = getattr(space, child.tag, {})
-        if norm_name in children:
-            return children[norm_name]
+        if name in children:
+            return children[name]
 
-    def convert_boolean(self, value):  # pylint: disable=R0201
-        """Boolean coercion. The Creole XML may contain srings like `True` or `False`
+    def convert_boolean(self, value):
+        """Boolean coercion. The Rougail XML may contain srings like `True` or `False`
         """
         if isinstance(value, bool):
             return value
         if value == 'True':
             return True
-        elif value == 'False':
-            return False
-        else:
-            raise TypeError(_('{} is not True or False').format(value))  # pragma: no cover
+        return False
 
-    def translate_in_space(self,
-                           name,
-                           family,
-                           variable,
-                           namespace,
-                           ):
-        if not isinstance(family, self.family):  # pylint: disable=E1101
-            if variable.tag == 'family':
-                norm_name = normalize_family(name)
-            else:
-                norm_name = name
-            return getattr(family, variable.tag)[norm_name]
-        if namespace == Config['variable_namespace']:
-            path = name
-        else:
-            path = family.path + '.' + name
-        old_family_name = self.paths.get_variable_family_name(path)
-        if normalize_family(family.name) == old_family_name:
-            return getattr(family, variable.tag)[name]
-        old_family = self.space.variables[Config['variable_namespace']].family[old_family_name]  # pylint: disable=E1101
-        variable_obj = old_family.variable[name]
-        del old_family.variable[name]
-        if 'variable' not in vars(family):
-            family.variable = dict()
-        family.variable[name] = variable_obj
-        self.paths.add_variable(namespace,
-                                name,
-                                family.name,
-                                False,
-                                variable_obj,
-                                )
-        return variable_obj
-
-    def remove_fill(self, name):  # pylint: disable=C0111
-        if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'fill'):
-            remove_fills= []
-            for idx, fill in enumerate(self.space.constraints.fill):  # pylint: disable=E1101
-                if hasattr(fill, 'target') and fill.target == name:
-                    remove_fills.append(idx)
-
-            remove_fills = list(set(remove_fills))
-            remove_fills.sort(reverse=True)
-            for idx in remove_fills:
-                self.space.constraints.fill.pop(idx)  # pylint: disable=E1101
-
-    def remove_check(self, name):  # pylint: disable=C0111
-        if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'check'):
-            remove_checks = []
-            for idx, check in enumerate(self.space.constraints.check):  # pylint: disable=E1101
-                if hasattr(check, 'target') and check.target == name:
-                    remove_checks.append(idx)
-
-            remove_checks = list(set(remove_checks))
-            remove_checks.sort(reverse=True)
-            for idx in remove_checks:
-                self.space.constraints.check.pop(idx)  # pylint: disable=E1101
-
-    def remove_condition(self, name):  # pylint: disable=C0111
-        for idx, condition in enumerate(self.space.constraints.condition):  # pylint: disable=E1101
-            remove_targets = []
-            if hasattr(condition, 'target'):
-                for target_idx, target in enumerate(condition.target):
-                    if target.name == name:
-                        remove_targets.append(target_idx)
-            remove_targets = list(set(remove_targets))
-            remove_targets.sort(reverse=True)
-            for idx in remove_targets:
-                del condition.target[idx]
-
-    def add_to_tree_structure(self,
-                              variableobj,
-                              space,
-                              child,
-                              ):  # pylint: disable=R0201
-        if isinstance(variableobj, self.Redefinable):
-            name = variableobj.name
-            if child.tag == 'family':
-                name = normalize_family(name)
-            getattr(space, child.tag)[name] = variableobj
-        elif isinstance(variableobj, self.UnRedefinable):
-            getattr(space, child.tag).append(variableobj)
-        else:
-            setattr(space, child.tag, variableobj)
-
-    def set_text_to_obj(self,
-                        child,
-                        variableobj,
-                        ):
+    def set_text(self,
+                 child,
+                 variableobj,
+                 ):
         if child.text is None:
-            text = None
+            return
+        text = child.text.strip()
+        if not text:
+            return
+        if child.tag in self.forced_text_elts_as_name:
+            variableobj.name = text
         else:
-            text = child.text.strip()
-        if text:
-            if child.tag in self.forced_text_elts_as_name:
-                variableobj.name = text
-            else:
-                variableobj.text = text
+            variableobj.text = text
 
-    def set_xml_attributes_to_obj(self,
-                                  xmlfile,
-                                  child,
-                                  variableobj,
-                                  ):
+    def set_attributes(self,
+                       xmlfile,
+                       child,
+                       variableobj,
+                       ):
         redefine = self.convert_boolean(child.attrib.get('redefine', False))
-        has_value = hasattr(variableobj, 'value')
-        if redefine is True and child.tag == 'variable' and has_value and len(child) != 0:
-            del variableobj.value
+        if redefine and child.tag == 'variable':
+            # delete old values
+            has_value = hasattr(variableobj, 'value')
+            if has_value and len(child) != 0:
+                del variableobj.value
         for attr, val in child.attrib.items():
             if redefine and attr in UNREDEFINABLE:
-                # UNREDEFINABLE concerns only 'variable' node so we can fix name
-                # to child.attrib['name']
-                name = child.attrib['name']
                 xmlfiles = self.display_xmlfiles(variableobj.xmlfiles[:-1])
-                raise DictConsistencyError(_(f'cannot redefine attribute "{attr}" for variable "{name}" in "{xmlfile}", already defined in {xmlfiles}'))
+                raise DictConsistencyError(_(f'cannot redefine attribute "{attr}" for variable "{child.attrib["name"]}" in "{xmlfile}", already defined in {xmlfiles}'), 48)
             if attr in self.booleans_attributs:
                 val = self.convert_boolean(val)
-            if not (attr == 'name' and getattr(variableobj, 'name', None) != None):
-                setattr(variableobj, attr, val)
-        keys = list(vars(variableobj).keys())
+            if attr == 'name' and getattr(variableobj, 'name', None):
+                # do not redefine name
+                continue
+            setattr(variableobj, attr, val)
 
-    def variableobj_tree_visitor(self,
-                                 child,
-                                 variableobj,
-                                 namespace,
-                                 ):
-        """Creole object tree manipulations
+    def remove(self,
+               child,
+               variableobj,
+               ):
+        """Rougail object tree manipulations
         """
         if child.tag == 'variable':
             if child.attrib.get('remove_check', False):
@@ -517,41 +332,59 @@ class CreoleObjSpace:
                 self.remove_condition(variableobj.name)
             if child.attrib.get('remove_fill', False):
                 self.remove_fill(variableobj.name)
-        if child.tag == 'fill':
-            # if variable is a redefine in current dictionary
-            # XXX not working with variable not in variable and in leader/followers
-            variableobj.redefine = child.attrib['target'] in self.redefine_variables
-            if child.attrib['target'] in self.redefine_variables and child.attrib['target'] not in self.fill_removed:
-                self.remove_fill(child.attrib['target'])
-                self.fill_removed.append(child.attrib['target'])
-        if not hasattr(variableobj, 'index'):
-            variableobj.index = self.index
-        if child.tag == 'check' and child.attrib['target'] in self.redefine_variables and child.attrib['target'] not in self.check_removed:
-            self.remove_check(child.attrib['target'])
-            self.check_removed.append(child.attrib['target'])
-        if child.tag == 'condition' and child.attrib['source'] in self.redefine_variables and child.attrib['source'] not in self.condition_removed:
-            self.remove_condition(child.attrib['source'])
-            self.condition_removed.append(child.attrib['source'])
-        variableobj.namespace = namespace
+        if child.tag == 'fill' and child.attrib['target'] in self.redefine_variables:
+            self.remove_fill(child.attrib['target'])
 
-    def fill_variableobj_path_attribute(self,
-                                        space,
-                                        child,
-                                        namespace,
-                                        document,
-                                        variableobj,
-                                        ):  # pylint: disable=R0913
+    def remove_check(self, name):
+        if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'check'):
+            remove_checks = []
+            for idx, check in enumerate(self.space.constraints.check):
+                if hasattr(check, 'target') and check.target == name:
+                    remove_checks.append(idx)
+
+            remove_checks = list(set(remove_checks))
+            remove_checks.sort(reverse=True)
+            for idx in remove_checks:
+                self.space.constraints.check.pop(idx)
+
+    def remove_condition(self, name):
+        remove_conditions = []
+        for idx, condition in enumerate(self.space.constraints.condition):
+            if condition.source == name:
+                remove_conditions.append(idx)
+        for idx in remove_conditions:
+            del self.space.constraints.condition[idx]
+
+    def remove_fill(self, name):
+        if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'fill'):
+            remove_fills= []
+            for idx, fill in enumerate(self.space.constraints.fill):
+                if hasattr(fill, 'target') and fill.target == name:
+                    remove_fills.append(idx)
+
+            remove_fills = list(set(remove_fills))
+            remove_fills.sort(reverse=True)
+            for idx in remove_fills:
+                self.space.constraints.fill.pop(idx)
+
+    def set_path(self,
+                 space,
+                 child,
+                 namespace,
+                 document,
+                 variableobj,
+                 ):
         """Fill self.paths attributes
         """
-        if isinstance(space, self.help):  # pylint: disable=E1101
-            return
         if child.tag == 'variable':
-            family_name = normalize_family(document.attrib['name'])
+            family_name = document.attrib['name']
+            family_name = normalize_family(family_name)
             self.paths.add_variable(namespace,
                                     child.attrib['name'],
                                     family_name,
                                     document.attrib.get('dynamic') != None,
-                                    variableobj)
+                                    variableobj,
+                                    )
             if child.attrib.get('redefine', 'False') == 'True':
                 if namespace == Config['variable_namespace']:
                     self.redefine_variables.append(child.attrib['name'])
@@ -569,13 +402,21 @@ class CreoleObjSpace:
                                   )
             variableobj.path = self.paths.get_family_path(family_name, namespace)
 
-    def space_visitor(self, eosfunc_file):  # pylint: disable=C0111
-        self.funcs_path = eosfunc_file
-        SpaceAnnotator(self, eosfunc_file)
-
-    def save(self,
-             ):
-        tiramisu_objects = TiramisuReflector(self.space,
-                                             self.funcs_path,
-                                             )
-        return tiramisu_objects.get_text() + '\n'
+    def add_to_tree_structure(self,
+                              variableobj,
+                              space,
+                              child,
+                              namespace,
+                              ):
+        if not hasattr(variableobj, 'index'):
+            variableobj.index = self.index
+        variableobj.namespace = namespace
+        if isinstance(variableobj, Redefinable):
+            name = variableobj.name
+            if child.tag == 'family':
+                name = normalize_family(name)
+            getattr(space, child.tag)[name] = variableobj
+        elif isinstance(variableobj, UnRedefinable):
+            getattr(space, child.tag).append(variableobj)
+        else:
+            setattr(space, child.tag, variableobj)

src/rougail/path.py

@@ -28,7 +28,7 @@ class Path:
         else:
             full_name = name
         if full_name in self.families and self.families[full_name]['variableobj'] != variableobj:
-            raise DictConsistencyError(_(f'Duplicate family name {name}'))
+            raise DictConsistencyError(_(f'Duplicate family name {name}'), 37)
         self.families[full_name] = dict(name=name,
                                         namespace=namespace,
                                         variableobj=variableobj,
@@ -38,19 +38,14 @@ class Path:
                         name: str,
                         current_namespace: str,
                         ) -> str:  # pylint: disable=C0111
-        name = normalize_family(name,
-                                check_name=False,
-                                allow_dot=True,
-                                )
+        #name = normalize_family(name)
         if '.' not in name and current_namespace == Config['variable_namespace'] and name in self.full_paths_families:
             name = self.full_paths_families[name]
         if current_namespace is None:  # pragma: no cover
             raise OperationError('current_namespace must not be None')
         dico = self.families[name]
         if dico['namespace'] != Config['variable_namespace'] and current_namespace != dico['namespace']:
-            raise DictConsistencyError(_('A family located in the {} namespace '
-                                               'shall not be used in the {} namespace').format(
-                                                   dico['namespace'], current_namespace))
+            raise DictConsistencyError(_(f'A family located in the "{dico["namespace"]}" namespace shall not be used in the "{current_namespace}" namespace'), 38)
         return dico['name']
 
     def get_family_obj(self,
@@ -59,7 +54,7 @@ class Path:
         if '.' not in name and name in self.full_paths_families:
             name = self.full_paths_families[name]
         if name not in self.families:
-            raise DictConsistencyError(_('unknown family {}').format(name))
+            raise DictConsistencyError(_('unknown family {}').format(name), 39)
         dico = self.families[name]
         return dico['variableobj']
 
@@ -95,7 +90,7 @@ class Path:
         dico = self._get_variable(name)
         if dico['leader'] != None:
             raise DictConsistencyError(_('Already defined leader {} for variable'
-                                         ' {}'.format(dico['leader'], name)))
+                                         ' {}'.format(dico['leader'], name)), 40)
         dico['leader'] = leader_name
 
     def get_leader(self, name):  # pylint: disable=C0111
@@ -159,9 +154,7 @@ class Path:
             dico = self._get_variable(name)
         if not allow_source:
             if dico['namespace'] not in [Config['variable_namespace'], 'services'] and current_namespace != dico['namespace']:
-                raise DictConsistencyError(_('A variable located in the {} namespace '
-                                                   'shall not be used in the {} namespace').format(
-                                                       dico['namespace'], current_namespace))
+                raise DictConsistencyError(_(f'A variable located in the "{dico["namespace"]}" namespace shall not be used in the "{current_namespace}" namespace'), 41)
         if '.' in dico['name']:
             value = dico['name']
         else:
@@ -203,7 +196,7 @@ class Path:
                                 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))
+                raise DictConsistencyError(_('unknown option {}').format(name), 42)
         if with_suffix:
             return self.variables[name], None
         return self.variables[name]

src/rougail/rougail.py

@@ -0,0 +1,63 @@
+"""
+Takes a bunch of Rougail XML dispatched in differents folders
+as an input and outputs a Tiramisu's file
+
+Sample usage::
+
+    >>> from rougail import Rougail
+    >>> rougail = Rougail('/usr/share/rougail/rougail.dtd')
+    >>> rougail.create_or_populate_from_xml('rougail', ['/usr/share/rougail/dicos'])
+    >>> rougail.space_visitor('/usr/share/rougail/funcs.py')
+    >>> tiramisu = rougail.save()
+
+The Rougail
+
+- loads the XML into an internal RougailObjSpace representation
+- visits/annotates the objects
+- dumps the object space as Tiramisu string
+
+The visit/annotation stage is a complex step that corresponds to the Rougail
+procedures.
+"""
+
+from typing import List
+from .objspace import RougailObjSpace
+from .xmlreflector import XMLReflector
+from .tiramisureflector import TiramisuReflector
+from .annotator import SpaceAnnotator
+
+
+class Rougail:
+    def __init__(self,
+                 dtdfilename: str,
+                 ) -> None:
+        self.xmlreflector = XMLReflector()
+        self.xmlreflector.parse_dtd(dtdfilename)
+        self.rougailobjspace = RougailObjSpace(self.xmlreflector)
+
+    def create_or_populate_from_xml(self,
+                                    namespace: str,
+                                    xmlfolders: List[str],
+                                    ) -> List[str]:
+        """Parses a bunch of XML files and populates the RougailObjSpace
+        """
+        for xmlfile in self.xmlreflector.load_xml_from_folders(xmlfolders):
+            document = self.xmlreflector.parse_xmlfile(xmlfile)
+            self.rougailobjspace.redefine_variables = []
+            self.rougailobjspace.xml_parse_document(xmlfile,
+                                                    document,
+                                                    self.rougailobjspace.space,
+                                                    namespace,
+                                                    )
+
+    def space_visitor(self,
+                      eosfunc_file: str,
+                      ) -> None:
+        self.funcs_path = eosfunc_file
+        SpaceAnnotator(self.rougailobjspace, eosfunc_file)
+
+    def save(self) -> str:
+        tiramisu_objects = TiramisuReflector(self.rougailobjspace.space,
+                                             self.funcs_path,
+                                             )
+        return tiramisu_objects.get_text() + '\n'

src/rougail/template.py

@@ -4,13 +4,13 @@ Gestion du mini-langage de template
 On travaille sur les fichiers cibles
 """
 
-import imp
+from importlib.machinery import SourceFileLoader
 from shutil import copy
 import logging
 from typing import Dict, Any
 from subprocess import call
-from os import listdir, makedirs
-from os.path import dirname, join, isfile, abspath, normpath
+from os import listdir, makedirs, getcwd, chdir
+from os.path import dirname, join, isfile, abspath, normpath, relpath
 
 from Cheetah.Template import Template as ChtTemplate
 from Cheetah.NameMapper import NotFound as CheetahNotFound
@@ -79,7 +79,8 @@ class CheetahTemplate(ChtTemplate):
                  context,
                  eosfunc: Dict,
                  destfilename,
-                 variable):
+                 variable,
+                 ):
         """Initialize Creole CheetahTemplate
         """
         extra_context = {'is_defined' : IsDefined(context),
@@ -93,11 +94,15 @@ class CheetahTemplate(ChtTemplate):
                              searchList=[context, eosfunc, extra_context])
 
     # FORK of Cheetah fonction, do not replace '\\' by '/'
-    def serverSidePath(self, path=None,
+    def serverSidePath(self,
+                       path=None,
                        normpath=normpath,
                        abspath=abspath
                        ):
 
+        # strange...
+        if path is None and isinstance(self, str):
+            path = self
         if path:
             return normpath(abspath(path))
 #            return normpath(abspath(path.replace("\\", '/')))
@@ -107,7 +112,6 @@ class CheetahTemplate(ChtTemplate):
             return None
 
 
-
 class CreoleLeader:
     def __init__(self, value, follower=None, index=None):
         """
@@ -248,7 +252,7 @@ class CreoleTemplateEngine:
         self.distrib_dir = distrib_dir
         eos = {}
         if eosfunc_file is not None:
-            eosfunc = imp.load_source('eosfunc', eosfunc_file)
+            eosfunc = SourceFileLoader('eosfunc', eosfunc_file).load_module()
             for func in dir(eosfunc):
                  if not func.startswith('_'):
                      eos[func] = getattr(eosfunc, func)
@@ -302,37 +306,43 @@ class CreoleTemplateEngine:
         return CreoleExtra(families)
 
     def patch_template(self,
-                       filename: str):
+                       filename: str,
+                       tmp_dir: str,
+                       patch_dir: str,
+                       ) -> None:
         """Apply patch to a template
         """
-        patch_cmd = ['patch', '-d', self.tmp_dir, '-N', '-p1']
+        patch_cmd = ['patch', '-d', tmp_dir, '-N', '-p1']
         patch_no_debug = ['-s', '-r', '-', '--backup-if-mismatch']
 
-        # patches variante + locaux
-        for directory in [join(Config['patch_dir'], 'variante'), Config['patch_dir']]:
-            patch_file = join(directory, f'{filename}.patch')
-            if isfile(patch_file):
-                log.info(_("Patching template '{filename}' with '{patch_file}'"))
-                ret = call(patch_cmd + patch_no_debug + ['-i', patch_file])
-                if ret:
-                    patch_cmd_err = ' '.join(patch_cmd + ['-i', patch_file])
-                    log.error(_(f"Error applying patch: '{patch_file}'\nTo reproduce and fix this error {patch_cmd_err}"))
-                    copy(filename, self.tmp_dir)
+        patch_file = join(patch_dir, f'{filename}.patch')
+        if isfile(patch_file):
+            log.info(_("Patching template '{filename}' with '{patch_file}'"))
+            rel_patch_file = relpath(patch_file, tmp_dir)
+            ret = call(patch_cmd + patch_no_debug + ['-i', rel_patch_file])
+            if ret:
+                patch_cmd_err = ' '.join(patch_cmd + ['-i', rel_patch_file])
+                log.error(_(f"Error applying patch: '{rel_patch_file}'\nTo reproduce and fix this error {patch_cmd_err}"))
+                copy(join(self.distrib_dir, filename), tmp_dir)
 
     def prepare_template(self,
-                         filename: str):
+                         filename: str,
+                         tmp_dir: str,
+                         patch_dir: str,
+                         ) -> None:
         """Prepare template source file
         """
-        log.info(_("Copy template: '{filename}' -> '{self.tmp_dir}'"))
-        copy(filename, self.tmp_dir)
-        self.patch_template(filename)
+        log.info(_("Copy template: '{filename}' -> '{tmp_dir}'"))
+        copy(filename, tmp_dir)
+        self.patch_template(filename, tmp_dir, patch_dir)
 
     def process(self,
                 source: str,
                 true_destfilename: str,
                 destfilename: str,
                 filevar: Dict,
-                variable: Any):
+                variable: Any,
+                ):
         """Process a cheetah template
         """
         # full path of the destination file
@@ -347,16 +357,19 @@ class CreoleTemplateEngine:
             data = str(cheetah_template)
         except CheetahNotFound as err:
             varname = err.args[0][13:-1]
-            raise TemplateError(_(f"Error: unknown variable used in template {destfilename} : {varname}"))
+            raise TemplateError(_(f"Error: unknown variable used in template {source} to {destfilename} : {varname}"))
         except Exception as err:
-            raise TemplateError(_(f"Error while instantiating template {destfilename}: {err}"))
+            raise TemplateError(_(f"Error while instantiating template {source} to {destfilename}: {err}"))
 
         with open(destfilename, 'w') as file_h:
             file_h.write(data)
 
     def instance_file(self,
                       filevar: Dict,
-                      service_name: str) -> None:
+                      service_name: str,
+                      tmp_dir: str,
+                      dest_dir: str,
+                      ) -> None:
         """Run templatisation on one file
         """
         log.info(_("Instantiating file '{filename}'"))
@@ -370,13 +383,13 @@ class CreoleTemplateEngine:
             if variable:
                 variable = [variable]
         for idx, filename in enumerate(filenames):
-            destfilename = join(self.dest_dir, filename[1:])
+            destfilename = join(dest_dir, filename[1:])
             makedirs(dirname(destfilename), exist_ok=True)
             if variable:
                 var = variable[idx]
             else:
                 var = None
-            source = join(self.tmp_dir, filevar['source'])
+            source = join(tmp_dir, filevar['source'])
             if filevar['templating']:
                 self.process(source,
                              filename,
@@ -389,6 +402,11 @@ class CreoleTemplateEngine:
     async def instance_files(self) -> None:
         """Run templatisation on all files
         """
+        ori_dir = getcwd()
+        tmp_dir = relpath(self.tmp_dir, self.distrib_dir)
+        dest_dir = relpath(self.dest_dir, self.distrib_dir)
+        patch_dir = relpath(Config['patch_dir'], self.distrib_dir)
+        chdir(self.distrib_dir)
         for option in await self.config.option.list(type='all'):
             namespace = await option.option.name()
             if namespace == Config['variable_namespace']:
@@ -397,8 +415,8 @@ class CreoleTemplateEngine:
                 families = await self.load_eole_variables(namespace,
                                                           option)
                 self.rougail_variables_dict[namespace] = families
-        for template in listdir(self.distrib_dir):
-            self.prepare_template(join(self.distrib_dir, template))
+        for template in listdir('.'):
+            self.prepare_template(template, tmp_dir, patch_dir)
         for service_obj in await self.config.option('services').list('all'):
             service_name = await service_obj.option.doc()
             for fills in await service_obj.list('all'):
@@ -406,15 +424,17 @@ class CreoleTemplateEngine:
                     for fill_obj in await fills.list('all'):
                         fill = await fill_obj.value.dict()
                         filename = fill['source']
-                        distib_file = join(self.distrib_dir, filename)
-                        if not isfile(distib_file):
-                            raise FileNotFound(_(f"File {distib_file} does not exist."))
+                        if not isfile(filename):
+                            raise FileNotFound(_(f"File {filename} does not exist."))
                         if fill.get('activate', False):
                             self.instance_file(fill,
                                                service_name,
+                                               tmp_dir,
+                                               dest_dir,
                                                )
                         else:
                             log.debug(_("Instantiation of file '{filename}' disabled"))
+        chdir(ori_dir)
 
 
 async def generate(config: Config,

src/rougail/tiramisu.py

@@ -9,5 +9,4 @@ class ConvertDynOptionDescription(DynOptionDescription):
     def convert_suffix_to_path(self, suffix):
         if not isinstance(suffix, str):
             suffix = str(suffix)
-        return normalize_family(suffix,
-                                check_name=False)
+        return normalize_family(suffix)

src/rougail/tiramisureflector.py

@@ -18,10 +18,10 @@ class TiramisuReflector:
                  funcs_path,
                  ):
         self.storage = ElementStorage()
-        self.storage.text = ["import imp",
-                             f"func = imp.load_source('func', '{funcs_path}')",
+        self.storage.text = ["from importlib.machinery import SourceFileLoader",
+                             f"func = SourceFileLoader('func', '{funcs_path}').load_module()",
                              "for key, value in dict(locals()).items():",
-                             "    if key != ['imp', 'func']:",
+                             "    if key != ['SourceFileLoader', 'func']:",
                              "        setattr(func, key, value)",
                              "try:",
                              "    from tiramisu3 import *",

src/rougail/utils.py

@@ -1,23 +1,14 @@
 """
 utilitaires créole
 """
-import unicodedata
+from unicodedata import normalize, combining
 from .i18n import _
 
 
-def normalize_family(family_name: str,
-                     check_name: bool=True,
-                     allow_dot: bool=False) -> str:
+def normalize_family(family_name: str) -> str:
     """replace space, accent, uppercase, ... by valid character
     """
-    family_name = family_name.replace('-', '_')
-    if not allow_dot:
-        family_name = family_name.replace('.', '_')
-    family_name = family_name.replace(' ', '_')
-    nfkd_form = unicodedata.normalize('NFKD', family_name)
-    family_name = ''.join([c for c in nfkd_form if not unicodedata.combining(c)])
-    family_name = family_name.lower()
-    if check_name and family_name == 'containers':
-        raise ValueError(_(f'"{family_name}" is a forbidden family name'))
-    return family_name
-
+    family_name = family_name.replace('-', '_').replace(' ', '_').replace('.', '_')
+    nfkd_form = normalize('NFKD', family_name)
+    family_name = ''.join([c for c in nfkd_form if not combining(c)])
+    return family_name.lower()

src/rougail/xml_compare.py

@@ -1,161 +0,0 @@
-try:
-    import doctest
-    doctest.OutputChecker
-except (AttributeError, ImportError): # Python < 2.4
-    import util.doctest24 as doctest
-try:
-    import xml.etree.ElementTree as ET
-except ImportError:
-    import elementtree.ElementTree as ET
-from xml.parsers.expat import ExpatError as XMLParseError
-
-RealOutputChecker = doctest.OutputChecker
-
-
-def debug(*msg):
-    import sys
-    print >> sys.stderr, ' '.join(map(str, msg))
-
-
-class HTMLOutputChecker(RealOutputChecker):
-
-    def check_output(self, want, got, optionflags):
-        normal = RealOutputChecker.check_output(self, want, got, optionflags)
-        if normal or not got:
-            return normal
-        try:
-            want_xml = make_xml(want)
-        except XMLParseError:
-            pass
-        else:
-            try:
-                got_xml = make_xml(got)
-            except XMLParseError:
-                pass
-            else:
-                if xml_compare(want_xml, got_xml):
-                    return True
-        return False
-
-    def output_difference(self, example, got, optionflags):
-        actual = RealOutputChecker.output_difference(
-            self, example, got, optionflags)
-        want_xml = got_xml = None
-        try:
-            want_xml = make_xml(example.want)
-            want_norm = make_string(want_xml)
-        except XMLParseError as e:
-            if example.want.startswith('<'):
-                want_norm = '(bad XML: %s)' % e
-                #  '<xml>%s</xml>' % example.want
-            else:
-                return actual
-        try:
-            got_xml = make_xml(got)
-            got_norm = make_string(got_xml)
-        except XMLParseError as e:
-            if example.want.startswith('<'):
-                got_norm = '(bad XML: %s)' % e
-            else:
-                return actual
-        s = '%s\nXML Wanted: %s\nXML Got   : %s\n' % (
-            actual, want_norm, got_norm)
-        if got_xml and want_xml:
-            result = []
-            xml_compare(want_xml, got_xml, result.append)
-            s += 'Difference report:\n%s\n' % '\n'.join(result)
-        return s
-
-
-def xml_sort(children):
-    tcl1 = {}
-    #idx = 0
-
-    for child in children:
-        if 'name' in child.attrib:
-            key = child.attrib['name']
-        else:
-            key = child.tag
-        if key not in tcl1:
-            tcl1[key] = []
-        tcl1[key].append(child)
-    cl1_keys = list(tcl1.keys())
-    cl1_keys.sort()
-    cl1 = []
-    for key in cl1_keys:
-        cl1.extend(tcl1[key])
-    return cl1
-
-def xml_compare(x1, x2):
-    if x1.tag != x2.tag:
-        print ('Tags do not match: %s and %s' % (x1.tag, x2.tag))
-        return False
-    for name, value in x1.attrib.items():
-        if x2.attrib.get(name) != value:
-            print ('Attributes do not match: %s=%r, %s=%r'
-                     % (name, value, name, x2.attrib.get(name)))
-            return False
-    for name in x2.attrib:
-        if name not in x1.attrib:
-            print ('x2 has an attribute x1 is missing: %s'
-                     % name)
-            return False
-    if not text_compare(x1.text, x2.text):
-        print ('text: %r != %r' % (x1.text, x2.text))
-        return False
-    if not text_compare(x1.tail, x2.tail):
-        print ('tail: %r != %r' % (x1.tail, x2.tail))
-        return False
-
-    cl1 = xml_sort(x1.getchildren())
-    cl2 = xml_sort(x2.getchildren())
-
-    if len(cl1) != len(cl2):
-        cl1_tags = []
-        for c in cl1:
-            cl1_tags.append(c.tag)
-        cl2_tags = []
-        for c in cl2:
-            cl2_tags.append(c.tag)
-        print ('children length differs, %i != %i (%s != %s)'
-                 % (len(cl1), len(cl2), cl1_tags, cl2_tags))
-        return False
-    i = 0
-    for c1, c2 in zip(cl1, cl2):
-        i += 1
-        if not xml_compare(c1, c2):
-            if 'name' in c1.attrib:
-                name = c1.attrib['name']
-            else:
-                name = i
-            print ('in tag "%s" with name "%s"'
-                     % (c1.tag, name))
-            return False
-    return True
-
-
-def text_compare(t1, t2):
-    if not t1 and not t2:
-        return True
-    if t1 == '*' or t2 == '*':
-        return True
-    return (t1 or '').strip() == (t2 or '').strip()
-
-
-def make_xml(s):
-    return ET.XML('<xml>%s</xml>' % s)
-
-
-def make_string(xml):
-    if isinstance(xml, (str, unicode)):
-        xml = make_xml(xml)
-    s = ET.tostring(xml)
-    if s == '<xml />':
-        return ''
-    assert s.startswith('<xml>') and s.endswith('</xml>'), repr(s)
-    return s[5:-6]
-
-
-def install():
-    doctest.OutputChecker = HTMLOutputChecker
-

src/rougail/xmlreflector.py

@@ -1,9 +1,9 @@
 # coding: utf-8
-from os.path import join, isfile, basename, isdir
+from typing import List
+from os.path import join, isfile
 from os import listdir
-#from io import BytesIO
 
-from lxml.etree import DTD, parse, tostring  # , XMLParser
+from lxml.etree import DTD, parse, tostring, XMLSyntaxError
 
 from .i18n import _
 from .error import DictConsistencyError
@@ -34,57 +34,23 @@ class XMLReflector(object):
 
         :returns: the root element tree object
         """
-        # document = parse(BytesIO(xmlfile), XMLParser(remove_blank_text=True))
-        document = parse(xmlfile)
+        try:
+            document = parse(xmlfile)
+        except XMLSyntaxError as err:
+            raise DictConsistencyError(_(f'{xmlfile} is not an XML file: {err}'), 52)
         if not self.dtd.validate(document):
-            raise DictConsistencyError(_(f'"{xmlfile}" not a valid xml file: {self.dtd.error_log.filter_from_errors()[0]}'))
+            raise DictConsistencyError(_(f'"{xmlfile}" not a valid XML file: {self.dtd.error_log.filter_from_errors()[0]}'), 43)
         return document.getroot()
 
-    def load_xml_from_folders(self, xmlfolders):
+    def load_xml_from_folders(self,
+                              xmlfolders: List[str],
+                              ):
         """Loads all the XML files located in the xmlfolders' list
 
         :param xmlfolders: list of full folder's name
         """
-        documents = []
-        if not isinstance(xmlfolders, list):
-            xmlfolders = [xmlfolders]
         for xmlfolder in xmlfolders:
-            if isinstance(xmlfolder, list) or isinstance(xmlfolder, tuple):
-                # directory group : collect files from each
-                # directory and sort them before loading
-                group_files = []
-                for idx, subdir in enumerate(xmlfolder):
-                    if isdir(subdir):
-                        for filename in listdir(subdir):
-                            group_files.append((filename, idx, subdir))
-                    else:
-                        group_files.append(basename(subdir), idx, dirname(subdir))
-                def sort_group(file1, file2):
-                    if file1[0] == file2[0]:
-                        # sort by initial xmlfolder order if same name
-                        return file1[1].__cmp__(file2[1])
-                    # sort by filename
-                    elif file1[0] > file2[0]:
-                        return 1
-                    else:
-                        return -1
-                group_files.sort(sort_group)
-                filenames = [join(f[2], f[0]) for f in group_files]
-            elif isdir(xmlfolder):
-                filenames = []
-                for filename in listdir(xmlfolder):
-                    filenames.append(join(xmlfolder, filename))
-                filenames.sort()
-            else:
-                filenames = [xmlfolder]
+            filenames = [join(xmlfolder, filename) for filename in listdir(xmlfolder) if filename.endswith('.xml')]
+            filenames.sort()
             for xmlfile in filenames:
-                if xmlfile.endswith('.xml'):
-                    #xmlfile_path = join(xmlfolder, xmlfile)
-                    documents.append((xmlfile, self.parse_xmlfile(xmlfile)))
-        return documents
-
-    def save_xmlfile(self, xmlfilename, xml):  # pylint: disable=R0201
-        """Write a bunch of XML on the disk
-        """
-        with open(xmlfilename, 'w') as xmlfh:
-            xmlfh.write(tostring(xml, pretty_print=True, encoding="UTF-8", xml_declaration=True).decode('utf8'))
+                yield xmlfile

tests/dictionaries/00empty/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_autofreeze/00-base.xml

@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
@@ -10,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/00load_autofreeze/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_autofreezeexpert/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True" mode="expert">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_autosave/00-base.xml

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/00load_autosave/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_autosaveexpert/00-base.xml

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True" mode="expert">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/00load_autosaveexpert/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_comment/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <!-- this is a comment -->
@@ -10,14 +7,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/00load_comment/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_notype/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/00load_notype/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_save/00-base.xml

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/00load_save/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_subfolder/99-base.xml

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/00load_subfolder/subfolder/00-base.xml

@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <rougail>
-
-    <services/>
-
     <variables>
         <family name='général'>
             <variable name='mode_conteneur_actif1' type='oui/non' description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/00load_subfolder/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01auto_base/00-base.xml

@@ -1,8 +1,5 @@
 <?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">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01auto_base/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01auto_withoutparam/00-base.xml

@@ -1,8 +1,5 @@
 <?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">
@@ -12,16 +9,12 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <fill name="calc_val" target="mode_conteneur_actif">
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01auto_withoutparam/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_file_include/00-base.xml

@@ -1,24 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
 
-    <services/>
+    <services>
+        <service name="test">
+            <file name="/etc/file"/>
+        </service>
+    </services>
 
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="redefine help" hidden="True">
+            <variable name="mode_conteneur_actif" type="oui/non" description="Description">
                 <value>non</value>
             </variable>
         </family>
         <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help>
-        <variable name="mode_conteneur_actif">redefine help</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01base_file_include/makedict/base.json

@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.group": "root", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.templating": true, "services.test.files.file.activate": true}

tests/dictionaries/01base_file_include/result/etc/file

@@ -0,0 +1 @@
+non

tests/dictionaries/01base_file_include/tiramisu/base.py

@@ -0,0 +1,26 @@
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', 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_8 = StrOption(name='group', doc='group', multi=False, default='root')
+option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644')
+option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/file')
+option_11 = StrOption(name='owner', doc='owner', multi=False, default='root')
+option_12 = StrOption(name='source', doc='source', multi=False, default='file')
+option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True)
+option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True)
+option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14])
+option_6 = OptionDescription(name='files', doc='files', children=[option_7])
+option_5 = OptionDescription(name='test', doc='test', children=[option_6])
+option_5.impl_set_information("manage", True)
+option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])

tests/dictionaries/01base_file_include/tmpl/file

@@ -0,0 +1 @@
+%include "incfile"

tests/dictionaries/01base_file_include/tmpl/incfile

@@ -0,0 +1 @@
+%%mode_conteneur_actif

tests/dictionaries/01base_file_patch/00-base.xml

@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+
+    <services>
+        <service name="test">
+            <file name="/etc/file"/>
+        </service>
+    </services>
+
+    <variables>
+        <family name="general">
+            <variable name="mode_conteneur_actif" type="oui/non" description="Description">
+                <value>non</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/01base_file_patch/makedict/base.json

@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.group": "root", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.templating": true, "services.test.files.file.activate": true}

tests/dictionaries/01base_file_patch/patches/file.patch

@@ -0,0 +1,5 @@
+--- tmpl/file	2020-11-20 07:44:38.588472784 +0100
++++ dest/file	2020-11-20 07:44:54.588536011 +0100
+@@ -1 +1 @@
+-unpatched
++patched

tests/dictionaries/01base_file_patch/result/etc/file

@@ -0,0 +1 @@
+patched

tests/dictionaries/01base_file_patch/tiramisu/base.py

@@ -0,0 +1,26 @@
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', 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_8 = StrOption(name='group', doc='group', multi=False, default='root')
+option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644')
+option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/file')
+option_11 = StrOption(name='owner', doc='owner', multi=False, default='root')
+option_12 = StrOption(name='source', doc='source', multi=False, default='file')
+option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True)
+option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True)
+option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14])
+option_6 = OptionDescription(name='files', doc='files', children=[option_7])
+option_5 = OptionDescription(name='test', doc='test', children=[option_6])
+option_5.impl_set_information("manage", True)
+option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])

tests/dictionaries/01base_file_patch/tmpl/file

@@ -0,0 +1 @@
+unpatched

tests/dictionaries/01base_file_utfchar/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_float/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_multi/00-base.xml

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="Redefine description" hidden="True" multi="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01base_multi/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_var_name_same_family/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_autofreeze/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -23,9 +19,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01fill_autofreeze/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_autosave/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01fill_autosave/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_baseaccent/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01fill_baseaccent/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="basic">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" mandatory="True" mode="expert"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_number/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="number">3</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_optional/00-base.xml

@@ -1,8 +1,5 @@
 <?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">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -22,9 +18,6 @@
             <param type="variable" optional="True">mode_conteneur_actif3</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01fill_optional/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01separator_base/00-base.xml

@@ -1,8 +1,5 @@
 <?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">
@@ -13,12 +10,6 @@
             <separator name="mode_conteneur_actif">Établissement</separator>
         </separators>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01separator_base/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01separator_neverhidden/00-base.xml

@@ -1,8 +1,5 @@
 <?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">
@@ -13,12 +10,6 @@
             <separator name="mode_conteneur_actif">Établissement</separator>
         </separators>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/01separator_neverhidden/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10autosave_hidden/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -10,18 +7,13 @@
             </variable>
             <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <fill name="calc_val" target="autosavevar">
             <param>oui</param>
         </fill>
-
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

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

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

@@ -1,15 +0,0 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
-for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-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_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/dictionaries/10check_base/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -10,7 +7,6 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -19,9 +15,6 @@
             <param name="maxi">100</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/10check_base/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_no_param/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -10,15 +7,11 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <check name="valid_lower" target="int"/>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/10check_no_param/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_option/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -13,7 +10,6 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -22,9 +18,6 @@
             <param name="maxi" type="variable">int2</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/10check_option/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_optional/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -11,7 +8,6 @@
             <variable name="int" type="number" description="No change"/>
             <variable name="int2" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -21,11 +17,7 @@
         <check name="valid_differ" target="int">
             <param type="variable" optional="True">int3</param>
         </check>
-
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/10check_optional/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+from importlib.machinery import SourceFileLoader
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *