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/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 _
@@ -640,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 = {}

src/rougail/template.py

@@ -4,13 +4,13 @@ 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
 from subprocess import call
-from os import listdir, makedirs, getcwd, chdir
-from os.path import dirname, join, isfile, abspath, normpath, relpath
+from os import listdir, makedirs
+from os.path import dirname, join, isfile
 
 from Cheetah.Template import Template as ChtTemplate
 from Cheetah.NameMapper import NotFound as CheetahNotFound
@@ -79,8 +79,7 @@ class CheetahTemplate(ChtTemplate):
                  context,
                  eosfunc: Dict,
                  destfilename,
-                 variable,
-                 ):
+                 variable):
         """Initialize Creole CheetahTemplate
         """
         extra_context = {'is_defined' : IsDefined(context),
@@ -93,24 +92,6 @@ class CheetahTemplate(ChtTemplate):
                              file=filename,
                              searchList=[context, eosfunc, extra_context])
 
-    # FORK of Cheetah fonction, do not replace '\\' by '/'
-    def serverSidePath(self,
-                       path=None,
-                       normpath=normpath,
-                       abspath=abspath
-                       ):
-
-        # strange...
-        if path is None and isinstance(self, str):
-            path = self
-        if path:
-            return normpath(abspath(path))
-#            return normpath(abspath(path.replace("\\", '/')))
-        elif hasattr(self, '_filePath') and self._filePath:
-            return normpath(abspath(self._filePath))
-        else:
-            return None
-
 
 class CreoleLeader:
     def __init__(self, value, follower=None, index=None):
@@ -252,7 +233,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)
@@ -306,43 +287,37 @@ class CreoleTemplateEngine:
         return CreoleExtra(families)
 
     def patch_template(self,
-                       filename: str,
-                       tmp_dir: str,
-                       patch_dir: str,
-                       ) -> None:
+                       filename: str):
         """Apply patch to a template
         """
-        patch_cmd = ['patch', '-d', tmp_dir, '-N', '-p1']
+        patch_cmd = ['patch', '-d', self.tmp_dir, '-N', '-p1']
         patch_no_debug = ['-s', '-r', '-', '--backup-if-mismatch']
 
-        patch_file = join(patch_dir, f'{filename}.patch')
-        if isfile(patch_file):
-            log.info(_("Patching template '{filename}' with '{patch_file}'"))
-            rel_patch_file = relpath(patch_file, tmp_dir)
-            ret = call(patch_cmd + patch_no_debug + ['-i', rel_patch_file])
-            if ret:
-                patch_cmd_err = ' '.join(patch_cmd + ['-i', rel_patch_file])
-                log.error(_(f"Error applying patch: '{rel_patch_file}'\nTo reproduce and fix this error {patch_cmd_err}"))
-                copy(join(self.distrib_dir, filename), tmp_dir)
+        # patches variante + locaux
+        for directory in [join(Config['patch_dir'], 'variante'), Config['patch_dir']]:
+            patch_file = join(directory, f'{filename}.patch')
+            if isfile(patch_file):
+                log.info(_("Patching template '{filename}' with '{patch_file}'"))
+                ret = call(patch_cmd + patch_no_debug + ['-i', patch_file])
+                if ret:
+                    patch_cmd_err = ' '.join(patch_cmd + ['-i', patch_file])
+                    log.error(_(f"Error applying patch: '{patch_file}'\nTo reproduce and fix this error {patch_cmd_err}"))
+                    copy(filename, self.tmp_dir)
 
     def prepare_template(self,
-                         filename: str,
-                         tmp_dir: str,
-                         patch_dir: str,
-                         ) -> None:
+                         filename: str):
         """Prepare template source file
         """
-        log.info(_("Copy template: '{filename}' -> '{tmp_dir}'"))
-        copy(filename, tmp_dir)
-        self.patch_template(filename, tmp_dir, patch_dir)
+        log.info(_("Copy template: '{filename}' -> '{self.tmp_dir}'"))
+        copy(filename, self.tmp_dir)
+        self.patch_template(filename)
 
     def process(self,
                 source: str,
                 true_destfilename: str,
                 destfilename: str,
                 filevar: Dict,
-                variable: Any,
-                ):
+                variable: Any):
         """Process a cheetah template
         """
         # full path of the destination file
@@ -357,19 +332,16 @@ 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)
 
     def instance_file(self,
                       filevar: Dict,
-                      service_name: str,
-                      tmp_dir: str,
-                      dest_dir: str,
-                      ) -> None:
+                      service_name: str) -> None:
         """Run templatisation on one file
         """
         log.info(_("Instantiating file '{filename}'"))
@@ -383,13 +355,13 @@ class CreoleTemplateEngine:
             if variable:
                 variable = [variable]
         for idx, filename in enumerate(filenames):
-            destfilename = join(dest_dir, filename[1:])
+            destfilename = join(self.dest_dir, filename[1:])
             makedirs(dirname(destfilename), exist_ok=True)
             if variable:
                 var = variable[idx]
             else:
                 var = None
-            source = join(tmp_dir, filevar['source'])
+            source = join(self.tmp_dir, filevar['source'])
             if filevar['templating']:
                 self.process(source,
                              filename,
@@ -402,11 +374,6 @@ class CreoleTemplateEngine:
     async def instance_files(self) -> None:
         """Run templatisation on all files
         """
-        ori_dir = getcwd()
-        tmp_dir = relpath(self.tmp_dir, self.distrib_dir)
-        dest_dir = relpath(self.dest_dir, self.distrib_dir)
-        patch_dir = relpath(Config['patch_dir'], self.distrib_dir)
-        chdir(self.distrib_dir)
         for option in await self.config.option.list(type='all'):
             namespace = await option.option.name()
             if namespace == Config['variable_namespace']:
@@ -415,8 +382,8 @@ class CreoleTemplateEngine:
                 families = await self.load_eole_variables(namespace,
                                                           option)
                 self.rougail_variables_dict[namespace] = families
-        for template in listdir('.'):
-            self.prepare_template(template, tmp_dir, patch_dir)
+        for template in listdir(self.distrib_dir):
+            self.prepare_template(join(self.distrib_dir, template))
         for service_obj in await self.config.option('services').list('all'):
             service_name = await service_obj.option.doc()
             for fills in await service_obj.list('all'):
@@ -424,17 +391,15 @@ class CreoleTemplateEngine:
                     for fill_obj in await fills.list('all'):
                         fill = await fill_obj.value.dict()
                         filename = fill['source']
-                        if not isfile(filename):
-                            raise FileNotFound(_(f"File {filename} does not exist."))
+                        distib_file = join(self.distrib_dir, filename)
+                        if not isfile(distib_file):
+                            raise FileNotFound(_(f"File {distib_file} does not exist."))
                         if fill.get('activate', False):
                             self.instance_file(fill,
                                                service_name,
-                                               tmp_dir,
-                                               dest_dir,
                                                )
                         else:
                             log.debug(_("Instantiation of file '{filename}' disabled"))
-        chdir(ori_dir)
 
 
 async def generate(config: Config,

src/rougail/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 *",
@@ -373,7 +373,7 @@ class Variable(Common):
             function = child.name
             if hasattr(child, 'param'):
                 for param in child.param:
-                    value = self.populate_param(function, param)
+                    value = self.populate_param(param)
                     if not hasattr(param, 'name'):
                         args.append(str(value))
                     else:
@@ -387,7 +387,6 @@ class Variable(Common):
         return ret + ')'
 
     def populate_param(self,
-                       function: str,
                        param,
                        ):
         if param.type == 'string':
@@ -397,7 +396,7 @@ class Variable(Common):
         elif param.type == 'variable':
             value = {'option': param.text,
                      'notraisepropertyerror': param.notraisepropertyerror,
-                     'todict': function in FUNC_TO_DICT,
+                     'todict': param.text in FUNC_TO_DICT,
                      }
             if hasattr(param, 'suffix'):
                 value['suffix'] = param.suffix

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/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/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/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/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/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/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/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/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/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/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/00-base.xml

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

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

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

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

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

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

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

tests/dictionaries/01base_file_include/tmpl/file

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

tests/dictionaries/01base_file_include/tmpl/incfile

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

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

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

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

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

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

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

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

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

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

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

tests/dictionaries/01base_file_patch/tmpl/file

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

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

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

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

@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "non", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.group": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.mode": "0644", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.owner": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.source": "systemd-makefs@dev-disk-by\\x2dpartlabel", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.templating": true, "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": true}

tests/dictionaries/01base_file_utfchar/result/etc/systemd-makefs@dev-disk-by\x2dpartlabel

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

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

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

tests/dictionaries/01base_file_utfchar/tmpl/systemd-makefs@dev-disk-by\x2dpartlabel

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

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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 *
@@ -10,7 +10,7 @@ except:
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b')
 option_5 = IntOption(properties=frozenset({'normal'}), name='int2', doc='No change', multi=False)
-option_4 = IntOption(properties=frozenset({'normal'}), validators=[Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=True)), kwargs={}), warnings_only=False)], name='int', doc='No change', multi=False)
+option_4 = IntOption(properties=frozenset({'normal'}), validators=[Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], name='int', doc='No change', multi=False)
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5])
 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/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 *
@@ -9,7 +9,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=True)), kwargs={}), warnings_only=False)], name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non'))
+option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/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_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=False)), kwargs={}), warnings_only=False), Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), 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/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_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=False)), kwargs={}), warnings_only=False), Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), 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_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/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/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/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/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/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/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/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_familyaccent/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_leader_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/10leadership_leader_hidden_if_in/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_leadermandatory/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_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/10leadership_mandatoryfollower/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_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/10load_disabled_if_in/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/10load_disabled_if_in_none/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/10load_disabled_if_inaccent_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/10load_disabled_if_not_in_fallback/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/10load_disabled_if_not_in_fallback_force/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/10load_disabledifin_fallback/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/10load_disabledifin_fallback_force/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/10load_disabledifin_whithouttype/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/10load_emptyvalue/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/10load_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/10load_frozenifin_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/10load_frozenifin_multiparam/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/10load_frozenifin_noexist/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/10load_hidden_if_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/10load_leadership/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/10load_leadership_default_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/10load_leadership_default_submulti/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/10load_leadership_defaultmulti_leader/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/10load_leadership_description/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 *