Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

debian/agpl-3

@@ -0,0 +1,662 @@
+                    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

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

debian/control

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,22 @@
+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

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

debian/rules

@@ -0,0 +1,10 @@
+#!/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

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

src/rougail/__init__.py

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

src/rougail/annotator.py

@@ -5,7 +5,7 @@ from typing import List
 from collections import OrderedDict
 from os.path import join, basename
 from ast import literal_eval
-from importlib.machinery import SourceFileLoader
+import imp
 
 
 from .i18n import _
@@ -166,7 +166,7 @@ class GroupAnnotator:
                                                               )
                     has_a_leader = True
             else:
-                raise DictConsistencyError(_('cannot found followers "{}"').format('", "'.join(follower_names)))
+                raise DictConsistencyError(_('cannot found followers {}').format(follower_names))
         del self.objectspace.space.constraints.group
 
     def manage_leader(self,
@@ -464,7 +464,8 @@ class ServiceAnnotator:
             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))
+            raise DictConsistencyError(_('attribute source mandatory for file with variable name '
+                                               'for {}').format(file_.name))
 
 
 class VariableAnnotator:
@@ -473,6 +474,7 @@ class VariableAnnotator:
                  ):
         self.objectspace = objectspace
         self.convert_variable()
+        self.convert_helps()
         self.convert_auto_freeze()
         self.convert_separators()
 
@@ -566,6 +568,20 @@ class VariableAnnotator:
                                                     )
                                 _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:
@@ -624,7 +640,7 @@ class ConstraintAnnotator:
         if not hasattr(objectspace.space, 'constraints'):
             return
         self.objectspace = objectspace
-        eosfunc = SourceFileLoader('eosfunc', eosfunc_file).load_module()
+        eosfunc = imp.load_source('eosfunc', eosfunc_file)
         self.functions = dir(eosfunc)
         self.functions.extend(INTERNAL_FUNCTIONS)
         self.valid_enums = {}
@@ -689,9 +705,7 @@ class ConstraintAnnotator:
         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?'))
+                    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)
@@ -702,8 +716,7 @@ class ConstraintAnnotator:
                 self._set_valid_enum(variable,
                                      values,
                                      variable.type,
-                                     check.target,
-                                     check.xmlfiles,
+                                     check.target
                                      )
                 remove_indexes.append(idx)
         remove_indexes.sort(reverse=True)
@@ -752,7 +765,6 @@ class ConstraintAnnotator:
         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]
@@ -776,15 +788,13 @@ class ConstraintAnnotator:
                     if condition.source == target.name:
                         raise DictConsistencyError(_('target name and source name must be different: {}').format(condition.source))
                     try:
-                        target_names = [normalize_family(name) for name in target.name.split('.')]
-                        target.name = self.objectspace.paths.get_variable_path('.'.join(target_names), namespace)
+                        target.name = self.objectspace.paths.get_variable_path(target.name, 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)
+                        target.name = self.objectspace.paths.get_family_path(target.name, namespace)
                     except KeyError:
                         raise DictConsistencyError(_('cannot found family {}').format(target.name))
 
@@ -917,41 +927,34 @@ class ConstraintAnnotator:
             inverse = condition.name.endswith('_if_not_in')
             actions = self._get_condition_actions(condition.name)
             for param in condition.param:
-                text = getattr(param, 'text', None)
+                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
-                    # 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:
+                    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 = text
+                        prop.expected = param
                         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],
-                        ):
+    def _set_valid_enum(self, variable, values, type_, target):
         # value for choice's variable is mandatory
         variable.mandatory = True
         # build choice
@@ -964,7 +967,6 @@ class ConstraintAnnotator:
         else:
             self.valid_enums[target] = {'type': type_,
                                         'values': values,
-                                        'xmlfiles': xmlfiles,
                                         }
             choices = []
             for value in values:
@@ -1059,9 +1061,8 @@ class ConstraintAnnotator:
         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}'))
+            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:

src/rougail/data/rougail.dtd

@@ -50,21 +50,21 @@
 <!ATTLIST service manage (True|False) "True">
 
 <!ELEMENT port (#PCDATA)>
-<!ATTLIST port port_type (PortOption|variable) "PortOption">
+<!ATTLIST port port_type (PortOption|SymLinkOption|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|variable) "NetworkOption">
-<!ATTLIST ip interface_type (UnicodeOption|variable) "UnicodeOption">
+<!ATTLIST ip ip_type (NetworkOption|SymLinkOption|variable) "NetworkOption">
+<!ATTLIST ip interface_type (UnicodeOption|SymLinkOption|variable) "UnicodeOption">
 <!ATTLIST ip interface CDATA #REQUIRED>
-<!ATTLIST ip netmask_type (NetmaskOption|variable) "NetmaskOption">
+<!ATTLIST ip netmask_type (NetmaskOption|SymLinkOption|variable) "NetmaskOption">
 <!ATTLIST ip netmask CDATA "255.255.255.255">
 
 <!ELEMENT file EMPTY>
 <!ATTLIST file name CDATA #REQUIRED >
-<!ATTLIST file file_type (UnicodeOption|variable) "UnicodeOption">
+<!ATTLIST file file_type (UnicodeOption|SymLinkOption|variable) "UnicodeOption">
 <!ATTLIST file variable CDATA #IMPLIED>
 <!ATTLIST file variable_type (variable) "variable">
 <!ATTLIST file source CDATA #IMPLIED>
@@ -80,19 +80,17 @@
 <!ATTLIST override templating (True|False) "True">
 
 <!ELEMENT variables (family*, separators*)>
-<!ELEMENT family (variable*)>
+<!ELEMENT family (#PCDATA | 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 (value*)>
+<!ELEMENT variable (#PCDATA | 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">
@@ -147,3 +145,5 @@
 <!ATTLIST target optional (True|False) "False">
 
 <!ELEMENT follower (#PCDATA)>
+
+<!ELEMENT help ((variable* | family*)*)>

src/rougail/objspace.py

@@ -1,81 +1,87 @@
 """
-Takes a bunch of Rougail XML dispatched in differents folders
-as an input and outputs a Tiramisu's file
+Creole flattener. Takes a bunch of Creole XML dispatched in differents folders
+as an input and outputs a human readable flatened XML
 
 Sample usage::
 
-        eolobj.space_visitor(func)
-    xml = eolobj.save()
+    >>> 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
 
-
-    >>> from rougail.objspace import RougailObjSpace
-    >>> eolobj = RougailObjSpace('/usr/share/rougail/rougail.dtd')
-    >>> eolobj.create_or_populate_from_xml('rougail', ['/usr/share/rougail/dicos'])
-    >>> eolobj.space_visitor('/usr/share/rougail/funcs.py')
-    >>> tiramisu = eolobj.save()
-
-The RougailObjSpace
-
-- loads the XML into an internal RougailObjSpace representation
+- loads the XML into an internal CreoleObjSpace representation
 - visits/annotates the objects
-- dumps the object space as Tiramisu string
+- dumps the object space as XML output into a single XML target
 
-The visit/annotation stage is a complex step that corresponds to the Rougail
+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 .i18n import _
 from .xmlreflector import XMLReflector
-from .annotator import SpaceAnnotator
+from .annotator import ERASED_ATTRIBUTES, SpaceAnnotator
 from .tiramisureflector import TiramisuReflector
 from .utils import normalize_family
 from .error import OperationError, SpaceObjShallNotBeUpdated, DictConsistencyError
 from .path import Path
 from .config import Config
 
-# RougailObjSpace's elements like 'family' or 'follower', that shall be forced to the Redefinable type
+# CreoleObjSpace's elements like 'family' or 'follower', that shall be forced to the Redefinable type
 FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables')
-# RougailObjSpace's elements that shall be forced to the UnRedefinable type
+# CreoleObjSpace's elements that shall be forced to the UnRedefinable type
 FORCE_UNREDEFINABLES = ('value',)
-# RougailObjSpace's elements that shall be set to the UnRedefinable type
+# CreoleObjSpace's elements that shall be set to the UnRedefinable type
 UNREDEFINABLE = ('multi', 'type')
 
+CONVERT_PROPERTIES = {'auto_save': ['force_store_value'], 'auto_freeze': ['force_store_value', 'auto_freeze']}
+
+RENAME_ATTIBUTES = {'description': 'doc'}
+
 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 RootRougailObject:
+class RootCreoleObject:
     def __init__(self, xmlfiles):
         if not isinstance(xmlfiles, list):
             xmlfiles = [xmlfiles]
         self.xmlfiles = xmlfiles
 
 
-class Atom(RootRougailObject):
-    pass
-
-
-class Redefinable(RootRougailObject):
-    pass
-
-
-class UnRedefinable(RootRougailObject):
-    pass
-
-
-class RougailObjSpace:
-    """DOM XML reflexion free internal representation of a Rougail Dictionary
+class CreoleObjSpace:
+    """DOM XML reflexion free internal representation of a Creole Dictionary
     """
-    choice = type('Choice', (RootRougailObject,), dict())
-    property_ = type('Property', (RootRougailObject,), dict())
-    # Rougail ObjectSpace's Leadership variable class type
-    Leadership = type('Leadership', (RootRougailObject,), dict())
+    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())
 
 
     def __init__(self, dtdfilename):  # pylint: disable=R0912
@@ -89,6 +95,7 @@ class RougailObjSpace:
         self.xmlreflector = XMLReflector()
         self.xmlreflector.parse_dtd(dtdfilename)
         self.redefine_variables = None
+        self.fill_removed = None
         self.check_removed = None
         self.condition_removed = None
 
@@ -104,30 +111,30 @@ class RougailObjSpace:
         """Create Rougail ObjectSpace class types, it enables us to create objects like:
         File(), Variable(), Ip(), Family(), Constraints()... and so on.
         
-        Rougail ObjectSpace is an object's reflexion of the XML elements"""
+        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 = Redefinable
-            elif not dtd_elt.attributes() and dtd_elt.name not in FORCE_UNREDEFINABLES:
-                clstype = Atom
+                clstype = self.Redefinable
             else:
-                clstype = UnRedefinable
+                clstype = self.UnRedefinable
+            atomic = dtd_elt.name not in FORCE_UNREDEFINABLES and dtd_elt.name not in FORCE_REDEFINABLES
             forced_text_elt = dtd_elt.type == 'mixed'
             for dtd_attr in dtd_elt.iterattributes():
-                if set(dtd_attr.itervalues()) == {'True', 'False'}:
+                atomic = False
+                if set(dtd_attr.itervalues()) == set(['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(default_value)
+                        default_value = self.convert_boolean(dtd_attr.default_value)
                     attrs[dtd_attr.name] = default_value
                 if dtd_attr.name == 'redefine':
                     # has a redefine attribute, so it's a Redefinable object
-                    clstype = Redefinable
+                    clstype = self.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)
@@ -135,19 +142,22 @@ class RougailObjSpace:
 
             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))
 
     def create_or_populate_from_xml(self,
                                     namespace,
-                                    xmlfolders,
-                                    ):
+                                    xmlfolders):
         """Parses a bunch of XML files
-        populates the RougailObjSpace
+        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,
@@ -162,55 +172,54 @@ class RougailObjSpace:
                            space,
                            namespace,
                            ):
-        """Parses a Rougail XML file
-        populates the RougailObjSpace
+        """Parses a Creole XML file
+        populates the CreoleObjSpace
         """
-        # 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}"'))
                 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 is None:
+            if child.tag == 'value' and child.text == None:
+                # FIXME should not be here
                 continue
             # variable objects creation
             try:
-                variableobj = self.get_variableobj(xmlfile,
-                                                   child,
-                                                   space,
-                                                   namespace,
-                                                   )
+                variableobj = self.generate_variableobj(xmlfile,
+                                                        child,
+                                                        space,
+                                                        namespace,
+                                                        )
             except SpaceObjShallNotBeUpdated:
                 continue
-            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.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.add_to_tree_structure(variableobj,
                                        space,
                                        child,
-                                       namespace,
                                        )
             if list(child) != []:
                 self.xml_parse_document(xmlfile,
@@ -219,32 +228,34 @@ class RougailObjSpace:
                                         namespace,
                                         )
 
-    def get_variableobj(self,
-                        xmlfile: str,
-                        child: list,
-                        space,
-                        namespace,
-                        ):
+    def generate_variableobj(self,
+                             xmlfile,
+                             child,
+                             space,
+                             namespace,
+                             ):
         """
-        instanciates or creates Rougail Object Subspace objects
+        instanciates or creates Creole Object Subspace objects
         """
-        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)
+        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
 
     def create_or_update_redefinable_object(self,
                                             xmlfile,
@@ -253,38 +264,57 @@ class RougailObjSpace:
                                             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']
-        if child.tag == 'family':
-            name = normalize_family(name)
-        existed_var = self.get_existed_obj(name,
-                                           space,
-                                           child,
-                                           namespace,
-                                           )
+        existed_var = self.is_already_exists(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 existed_var
-            exists = self.convert_boolean(subspace.get('exists', True))
-            if exists is False:
+                return self.translate_in_space(name,
+                                               space,
+                                               child,
+                                               namespace,
+                                               )
+            elif 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}'))
-        # if this object must only be modified if object already exists
-        exists = self.convert_boolean(subspace.get('exists', False))
-        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, {})
+        exists = self.convert_boolean(subspace.get('exists', False))
+        if redefine is False or exists is True:
             return getattr(self, child.tag)(xmlfile)
         raise DictConsistencyError(_(f'Redefined object in "{xmlfile}": "{name}" does not exist yet'))
 
@@ -293,32 +323,56 @@ class RougailObjSpace:
                          ) -> str:
         if len(xmlfiles) == 1:
             return '"' + xmlfiles[0] + '"'
-        return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"'
+        else:
+            return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"'
 
-    def get_existed_obj(self,
-                        name: str,
-                        space: str,
-                        child,
-                        namespace: str,
-                        ):
+    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
             if namespace != Config['variable_namespace']:
                 name = space.path + '.' + name
             if self.paths.path_is_defined(name):
-                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}'))
                 return self.paths.get_variable_obj(name)
             return
+        if child.tag == 'family':
+            norm_name = normalize_family(name)
+        else:
+            norm_name = name
         children = getattr(space, child.tag, {})
-        if name in children:
-            return children[name]
+        if norm_name in children:
+            return children[norm_name]
 
     def convert_boolean(self, value):  # pylint: disable=R0201
-        """Boolean coercion. The Rougail XML may contain srings like `True` or `False`
+        """Boolean coercion. The Creole XML may contain srings like `True` or `False`
         """
         if isinstance(value, bool):
             return value
@@ -326,59 +380,53 @@ class RougailObjSpace:
             return True
         elif value == 'False':
             return False
-        raise TypeError(_('{} is not True or False').format(value))  # pragma: no cover
-
-    def set_text(self,
-                 child,
-                 variableobj,
-                 ):
-        if child.text is None:
-            return
-        text = child.text.strip()
-        if not text:
-            return
-        if child.tag in self.forced_text_elts_as_name:
-            variableobj.name = text
         else:
-            variableobj.text = text
+            raise TypeError(_('{} is not True or False').format(value))  # pragma: no cover
 
-    def set_attributes(self,
-                       xmlfile,
-                       child,
-                       variableobj,
-                       ):
-        redefine = self.convert_boolean(child.attrib.get('redefine', False))
-        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:
-                xmlfiles = self.display_xmlfiles(variableobj.xmlfiles[:-1])
-                raise DictConsistencyError(_(f'cannot redefine attribute "{attr}" for variable "{child.attrib["name"]}" in "{xmlfile}", already defined in {xmlfiles}'))
-            if attr in self.booleans_attributs:
-                val = self.convert_boolean(val)
-            if attr == 'name' and getattr(variableobj, 'name', None):
-                # do not redefine name
-                continue
-            setattr(variableobj, attr, val)
+    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(self,
-               child,
-               variableobj,
-               ):
-        """Rougail object tree manipulations
-        """
-        if child.tag == 'variable':
-            if child.attrib.get('remove_check', False):
-                self.remove_check(variableobj.name)
-            if child.attrib.get('remove_condition', False):
-                self.remove_condition(variableobj.name)
-            if child.attrib.get('remove_fill', False):
-                self.remove_fill(variableobj.name)
-        if child.tag == 'fill' and child.attrib['target'] in self.redefine_variables:
-            self.remove_fill(child.attrib['target'])
+    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'):
@@ -393,43 +441,117 @@ class RougailObjSpace:
                 self.space.constraints.check.pop(idx)  # pylint: disable=E1101
 
     def remove_condition(self, name):  # pylint: disable=C0111
-        remove_conditions = []
         for idx, condition in enumerate(self.space.constraints.condition):  # pylint: disable=E1101
-            if condition.source == name:
-                remove_conditions.append(idx)
-        for idx in remove_conditions:
-            del self.space.constraints.condition[idx]
+            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 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)
+    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)
 
-            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 set_text_to_obj(self,
+                        child,
+                        variableobj,
+                        ):
+        if child.text is None:
+            text = None
+        else:
+            text = child.text.strip()
+        if text:
+            if child.tag in self.forced_text_elts_as_name:
+                variableobj.name = text
+            else:
+                variableobj.text = text
 
-    def set_path(self,
-                 space,
-                 child,
-                 namespace,
-                 document,
-                 variableobj,
-                 ):  # pylint: disable=R0913
-        """Fill self.paths attributes
+    def set_xml_attributes_to_obj(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
+        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}'))
+            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())
+
+    def variableobj_tree_visitor(self,
+                                 child,
+                                 variableobj,
+                                 namespace,
+                                 ):
+        """Creole object tree manipulations
         """
         if child.tag == 'variable':
-            family_name = document.attrib['name']
-            family_name = normalize_family(family_name)
+            if child.attrib.get('remove_check', False):
+                self.remove_check(variableobj.name)
+            if child.attrib.get('remove_condition', False):
+                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
+
+    def fill_variableobj_path_attribute(self,
+                                        space,
+                                        child,
+                                        namespace,
+                                        document,
+                                        variableobj,
+                                        ):  # pylint: disable=R0913
+        """Fill self.paths attributes
+        """
+        if isinstance(space, self.help):  # pylint: disable=E1101
+            return
+        if child.tag == 'variable':
+            family_name = normalize_family(document.attrib['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'])
@@ -447,25 +569,6 @@ class RougailObjSpace:
                                   )
             variableobj.path = self.paths.get_family_path(family_name, namespace)
 
-    def add_to_tree_structure(self,
-                              variableobj,
-                              space,
-                              child,
-                              namespace,
-                              ):  # pylint: disable=R0201
-        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)
-
     def space_visitor(self, eosfunc_file):  # pylint: disable=C0111
         self.funcs_path = eosfunc_file
         SpaceAnnotator(self, eosfunc_file)

src/rougail/path.py

@@ -38,7 +38,10 @@ class Path:
                         name: str,
                         current_namespace: str,
                         ) -> str:  # pylint: disable=C0111
-        #name = normalize_family(name)
+        name = normalize_family(name,
+                                check_name=False,
+                                allow_dot=True,
+                                )
         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

src/rougail/template.py

@@ -4,7 +4,7 @@ Gestion du mini-langage de template
 On travaille sur les fichiers cibles
 """
 
-from importlib.machinery import SourceFileLoader
+import imp
 from shutil import copy
 import logging
 from typing import Dict, Any
@@ -252,7 +252,7 @@ class CreoleTemplateEngine:
         self.distrib_dir = distrib_dir
         eos = {}
         if eosfunc_file is not None:
-            eosfunc = SourceFileLoader('eosfunc', eosfunc_file).load_module()
+            eosfunc = imp.load_source('eosfunc', eosfunc_file)
             for func in dir(eosfunc):
                  if not func.startswith('_'):
                      eos[func] = getattr(eosfunc, func)
@@ -357,9 +357,9 @@ 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 {source} to {destfilename} : {varname}"))
+            raise TemplateError(_(f"Error: unknown variable used in template {destfilename} : {varname}"))
         except Exception as err:
-            raise TemplateError(_(f"Error while instantiating template {source} to {destfilename}: {err}"))
+            raise TemplateError(_(f"Error while instantiating template {destfilename}: {err}"))
 
         with open(destfilename, 'w') as file_h:
             file_h.write(data)

src/rougail/tiramisu.py

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

src/rougail/tiramisureflector.py

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

src/rougail/utils.py

@@ -1,19 +1,23 @@
 """
 utilitaires créole
 """
-from unicodedata import normalize, combining
+import unicodedata
 from .i18n import _
 
 
-def valid_name(name: str) -> None:
-    if '.' in name:
-        raise ValueError(_(f'"{name}" is a forbidden variable or family name, dot is not allowed'))
-
-
-def normalize_family(family_name: str) -> str:
+def normalize_family(family_name: str,
+                     check_name: bool=True,
+                     allow_dot: bool=False) -> str:
     """replace space, accent, uppercase, ... by valid character
     """
-    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()
+    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
+

src/rougail/xml_compare.py

@@ -0,0 +1,161 @@
+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
+

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

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

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

@@ -1,5 +1,6 @@
 <?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">
@@ -9,7 +10,14 @@
                 <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -9,7 +12,14 @@
                 <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

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

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="général">
             <!-- this is a comment -->
@@ -7,7 +10,14 @@
                 <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -9,7 +12,14 @@
                 <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

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

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

@@ -1,12 +1,22 @@
 <?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,13 +1,23 @@
 <?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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -9,6 +12,7 @@
                 <value>non</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -16,6 +20,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -9,12 +12,16 @@
                 <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,8 @@
 <?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">
@@ -12,6 +15,7 @@
                 <value>non</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -19,6 +23,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -9,6 +12,7 @@
                 <value>non</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -16,6 +20,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change"/>
@@ -7,6 +10,7 @@
                 <value>non</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -14,6 +18,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -9,6 +12,7 @@
                 <value>non</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -16,6 +20,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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"/>
@@ -7,6 +10,7 @@
                 <value>non</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -14,6 +18,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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"/>
@@ -7,6 +10,7 @@
                 <value>non</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -14,6 +18,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -9,6 +12,7 @@
                 <value>non</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -18,6 +22,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -10,6 +13,12 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -10,6 +13,12 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -7,13 +10,18 @@
             </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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?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">
@@ -7,6 +10,7 @@
             </variable>
             <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
         </family>
+        <separators/>
     </variables>
     <constraints>
         <fill name="calc_val" target="autosavevar">
@@ -16,7 +20,11 @@
              <param>oui</param>
              <target type="variable">autosavevar</target>
         </condition>
+
     </constraints>
+
+    <help/>
+
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -7,6 +10,7 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -15,6 +19,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -7,11 +10,15 @@
             </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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -10,6 +13,7 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -18,6 +22,9 @@
             <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -8,6 +11,7 @@
             <variable name="int" type="number" description="No change"/>
             <variable name="int2" type="number" description="No change"/>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -17,7 +21,11 @@
         <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 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

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

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

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -15,13 +18,20 @@
                 <value>oui</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
         <check name="valid_differ" target="mode_conteneur_actif3">
             <param type="variable">mode_conteneur_actif1</param>
         </check>
+        <check name="valid_differ" target="mode_conteneur_actif3">
+            <param type="variable">mode_conteneur_actif2</param>
+        </check>
     </constraints>
+
+    <help/>
+
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/10check_valid_differ_add/01-base.xml

@@ -1,8 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True"/>
+            <variable name="mode_conteneur_actif3" redefine="True">
+                <value>oui</value>
+            </variable>
         </family>
         <separators/>
     </variables>
@@ -15,6 +20,9 @@
             <param type="variable">mode_conteneur_actif2</param>
         </check>
     </constraints>
+
+    <help/>
+
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,7 +1,7 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
 for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
+    if key != ['imp', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *
@@ -11,7 +11,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non'))
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=True)), kwargs={}), warnings_only=False), Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=True)), kwargs={}), warnings_only=False), Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=True)), kwargs={}), warnings_only=False)], name='mode_conteneur_actif3', doc='No change', multi=False, default='oui')
+option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=True)), kwargs={}), warnings_only=False), Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=True)), kwargs={}), warnings_only=False)], name='mode_conteneur_actif3', doc='No change', multi=False, default='oui')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -15,13 +18,20 @@
                 <value>oui</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
         <check name="valid_differ" target="mode_conteneur_actif3">
             <param type="variable">mode_conteneur_actif1</param>
         </check>
+        <check name="valid_differ" target="mode_conteneur_actif3">
+            <param type="variable">mode_conteneur_actif2</param>
+        </check>
     </constraints>
+
+    <help/>
+
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/10check_valid_differ_removecheck/01-base.xml

@@ -1,11 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
+            <variable name="mode_conteneur_actif3" redefine="True">
                 <value>oui</value>
             </variable>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -16,6 +20,9 @@
             <param type="variable">mode_conteneur_actif2</param>
         </check>
     </constraints>
+
+    <help/>
+
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -9,6 +12,7 @@
             <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
             <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -17,6 +21,9 @@
             <param type="variable">adresse_netmask_eth0</param>
         </check>
     </constraints>
+
+    <help/>
+
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -8,6 +11,7 @@
             <variable name="adresse_ip_eth0" type="cidr" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
             <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -15,6 +19,9 @@
             <param type="variable">adresse_ip_eth0</param>
         </check>
     </constraints>
+
+    <help/>
+
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -8,6 +11,7 @@
             <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
             <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
         </family>
+        <separators/>
     </variables>
 
     <constraints>
@@ -15,6 +19,9 @@
             <param type="variable">adresse_ip_eth0</param>
         </check>
     </constraints>
+
+    <help/>
+
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -25,4 +28,7 @@
             <follower>follower2</follower>
         </group>
     </constraints>
+
+    <help/>
+
 </rougail>

tests/dictionaries/10leadership_append/01-base.xml

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general1">
             <variable name="follower3" type="string" description="follower3"/>
@@ -7,8 +10,11 @@
     </variables>
 
     <constraints>
-        <group leader="leader">
+	<group leader="leader">
             <follower>follower3</follower>
-        </group>
+	</group>
     </constraints>
+
+    <help/>
+
 </rougail>

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -28,4 +31,7 @@
             <follower>follower3</follower>
         </group>
     </constraints>
+
+    <help/>
+
 </rougail>

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -23,4 +26,7 @@
             <follower>follower2</follower>
         </group>
     </constraints>
+
+    <help/>
+
 </rougail>

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -22,4 +25,7 @@
             <follower>follower2</follower>
         </group>
     </constraints>
+
+    <help/>
+
 </rougail>

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

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

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

@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+
+    <services/>
+
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -23,4 +26,7 @@
             <follower>follower2</follower>
         </group>
     </constraints>
+
+    <help/>
+
 </rougail>