Rename lib to tiramisu3

ChangeLog

@@ -1,8 +1,3 @@
-Mon Apr  1 11:47:30 2019 +0200 Emmanuel Garette <egarette@cadoles.com>
-	* version 3.0 rc16
-	* tiramisu is now async
-	* add postgresql storage
-
 Mon Sep  2 14:10:40 2019 +0200 Emmanuel Garette <egarette@cadoles.com>
 	* version 3.0 rc15
 	* add parents method to MetaConfig

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: tiramisu
+Section: admin
+Priority: extra
+Maintainer: Cadoles <contact@cadoles.com>
+Build-depends: debhelper (>=11), python3-all, python3-setuptools
+Standards-Version: 3.9.4
+Homepage: https://framagit.org/tiramisu/tiramisu.git
+
+Package: tiramisu
+Architecture: any
+Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
+Depends: ${python:Depends}, ${misc:Depends}
+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/risotto
+
+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/rules

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

debian/source/format

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

setup.py

@@ -1,17 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from setuptools import setup
+from setuptools import setup, find_packages
 import os
 from tiramisu import __version__
 
 
-ORI_PACKAGE_NAME = 'tiramisu'
-PACKAGE_NAME = os.environ.get('PACKAGE_DST', ORI_PACKAGE_NAME)
-
-if PACKAGE_NAME != ORI_PACKAGE_NAME:
-    package_dir = {PACKAGE_NAME: ORI_PACKAGE_NAME}
-else:
-    package_dir = None
+PACKAGE_NAME = os.environ.get('PACKAGE_DST', 'tiramisu')
 
 setup(
     version=__version__,
@@ -46,6 +40,5 @@ producing flexible and fast options access.
 This version requires Python 3.5 or later.
 """,
     include_package_data=True,
-    package_dir=package_dir,
-    packages=[PACKAGE_NAME],
+    packages=find_packages(include=['tiramisu'])
 )

tests/test_cache.py

@@ -559,8 +559,6 @@ async def test_cache_global_properties():
 
 @pytest.mark.asyncio
 async def test_callback_value_incr():
-    global incr
-    incr = -1
     val1 = IntOption('val1', "", Calculation(return_incr), properties=('expire',))
     val2 = IntOption('val2', "", Calculation(calc_value, Params(ParamOption(val1))))
     od1 = OptionDescription('rootconfig', '', [val1, val2])
@@ -581,30 +579,3 @@ async def test_callback_value_incr():
         assert await cfg.option('val1').value.get() == 2
         assert await cfg.option('val2').value.get() == 2
     assert not await list_sessions()
-
-
-@pytest.mark.asyncio
-async def test_callback_value_incr_demoting():
-    global incr
-    incr = -1
-    val1 = IntOption('val1', "", Calculation(return_incr), properties=('expire',))
-    val2 = IntOption('val2', "", Calculation(calc_value, Params(ParamOption(val1))))
-    od1 = OptionDescription('rootconfig', '', [val1, val2])
-    async with await Config(od1) as cfg:
-        await cfg.property.add('demoting_error_warning')
-        assert await cfg.cache.get_expiration_time() == 5
-        await cfg.cache.set_expiration_time(1)
-        assert await cfg.cache.get_expiration_time() == 1
-        await cfg.property.read_write()
-        assert await cfg.option('val1').value.get() == 1
-        sleep(1)
-        assert await cfg.option('val2').value.get() == 1
-        sleep(1)
-        assert await cfg.option('val1').value.get() == 1
-        assert await cfg.option('val2').value.get() == 1
-        sleep(2)
-        assert await cfg.option('val1').value.get() == 2
-        assert await cfg.option('val2').value.get() == 2
-        assert await cfg.option('val1').value.get() == 2
-        assert await cfg.option('val2').value.get() == 2
-    assert not await list_sessions()

tests/test_config_api.py

@@ -323,10 +323,13 @@ async def test_filename(config_type):
         await cfg.option('a').value.set('/tmp')
         await cfg.option('a').value.set('/tmp/')
         await cfg.option('a').value.set('/tmp/text.txt')
-        await cfg.option('a').value.set('/tmp/with space.txt')
-        await cfg.option('a').value.set('/tmp/with$.txt')
+        await cfg.option('a').value.set('tmp')
+        await cfg.option('a').value.set('tmp/')
+        await cfg.option('a').value.set('tmp/text.txt')
         with pytest.raises(ValueError):
-            await cfg.option('a').value.set('not starts with /')
+            await cfg.option('a').value.set('/tmp/with space.txt')
+        with pytest.raises(ValueError):
+            await cfg.option('a').value.set('/tmp/with$.txt')
     assert not await list_sessions()
 
 

tests/test_duplicate_config.py

@@ -59,16 +59,6 @@ async def test_copy():
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_copy_information():
-    od = make_description()
-    async with await Config(od) as cfg:
-        await cfg.information.set('key', 'value')
-        async with await cfg.config.copy() as ncfg:
-            assert await ncfg.information.get('key') == 'value'
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_copy_force_store_value():
     od = make_description()

tests/test_dyn_optiondescription.py

@@ -9,9 +9,7 @@ from tiramisu import BoolOption, StrOption, ChoiceOption, IPOption, \
     StrOption, PortOption, BroadcastOption, DomainnameOption, \
     EmailOption, URLOption, UsernameOption, FilenameOption, SymLinkOption, \
     OptionDescription, DynOptionDescription, SynDynOption, submulti, Leadership, \
-    Config, \
-    Params, ParamOption, ParamValue, ParamSuffix, ParamSelfOption, ParamDynOption, ParamIndex, \
-    Calculation, calc_value, \
+    Config, Params, ParamOption, ParamValue, ParamSuffix, ParamSelfOption, ParamIndex, Calculation, calc_value, \
     delete_session
 from tiramisu.error import PropertiesOptionError, ConfigError, ConflictError
 from tiramisu.storage import list_sessions
@@ -147,8 +145,8 @@ async def test_getdoc_dyndescription():
         assert await cfg.option('od.dodval2.stval2').option.name() == 'stval2'
         assert await cfg.option('od.dodval1').option.name() == 'dodval1'
         assert await cfg.option('od.dodval2').option.name() == 'dodval2'
-        assert await cfg.option('od.dodval1.stval1').option.doc() == 'doc1val1'
-        assert await cfg.option('od.dodval2.stval2').option.doc() == 'doc1val2'
+        assert await cfg.option('od.dodval1.stval1').option.doc() == 'doc1'
+        assert await cfg.option('od.dodval2.stval2').option.doc() == 'doc1'
         assert await cfg.option('od.dodval1').option.doc() == 'doc2val1'
         assert await cfg.option('od.dodval2').option.doc() == 'doc2val2'
     assert not await list_sessions()
@@ -260,31 +258,9 @@ async def test_prop_dyndescription_force_store_value():
     dod = DynOptionDescription('dod', '', [st], suffixes=Calculation(return_list))
     od = OptionDescription('od', '', [dod])
     od2 = OptionDescription('od', '', [od])
-    async with await Config(od2) as cfg:
-        await cfg.property.read_write()
-        assert await cfg.value.dict() == {'od.dodval1.stval1': None, 'od.dodval2.stval2': None}
-    assert not await list_sessions()
-
-
-@pytest.mark.asyncio
-async def test_prop_dyndescription_force_store_value_calculation_prefix():
-    lst = StrOption('lst', '', ['val1', 'val2'], multi=True)
-    st = StrOption('st', '', Calculation(return_list, Params(ParamSuffix())) , properties=('force_store_value',))
-    dod = DynOptionDescription('dod', '', [st], suffixes=Calculation(return_list, Params(ParamOption(lst))))
-    od = OptionDescription('od', '', [dod, lst])
-    od2 = OptionDescription('od', '', [od])
-    async with await Config(od2) as cfg:
-        await cfg.property.read_write()
-        assert await cfg.option('od.dodval1.stval1').owner.isdefault() == False
-        assert await cfg.option('od.dodval2.stval2').owner.isdefault() == False
-        assert await cfg.value.dict() == {'od.lst': ['val1', 'val2'], 'od.dodval1.stval1': 'val1', 'od.dodval2.stval2': 'val2'}
-        #
-        await cfg.option('od.lst').value.set(['val1', 'val2', 'val3'])
-        assert await cfg.option('od.dodval3.stval3').owner.isdefault() == False
-        assert await cfg.option('od.dodval1.stval1').owner.isdefault() == False
-        assert await cfg.option('od.dodval2.stval2').owner.isdefault() == False
-        assert await cfg.value.dict() == {'od.lst': ['val1', 'val2', 'val3'], 'od.dodval1.stval1': 'val1', 'od.dodval2.stval2': 'val2', 'od.dodval3.stval3': 'val3'}
-
+    with pytest.raises(ConfigError):
+        await Config(od2, session_id='error')
+    await delete_session('error')
     assert not await list_sessions()
 
 
@@ -313,56 +289,6 @@ async def test_callback_dyndescription():
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_callback_dyndescription_outside_wrong_param():
-    lst = StrOption('lst', '', ['val1', 'val2'], multi=True)
-    st = StrOption('st', '', Calculation(return_dynval))
-    dod = DynOptionDescription('dod', '', [st], suffixes=Calculation(return_list, Params(ParamOption(lst))))
-    out = StrOption('out', '', Calculation(return_dynval, Params(ParamOption(st))))
-    od = OptionDescription('od', '', [dod, out])
-    od2 = OptionDescription('od', '', [od, lst])
-    async with await Config(od2) as cfg:
-        with pytest.raises(ConfigError):
-            await cfg.value.dict()
-    assert not await list_sessions()
-
-
-@pytest.mark.asyncio
-async def test_callback_dyndescription_outside1():
-    lst = StrOption('lst', '', ['val1', 'val2'], multi=True)
-    st = StrOption('st', '', Calculation(return_dynval))
-    dod = DynOptionDescription('dod', '', [st], suffixes=Calculation(return_list, Params(ParamOption(lst))))
-    out = StrOption('out', '', Calculation(return_dynval, Params(ParamDynOption(st, 'val1', dod))))
-    od = OptionDescription('od', '', [dod, out])
-    od2 = OptionDescription('od', '', [od, lst])
-    async with await Config(od2) as cfg:
-        assert await cfg.value.dict() == {'od.dodval1.stval1': 'val', 'od.dodval2.stval2': 'val', 'od.out': 'val', 'lst': ['val1', 'val2']}
-        await cfg.option('od.dodval1.stval1').value.set('val1')
-        await cfg.option('od.dodval2.stval2').value.set('val2')
-        assert await cfg.value.dict() == {'od.dodval1.stval1': 'val1', 'od.dodval2.stval2': 'val2', 'od.out': 'val1', 'lst': ['val1', 'val2']}
-        await cfg.option('lst').value.set(['val2'])
-        with pytest.raises(ConfigError):
-            await cfg.value.dict()
-        await cfg.option('lst').value.set(['val1'])
-        assert await cfg.value.dict() == {'od.dodval1.stval1': 'val1', 'od.out': 'val1', 'lst': ['val1']}
-    assert not await list_sessions()
-
-
-@pytest.mark.asyncio
-async def test_callback_dyndescription_outside2():
-    lst = StrOption('lst', '', ['val1', 'val2'], multi=True)
-    out = StrOption('out', '')
-    st = StrOption('st', '', Calculation(return_dynval, Params(ParamOption(out))))
-    dod = DynOptionDescription('dod', '', [st], suffixes=Calculation(return_list, Params(ParamOption(lst))))
-    od = OptionDescription('od', '', [dod, out])
-    od2 = OptionDescription('od', '', [od, lst])
-    async with await Config(od2) as cfg:
-        assert await cfg.value.dict() == {'od.dodval1.stval1': None, 'od.dodval2.stval2': None, 'od.out': None, 'lst': ['val1', 'val2']}
-        await cfg.option('od.out').value.set('val1')
-        assert await cfg.value.dict() == {'od.dodval1.stval1': 'val1', 'od.dodval2.stval2': 'val1', 'od.out': 'val1', 'lst': ['val1', 'val2']}
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_callback_list_dyndescription():
     st = StrOption('st', '', Calculation(return_list2, Params(ParamSuffix())), multi=True, properties=('notunique',))
@@ -664,73 +590,6 @@ async def test_dyndescription_root():
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_dyndescription_disable_suffix_root():
-    boolean = BoolOption('boolean', '', True)
-    disabled_property = Calculation(calc_value,
-                                    Params(ParamValue('disabled'),
-                                           kwargs={'condition': ParamOption(boolean),
-                                                   'expected': ParamValue(False),
-                                                   'default': ParamValue(None)}))
-    val = StrOption('val', '', ['ext1', 'ext2'], properties=(disabled_property,), multi=True)
-    st1 = StrOption('st', '')
-    dod = DynOptionDescription('dod', '', [st1], suffixes=Calculation(calc_value, Params(ParamOption(val, notraisepropertyerror=True))), properties=(disabled_property,))
-    od = OptionDescription('root', 'root', [boolean, val, dod])
-    config = await Config(od, session_id='test')
-    await config.property.read_write()
-    assert await config.value.dict() == {'boolean': True, 'val': ['ext1', 'ext2'], 'dodext1.stext1': None, 'dodext2.stext2': None}
-    #
-    await config.option('boolean').value.set(False)
-    assert await config.value.dict() == {'boolean': False}
-    await delete_session('test')
-    assert not await list_sessions()
-
-
-@pytest.mark.asyncio
-async def test_dyndescription_disable_suffix_root_2():
-    boolean = BoolOption('boolean', '', False)
-    disabled_property = Calculation(calc_value,
-                                    Params(ParamValue('disabled'),
-                                           kwargs={'condition': ParamOption(boolean),
-                                                   'expected': ParamValue(False),
-                                                   'default': ParamValue(None)}))
-    val = StrOption('val', '', ['ext1', 'ext2'], properties=(disabled_property,), multi=True)
-    st1 = StrOption('st', '')
-    dod = DynOptionDescription('dod', '', [st1], suffixes=Calculation(calc_value, Params(ParamOption(val, notraisepropertyerror=True))), properties=(disabled_property,))
-    od = OptionDescription('root', 'root', [boolean, val, dod])
-    config = await Config(od, session_id='test')
-    await config.property.read_write()
-    assert await config.value.dict() == {'boolean': False}
-    #
-    await config.option('boolean').value.set(True)
-    assert await config.value.dict() == {'boolean': True, 'val': ['ext1', 'ext2'], 'dodext1.stext1': None, 'dodext2.stext2': None}
-    await delete_session('test')
-    assert not await list_sessions()
-
-
-@pytest.mark.asyncio
-async def test_dyndescription_disable_suffix():
-    boolean = BoolOption('boolean', '', True)
-    disabled_property = Calculation(calc_value,
-                                    Params(ParamValue('disabled'),
-                                           kwargs={'condition': ParamOption(boolean),
-                                                   'expected': ParamValue(False),
-                                                   'default': ParamValue(None)}))
-    val = StrOption('val', '', ['ext1', 'ext2'], properties=(disabled_property,), multi=True)
-    st1 = StrOption('st', '')
-    dod = DynOptionDescription('dod', '', [st1], suffixes=Calculation(calc_value, Params(ParamOption(val, notraisepropertyerror=True))), properties=(disabled_property,))
-    od = OptionDescription('root', 'root', [boolean, val, dod])
-    od2 = OptionDescription('root', 'root', [od])
-    config = await Config(od2, session_id='test')
-    await config.property.read_write()
-    assert await config.value.dict() == {'root.boolean': True, 'root.val': ['ext1', 'ext2'], 'root.dodext1.stext1': None, 'root.dodext2.stext2': None}
-    #
-    await config.option('root.boolean').value.set(False)
-    assert await config.value.dict() == {'root.boolean': False}
-    await delete_session('test')
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_requires_dyndescription():
     boolean = BoolOption('boolean', '', True)

tests/test_freeze.py

@@ -187,6 +187,26 @@ async def test_force_store_value():
     assert not await list_sessions()
 
 
+@pytest.mark.asyncio
+async def test_force_store_value_leadership_follower():
+    b = IntOption('int', 'Test int option', multi=True)
+    c = StrOption('str', 'Test string option', multi=True, properties=('force_store_value',))
+    descr = Leadership("int", "", [b, c])
+    with pytest.raises(ConfigError):
+        cfg = await Config(descr, session_id='error')
+    await delete_session('error')
+    assert not await list_sessions()
+
+
+#@pytest.mark.asyncio
+#async def test_force_store_value_leadership():
+#    b = IntOption('int', 'Test int option', multi=True, properties=('force_store_value',))
+#    c = StrOption('str', 'Test string option', multi=True)
+#    descr = Leadership("int", "", [b, c])
+#    cfg = await Config(descr)
+#    assert await cfg.value.get() == {'int': ('forced', ())}
+
+
 @pytest.mark.asyncio
 async def test_force_store_value_leadership_sub():
     b = IntOption('int', 'Test int option', multi=True, properties=('force_store_value',))

tests/test_leadership.py

@@ -298,32 +298,6 @@ async def test_groups_with_leader_make_dict(config_type):
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_groups_with_leader_make_dict2(config_type):
-    ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
-    netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=True)
-    interface1 = Leadership('other', '', [ip_admin_eth0, netmask_admin_eth0])
-    od = OptionDescription('root', '', [interface1])
-    async with await Config(od) as cfg:
-        cfg = await get_config(cfg, config_type)
-        assert await cfg.value.dict() == {'other.ip_admin_eth0': [], 'other.netmask_admin_eth0': []}
-        assert await cfg.value.dict(leader_to_list=True) == {'other.ip_admin_eth0': []}
-        if config_type != 'tiramisu-api':
-            # FIXME useful? already in leadership
-            assert await cfg.option('other.ip_admin_eth0').value.len() == 0
-            assert await cfg.option('other.netmask_admin_eth0').value.len() == 0
-        await cfg.option('other.ip_admin_eth0').value.set(['ip1', 'ip2'])
-        if config_type != 'tiramisu-api':
-            # FIXME
-            assert await cfg.option('other.ip_admin_eth0').value.len() == 2
-            assert await cfg.option('other.netmask_admin_eth0').value.len() == 2
-        assert await cfg.value.dict() == {'other.ip_admin_eth0': ['ip1', 'ip2'], 'other.netmask_admin_eth0': [None, None]}
-        assert await cfg.value.dict(leader_to_list=True) == {'other.ip_admin_eth0': [{'other.ip_admin_eth0': 'ip1', 'other.netmask_admin_eth0': None}, {'other.ip_admin_eth0': 'ip2', 'other.netmask_admin_eth0': None}]}
-        if config_type == 'tiramisu-api':
-            await cfg.send()
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_groups_with_leader_default_value(config_type):
     ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
@@ -388,28 +362,7 @@ async def test_groups_with_leader_hidden_in_config():
             await cfg.option('ip_admin_eth0.ip_admin_eth0').value.get()
         with pytest.raises(PropertiesOptionError):
             await cfg.option('ip_admin_eth0.netmask_admin_eth0', 0).value.get()
-        assert await cfg.value.dict() == {}
-        assert await cfg.value.dict(leader_to_list=True) == {}
-    assert not await list_sessions()
-
-
-async def test_groups_with_leader_hidden_in_config2():
-    ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
-    netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=True, properties=('hidden',))
-    interface1 = Leadership('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
-    od = OptionDescription('root', '', [interface1])
-    async with await Config(od) as cfg:
-        await cfg.property.read_write()
-        await cfg.permissive.add('hidden')
-        assert await cfg.forcepermissive.option('ip_admin_eth0.ip_admin_eth0').value.get() == []
-        await cfg.forcepermissive.option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.1'])
-        assert await cfg.forcepermissive.option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() is None
-        with pytest.raises(PropertiesOptionError):
-            await cfg.option('ip_admin_eth0.ip_admin_eth0').value.get()
-        with pytest.raises(PropertiesOptionError):
-            await cfg.option('ip_admin_eth0.netmask_admin_eth0', 0).value.get()
-        assert await cfg.value.dict() == {'ip_admin_eth0.ip_admin_eth0': ['192.168.1.1']}
-        assert await cfg.value.dict(leader_to_list=True) == {'ip_admin_eth0.ip_admin_eth0': [{'ip_admin_eth0.ip_admin_eth0': '192.168.1.1'}]}
+        await cfg.value.dict(leader_to_list=True) == {'ip_admin_eth0.ip_admin_eth0': [{'ip_admin_eth0.ip_admin_eth0': '192.168.1.1'}]}
     assert not await list_sessions()
 
 
@@ -782,19 +735,6 @@ async def test_values_with_leader_and_followers_leader_pop():
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_follower_unique():
-    ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
-    netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=True, properties=('unique',))
-    interface1 = Leadership('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
-    maconfig = OptionDescription('toto', '', [interface1])
-    async with await Config(maconfig) as cfg:
-        await cfg.option('ip_admin_eth0.ip_admin_eth0').value.set(["192.168.230.145", "192.168.230.146"])
-        # unique property is removed for a follower
-        assert not await cfg.option('ip_admin_eth0.netmask_admin_eth0', 1).property.get()
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_values_with_leader_owner(config_type):
     ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
@@ -1036,28 +976,3 @@ async def test_follower_force_store_value_reset():
         await cfg.option('od.interface0.ip_admin_eth0').value.reset()
         assert not await cfg.option('od.interface0.netmask_admin_eth0', 0).owner.isdefault()
     assert not await list_sessions()
-
-
-@pytest.mark.asyncio
-async def test_follower_properties():
-    ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
-    netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=True, properties=('aproperty',))
-    interface1 = Leadership('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
-    maconfig = OptionDescription('toto', '', [interface1])
-    async with await Config(maconfig) as cfg:
-        await cfg.property.read_write()
-        await cfg.option('ip_admin_eth0.ip_admin_eth0').value.set(['1.1.1.1', '192.168.0.0'])
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0').property.get() == ('aproperty',)
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0', 0).property.get() == ('aproperty',)
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0', 1).property.get() == ('aproperty',)
-        #
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0', 0).property.add('newproperty')
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0').property.get() == ('aproperty',)
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0', 0).property.get() == ('aproperty', 'newproperty')
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0', 1).property.get() == ('aproperty',)
-        #
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0').property.add('newproperty1')
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0').property.get() == ('aproperty', 'newproperty1')
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0', 0).property.get() == ('aproperty', 'newproperty', 'newproperty1')
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0', 1).property.get() == ('aproperty', 'newproperty1')
-    assert not await list_sessions()

tests/test_metaconfig.py

@@ -358,27 +358,6 @@ async def test_meta_new_config_wrong_name():
     await delete_sessions(meta)
 
 
-@pytest.mark.asyncio
-async def test_meta_load_config():
-    od = make_description()
-    meta = await MetaConfig(['name1', 'name2'], optiondescription=od)
-    assert len(list(await meta.config.list())) == 2
-    await meta.config.load('name1')
-    assert len(list(await meta.config.list())) == 3
-    await delete_sessions(meta)
-
-
-@pytest.mark.asyncio
-async def test_meta_load_config_wrong_name():
-    od = make_description()
-    meta = await MetaConfig(['name1', 'name2'], optiondescription=od)
-    assert len(list(await meta.config.list())) == 2
-    with pytest.raises(ConfigError):
-        await meta.config.load('name3')
-    assert len(list(await meta.config.list())) == 2
-    await delete_sessions(meta)
-
-
 @pytest.mark.asyncio
 async def test_meta_meta_set():
     meta = await make_metaconfig(double=True)
@@ -1130,39 +1109,6 @@ async def test_meta_properties_meta_deepcopy():
     await delete_sessions([meta, meta2])
 
 
-@pytest.mark.asyncio
-async def test_meta_properties_meta_deepcopy_multi_parent():
-    ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip")
-    netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask")
-    interface1 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
-    conf1 = await Config(interface1, session_id='conf1')
-    conf2 = await Config(interface1, session_id='conf2')
-    await conf1.property.read_write()
-    await conf2.property.read_write()
-    meta1 = await MetaConfig([conf1, conf2], session_id='meta1')
-    await meta1.permissive.add('hidden')
-    await meta1.property.read_write()
-
-    meta2 = await MetaConfig(['name1', 'name2'], optiondescription=interface1, session_id='meta2')
-    await meta2.config.add(conf1)
-
-    await meta1.option('ip_admin_eth0').value.set('192.168.1.1')
-    await meta2.option('netmask_admin_eth0').value.set('255.255.255.0')
-
-    assert await meta1.value.dict() == {'ip_admin_eth0': '192.168.1.1', 'netmask_admin_eth0': None}
-    assert await meta2.value.dict() == {'ip_admin_eth0': None, 'netmask_admin_eth0': '255.255.255.0'}
-    assert await conf1.value.dict() == {'ip_admin_eth0': '192.168.1.1', 'netmask_admin_eth0': '255.255.255.0'}
-    assert await conf2.value.dict() == {'ip_admin_eth0': '192.168.1.1', 'netmask_admin_eth0': None}
-
-    copy_meta2 = await conf1.config.deepcopy(session_id='copy_conf1', metaconfig_prefix='copy_')
-    assert await copy_meta2.config.path() == 'copy_meta2'
-    copy_meta1 = await copy_meta2.config('copy_meta1')
-    copy_conf1 = await copy_meta1.config('copy_conf1')
-    assert await copy_meta2.value.dict() == {'ip_admin_eth0': None, 'netmask_admin_eth0': '255.255.255.0'}
-    assert await copy_conf1.value.dict() == {'ip_admin_eth0': '192.168.1.1', 'netmask_admin_eth0': '255.255.255.0'}
-    await delete_sessions([conf1, conf2, meta1, meta2, copy_conf1, copy_meta1, copy_meta2])
-
-
 @pytest.mark.asyncio
 async def test_meta_properties_submeta_deepcopy():
     ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])

tests/test_option.py

@@ -31,18 +31,6 @@ async def test_option_valid_name():
     with pytest.raises(ValueError):
         SymLinkOption(1, i)
     i = SymLinkOption("test1", i)
-#
-#
-#@pytest.mark.asyncio
-#async def test_option_unvalid_name():
-#    with pytest.raises(ValueError):
-#        IntOption('test.', '')
-#    with pytest.raises(ValueError):
-#        IntOption('test.val', '')
-#    with pytest.raises(ValueError):
-#        IntOption('.test', '')
-#    with pytest.raises(ValueError):
-#        OptionDescription('.test', '', [])
 
 
 @pytest.mark.asyncio

tests/test_option_callback.py

@@ -10,7 +10,7 @@ from tiramisu.setting import groups, owners
 from tiramisu import ChoiceOption, BoolOption, IntOption, FloatOption, \
     StrOption, OptionDescription, SymLinkOption, IPOption, NetmaskOption, Leadership, \
     undefined, Calculation, Params, ParamOption, ParamValue, ParamIndex, calc_value, \
-    valid_ip_netmask, ParamSelfOption, ParamInformation, ParamSelfInformation
+    valid_ip_netmask, ParamSelfOption
 from tiramisu.error import PropertiesOptionError, ConflictError, LeadershipError, ConfigError
 from tiramisu.i18n import _
 from tiramisu.storage import list_sessions
@@ -43,10 +43,6 @@ def return_value(value=None):
     return value
 
 
-async def return_async_value(value=None):
-    return value
-
-
 def return_value2(*args, **kwargs):
     value = list(args)
     value.extend(kwargs.values())
@@ -337,72 +333,6 @@ async def test_callback_value(config_type):
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_callback_async_value(config_type):
-    val1 = StrOption('val1', "", 'val')
-    val2 = StrOption('val2', "", Calculation(return_async_value, Params(ParamOption(val1))))
-    val3 = StrOption('val3', "", Calculation(return_async_value, Params(ParamValue('yes'))))
-    val4 = StrOption('val4', "", Calculation(return_async_value, Params(kwargs={'value': ParamOption(val1)})))
-    val5 = StrOption('val5', "", Calculation(return_async_value, Params(ParamValue('yes'))))
-    maconfig = OptionDescription('rootconfig', '', [val1, val2, val3, val4, val5])
-    async with await Config(maconfig) as cfg:
-        await cfg.property.read_write()
-        cfg = await get_config(cfg, config_type)
-        assert await cfg.option('val1').value.get() == 'val'
-        assert await cfg.option('val2').value.get() == 'val'
-        assert await cfg.option('val4').value.get() == 'val'
-        await cfg.option('val1').value.set('new-val')
-        assert await cfg.option('val1').value.get() == 'new-val'
-        assert await cfg.option('val2').value.get() == 'new-val'
-        assert await cfg.option('val4').value.get() == 'new-val'
-        await cfg.option('val1').value.reset()
-        assert await cfg.option('val1').value.get() == 'val'
-        assert await cfg.option('val2').value.get() == 'val'
-        assert await cfg.option('val3').value.get() == 'yes'
-        assert await cfg.option('val4').value.get() == 'val'
-        assert await cfg.option('val5').value.get() == 'yes'
-    assert not await list_sessions()
-
-
-@pytest.mark.asyncio
-async def test_callback_information(config_type):
-    val1 = StrOption('val1', "", Calculation(return_value, Params(ParamInformation('information', 'no_value'))))
-    val2 = StrOption('val2', "", Calculation(return_value, Params(ParamInformation('information'))))
-    maconfig = OptionDescription('rootconfig', '', [val1, val2])
-    async with await Config(maconfig) as cfg:
-        await cfg.property.read_write()
-        cfg = await get_config(cfg, config_type)
-        assert await cfg.option('val1').value.get() == 'no_value'
-        with pytest.raises(ConfigError):
-            await cfg.option('val2').value.get()
-        await cfg.information.set('information', 'new_value')
-        assert await cfg.option('val1').value.get() == 'new_value'
-        assert await cfg.option('val2').value.get() == 'new_value'
-        await cfg.information.set('information', 'new_value2')
-        assert await cfg.option('val1').value.get() == 'new_value2'
-        assert await cfg.option('val2').value.get() == 'new_value2'
-    assert not await list_sessions()
-
-
-@pytest.mark.asyncio
-async def test_callback_information2(config_type):
-    val1 = StrOption('val1', "", Calculation(return_value, Params(ParamSelfInformation('information', 'no_value'))))
-    val2 = StrOption('val2', "", Calculation(return_value, Params(ParamSelfInformation('information'))))
-    val2.impl_set_information('information', 'new_value')
-    val3 = StrOption('val3', "", Calculation(return_value, Params(ParamSelfInformation('information'))))
-    maconfig = OptionDescription('rootconfig', '', [val1, val2, val3])
-    async with await Config(maconfig) as cfg:
-        await cfg.property.read_write()
-        cfg = await get_config(cfg, config_type)
-        assert await cfg.option('val1').value.get() == 'no_value'
-        assert await cfg.option('val2').value.get() == 'new_value'
-        with pytest.raises(ConfigError):
-            await cfg.option('val3').value.get()
-        await cfg.option('val2').information.set('information', 'new_value2')
-        assert await cfg.option('val2').value.get() == 'new_value2'
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_callback_value_tuple(config_type):
     val1 = StrOption('val1', "", 'val1')
@@ -1298,21 +1228,6 @@ async def test_callback_calculating_invalid():
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_callback_unrestraint():
-    opt1 = IntOption('opt1', '', 1)
-    opt2 = IntOption('opt2', '', Calculation(return_value, Params(ParamOption(opt1))))
-    od1 = OptionDescription('od1', '', [opt1], properties=('disabled',))
-    od2 = OptionDescription('od2', '', [opt2])
-    maconfig = OptionDescription('rootconfig', '', [od1, od2])
-    async with await Config(maconfig) as cfg:
-        await cfg.property.read_write()
-        with pytest.raises(ConfigError):
-            await cfg.option('od2.opt2').value.get()
-        assert await cfg.unrestraint.option('od2.opt2').value.get() == 1
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_callback_calculating_disabled():
     opt1 = BoolOption('opt1', '', properties=('disabled',))
@@ -1518,14 +1433,11 @@ async def test_calc_value_remove_duplicate(config_type):
 async def test_calc_value_join(config_type):
     val1 = StrOption('val1', "", 'val1')
     val2 = StrOption('val2', "", 'val2')
-    val3 = StrOption('val3', "")
-    val4 = StrOption('val4', "", Calculation(calc_value, Params((ParamOption(val1), ParamOption(val2), ParamOption(val3)), join=ParamValue('.'))))
-    od = OptionDescription('root', '', [val1, val2, val3, val4])
+    val3 = StrOption('val3', "", Calculation(calc_value, Params((ParamOption(val1), ParamOption(val2)), join=ParamValue('.'))))
+    od = OptionDescription('root', '', [val1, val2, val3])
     async with await Config(od) as cfg:
         cfg = await get_config(cfg, config_type)
-        assert await cfg.value.dict() == {'val1': 'val1', 'val2': 'val2', 'val3': None, 'val4': None}
-        await cfg.option('val3').value.set('val3')
-        assert await cfg.value.dict() == {'val1': 'val1', 'val2': 'val2', 'val3': 'val3', 'val4': 'val1.val2.val3'}
+        assert await cfg.value.dict() == {'val1': 'val1', 'val2': 'val2', 'val3': 'val1.val2'}
     assert not await list_sessions()
 
 

tests/test_option_setting.py

@@ -191,9 +191,9 @@ async def test_property_get_unique_empty():
     async with await Config(descr) as cfg:
         await cfg.property.read_write()
         assert await cfg.option('string').property.get() == {'empty', 'unique'}
-        assert await cfg.option('string2').property.get() == {'empty', 'notunique'}
-        assert await cfg.option('string3').property.get() == {'unique', 'notempty'}
-        assert await cfg.option('string4').property.get() == {'notunique', 'notempty'}
+        assert await cfg.option('string2').property.get() == {'empty'}
+        assert await cfg.option('string3').property.get() == {'unique'}
+        assert await cfg.option('string4').property.get() == set()
     assert not await list_sessions()
 
 

tests/test_requires.py

@@ -1070,38 +1070,6 @@ async def test_requires_different_inverse_unicode(config_type):
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_requires_different_inverse_unicode2(config_type):
-    a = BoolOption('activate_service', '', False)
-    d = StrOption('activate_other_service', '', 'val2')
-    disabled_property = Calculation(calc_value,
-                                    Params(ParamValue('disabled'),
-                                           kwargs={'condition_0': ParamOption(a),
-                                                   'condition_1': ParamOption(d),
-                                                   'expected_0': ParamValue(True),
-                                                   'expected_1': ParamValue(['val2', 'val3']),
-                                                   'condition_operator': ParamValue('OR'),
-                                                   'reverse_condition_1': ParamValue(True)}))
-    b = IPOption('ip_address_service', '', properties=(disabled_property,))
-    od = OptionDescription('service', '', [a, d, b])
-    async with await Config(od) as cfg:
-        await cfg.property.read_write()
-        cfg = await get_config(cfg, config_type)
-        assert await cfg.option('ip_address_service').value.get() == None
-        await cfg.option('activate_service').value.set(True)
-        with pytest.raises(PropertiesOptionError):
-            await cfg.option('ip_address_service').value.get()
-        await cfg.option('activate_service').value.set(False)
-        assert await cfg.option('ip_address_service').value.get() == None
-        await cfg.option('activate_other_service').value.set('val1')
-        with pytest.raises(PropertiesOptionError):
-            await cfg.option('ip_address_service').value.get()
-        await cfg.option('activate_service').value.set(True)
-        with pytest.raises(PropertiesOptionError):
-            await cfg.option('ip_address_service').value.get()
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_optiondescription_requires():
     a = BoolOption('activate_service', '', True)

tests/test_submulti.py

@@ -5,6 +5,7 @@ import pytest
 import warnings
 
 
+from tiramisu.api import TIRAMISU_VERSION
 from tiramisu.setting import groups, owners
 from tiramisu import StrOption, IntOption, OptionDescription, submulti, Leadership, Config, \
                      MetaConfig, undefined, Params, ParamOption, Calculation
@@ -37,7 +38,11 @@ async def test_unknown_multi():
 @pytest.mark.asyncio
 async def test_submulti():
     multi = StrOption('multi', '', multi=submulti)
-    multi2 = StrOption('multi2', '', default_multi=['yes'], multi=submulti)
+    if TIRAMISU_VERSION == 2:
+        default_multi = 'yes'
+    else:
+        default_multi = ['yes']
+    multi2 = StrOption('multi2', '', default_multi=default_multi, multi=submulti)
     multi3 = StrOption('multi3', '', default=[['yes']], multi=submulti)
     od = OptionDescription('od', '', [multi, multi2, multi3])
     async with await Config(od) as cfg:
@@ -61,7 +66,11 @@ async def test_submulti_default_multi_not_list():
 @pytest.mark.asyncio
 async def test_append_submulti():
     multi = StrOption('multi', '', multi=submulti)
-    multi2 = StrOption('multi2', '', default_multi=['yes'], multi=submulti)
+    if TIRAMISU_VERSION == 2:
+        default_multi = 'yes'
+    else:
+        default_multi = ['yes']
+    multi2 = StrOption('multi2', '', default_multi=default_multi, multi=submulti)
     multi3 = StrOption('multi3', '', default=[['yes']], multi=submulti)
     od = OptionDescription('od', '', [multi, multi2, multi3])
     async with await Config(od) as cfg:
@@ -95,7 +104,11 @@ async def test_append_submulti():
 @pytest.mark.asyncio
 async def test_append_unvalide_submulti():
     multi = StrOption('multi', '', multi=submulti)
-    multi2 = StrOption('multi2', '', default_multi=['yes'], multi=submulti)
+    if TIRAMISU_VERSION == 2:
+        default_multi = 'yes'
+    else:
+        default_multi = ['yes']
+    multi2 = StrOption('multi2', '', default_multi=default_multi, multi=submulti)
     multi3 = StrOption('multi3', '', default=[['yes']], multi=submulti)
     od = OptionDescription('od', '', [multi, multi2, multi3])
     async with await Config(od) as cfg:
@@ -124,7 +137,11 @@ async def test_append_unvalide_submulti():
 @pytest.mark.asyncio
 async def test_pop_submulti():
     multi = StrOption('multi', '', multi=submulti)
-    multi2 = StrOption('multi2', '', default_multi=['yes'], multi=submulti)
+    if TIRAMISU_VERSION == 2:
+        default_multi = 'yes'
+    else:
+        default_multi = ['yes']
+    multi2 = StrOption('multi2', '', default_multi=default_multi, multi=submulti)
     multi3 = StrOption('multi3', '', default=[['yes']], multi=submulti)
     od = OptionDescription('od', '', [multi, multi2, multi3])
     async with await Config(od) as cfg:
@@ -250,27 +267,6 @@ async def test_values_with_leader_and_followers_submulti():
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_values_with_leader_and_followers_submulti_default_multi():
-    ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
-    netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=submulti, default_multi=['255.255.0.0', '0.0.0.0'])
-    interface1 = Leadership('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
-    maconfig = OptionDescription('toto', '', [interface1])
-    async with await Config(maconfig) as cfg:
-        await cfg.property.read_write()
-        owner = await cfg.owner.get()
-        assert interface1.impl_get_group_type() == groups.leadership
-        assert await cfg.option('ip_admin_eth0.ip_admin_eth0').owner.get() == owners.default
-        await cfg.option('ip_admin_eth0.ip_admin_eth0').value.set(["192.168.230.145"])
-        assert await cfg.option('ip_admin_eth0.ip_admin_eth0').value.get() == ["192.168.230.145"]
-        assert await cfg.option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == ['255.255.0.0', '0.0.0.0']
-        await cfg.option('ip_admin_eth0.ip_admin_eth0').value.set(["192.168.230.145", "192.168.230.147"])
-        await cfg.option('ip_admin_eth0.netmask_admin_eth0', 0).value.set(['255.255.255.0'])
-        assert await cfg.option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == ['255.255.255.0']
-        assert await cfg.option('ip_admin_eth0.netmask_admin_eth0', 1).value.get() == ['255.255.0.0', '0.0.0.0']
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_reset_values_with_leader_and_followers_submulti():
     ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
@@ -433,20 +429,6 @@ async def test_callback_submulti():
     assert not await list_sessions()
 
 
-@pytest.mark.asyncio
-async def test_callback_submulti_follower():
-    multi = StrOption('multi', '', multi=True)
-    multi2 = StrOption('multi2', '', Calculation(return_list), multi=submulti)
-    od = Leadership('multi', '', [multi, multi2])
-    od = OptionDescription('multi', '', [od])
-    async with await Config(od) as cfg:
-        await cfg.property.read_write()
-        assert await cfg.option('multi.multi').value.get() == []
-        await cfg.option('multi.multi').value.set(['val'])
-        assert await cfg.option('multi.multi2', 0).value.get() == ['val', 'val']
-    assert not await list_sessions()
-
-
 @pytest.mark.asyncio
 async def test_submulti_unique():
     i = IntOption('int', '', multi=submulti, properties=('unique',))

tiramisu/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2012-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -17,8 +17,8 @@
 from .function import calc_value, calc_value_property_help, valid_ip_netmask, \
                       valid_network_netmask, valid_in_network, valid_broadcast, \
                       valid_not_equal
-from .autolib import Calculation, Params, ParamOption, ParamDynOption, ParamSelfOption, \
-                     ParamValue, ParamIndex, ParamSuffix, ParamInformation, ParamSelfInformation
+from .autolib import Calculation, Params, ParamOption, ParamSelfOption, ParamValue, \
+                     ParamIndex, ParamSuffix
 from .option import *
 from .error import APIError
 from .api import Config, MetaConfig, GroupConfig, MixConfig
@@ -31,13 +31,10 @@ from .storage import default_storage, Storage, list_sessions, \
 allfuncs = ['Calculation',
             'Params',
             'ParamOption',
-            'ParamDynOption',
             'ParamSelfOption',
             'ParamValue',
             'ParamIndex',
             'ParamSuffix',
-            'ParamInformation',
-            'ParamSelfInformation',
             'MetaConfig',
             'MixConfig',
             'GroupConfig',

tiramisu/api.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -52,7 +52,7 @@ class TiramisuHelp:
             if module_name in ['forcepermissive', 'unrestraint']:
                 force = True
                 max_len = max(max_len, len('forcepermissive'))
-            elif module_name != 'help' and not module_name.startswith('_'):
+            elif module_name is not 'help' and not module_name.startswith('_'):
                 modules.append(module_name)
                 max_len = max(max_len, len(module_name))
         modules.sort()
@@ -87,8 +87,8 @@ class CommonTiramisu(TiramisuHelp):
 
     async def _get_option(self,
                           connection) -> Any:
-        config_bag = self._option_bag.config_bag
         if not self._subconfig:
+            config_bag = self._option_bag.config_bag
             try:
                 subconfig, name = await config_bag.context.cfgimpl_get_home_by_path(self._option_bag.path,
                                                                                     config_bag,
@@ -101,7 +101,7 @@ class CommonTiramisu(TiramisuHelp):
             self._name = name
         option = self._option_bag.option
         if option is None:
-            option = await self._subconfig.cfgimpl_get_description().get_child(self._name,
+            option = await self._subconfig.cfgimpl_get_description().get_child(name,
                                                                                config_bag,
                                                                                self._subconfig.cfgimpl_get_path())
             self._option_bag.option = option
@@ -212,17 +212,6 @@ class _TiramisuOptionOptionDescription(CommonTiramisuOption):
         """Test if option has dependency"""
         return self._option_bag.option.impl_has_dependency(self_is_dep)
 
-    @option_and_connection
-    async def dependencies(self):
-        """Get dependencies from this option"""
-        options = []
-        for option in self._option_bag.option._get_dependencies(self._option_bag.config_bag.context):
-            options.append(TiramisuOption(option().impl_getpath(),
-                                          None,
-                                          self._option_bag.config_bag,
-                                          ))
-        return options
-
     @option_and_connection
     async def isoptiondescription(self):
         """Test if option is an optiondescription"""
@@ -464,28 +453,28 @@ class TiramisuOptionInformation(CommonTiramisuOption):
     @option_and_connection
     async def get(self, key, default=undefined):
         """Get information"""
+        path = self._option_bag.path
         values = self._option_bag.config_bag.context.cfgimpl_get_values()
-        return await values.get_information(self._option_bag.config_bag,
-                                            self._option_bag,
-                                            key,
-                                            default,
-                                            )
+        try:
+            return await values.get_information(self._option_bag.config_bag.connection,
+                                                key,
+                                                path=path)
+        except ValueError:
+            return self._option_bag.option.impl_get_information(key, default)
 
     @option_and_connection
     async def set(self, key, value):
         """Set information"""
         path = self._option_bag.path
         values = self._option_bag.config_bag.context.cfgimpl_get_values()
-        await values.set_information(self._option_bag.config_bag,
-                                     self._option_bag,
+        await values.set_information(self._option_bag.config_bag.connection,
                                      key,
                                      value,
-                                     )
+                                     path=path)
 
     @option_and_connection
     async def reset(self,
-                    key: str,
-                    ) -> None:
+              key):
         """Remove information"""
         path = self._option_bag.path
         values = self._option_bag.config_bag.context.cfgimpl_get_values()
@@ -885,53 +874,30 @@ def connection(func):
 class TiramisuContextInformation(TiramisuConfig):
     """Manage config informations"""
     @connection
-    async def get(self,
-                  name,
-                  default=undefined,
-                  ):
+    async def get(self, name, default=undefined):
         """Get an information"""
-        values = self._config_bag.context.cfgimpl_get_values()
-        return await values.get_information(self._config_bag,
-                                            None,
-                                            name,
-                                            default,
-                                            )
+        return await self._config_bag.context.impl_get_information(self._config_bag.connection,
+                                                                   name,
+                                                                   default)
 
     @connection
-    async def set(self,
-                  name,
-                  value,
-                  ):
+    async def set(self, name, value):
         """Set an information"""
-        await self._config_bag.context.impl_set_information(self._config_bag,
+        await self._config_bag.context.impl_set_information(self._config_bag.connection,
                                                             name,
-                                                            value,
-                                                            )
+                                                            value)
 
     @connection
-    async def reset(self,
-                    name,
-                    ):
+    async def reset(self, name):
         """Remove an information"""
         await self._config_bag.context.impl_del_information(self._config_bag.connection,
-                                                            name,
-                                                            )
+                                                            name)
 
     @connection
     async def list(self):
         """List information's keys"""
         return await self._config_bag.context.impl_list_information(self._config_bag.connection)
 
-    @connection
-    async def exportation(self):
-        """Export all informations"""
-        return await self._config_bag.context.cfgimpl_get_values()._p_.exportation_informations(self._config_bag.connection)
-
-    @connection
-    async def importation(self, informations):
-        """Import informations"""
-        return await self._config_bag.context.cfgimpl_get_values()._p_.importation_informations(self._config_bag.connection, informations)
-
 
 class TiramisuContextValue(TiramisuConfig):
     """Manage config value"""
@@ -1567,7 +1533,8 @@ class _TiramisuContextMixConfig(_TiramisuContextGroupConfig, _TiramisuContextCon
     async def new(self,
                   session_id,
                   storage=None,
-                  type='config'):
+                  type='config',
+                  new=None):
         """Create and add a new config"""
         config = self._config_bag.context
         if storage is None:
@@ -1578,26 +1545,7 @@ class _TiramisuContextMixConfig(_TiramisuContextGroupConfig, _TiramisuContextCon
                                                  session_id=session_id,
                                                  storage=storage,
                                                  type_=type,
-                                                 )
-        return await self._return_config(new_config,
-                                         storage)
-
-    async def load(self,
-                   session_id,
-                   storage=None,
-                   type='config',
-                   ):
-        """Create and add a new config"""
-        config = self._config_bag.context
-        if storage is None:
-            storage = config._storage
-        storage_obj = await storage.get()
-        async with storage_obj.Connection() as connection:
-            new_config = await config.load_config(connection,
-                                                  session_id=session_id,
-                                                  storage=storage,
-                                                  type_=type,
-                                                  )
+                                                 new=new)
         return await self._return_config(new_config,
                                          storage)
 

tiramisu/asyncinit.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2019-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/autolib.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2012-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -19,7 +19,6 @@
 # ____________________________________________________________
 "enables us to carry out a calculation and return an option's value"
 from typing import Any, Optional, Union, Callable, Dict, List
-from types import CoroutineType
 from itertools import chain
 
 from .error import PropertiesOptionError, ConfigError, LeadershipError, ValueWarning
@@ -82,25 +81,6 @@ class ParamOption(Param):
         self.raisepropertyerror = raisepropertyerror
 
 
-class ParamDynOption(ParamOption):
-    __slots__ = ('suffix',)
-    def __init__(self,
-                 option: 'Option',
-                 suffix: str,
-                 dynoptiondescription: 'DynOptionDescription',
-                 notraisepropertyerror: bool=False,
-                 raisepropertyerror: bool=False,
-                 todict: bool=False,
-                 ) -> None:
-        super().__init__(option,
-                         notraisepropertyerror,
-                         raisepropertyerror,
-                         todict,
-                         )
-        self.suffix = suffix
-        self.dynoptiondescription = dynoptiondescription
-
-
 class ParamSelfOption(Param):
     __slots__ = ('todict', 'whole')
     def __init__(self,
@@ -118,20 +98,6 @@ class ParamValue(Param):
         self.value = value
 
 
-class ParamInformation(Param):
-    __slots__ = ('information_name',)
-    def __init__(self,
-                 information_name: str,
-                 default_value: Any=undefined,
-                 ) -> None:
-        self.information_name = information_name
-        self.default_value = default_value
-
-
-class ParamSelfInformation(ParamInformation):
-    __slots__ = tuple()
-
-
 class ParamIndex(Param):
     __slots__ = tuple()
 
@@ -170,10 +136,7 @@ class Calculation:
                 option_bag: OptionBag,
                 leadership_must_have_index: bool=False,
                 orig_value: Any=undefined,
-                allow_value_error: bool=False,
-                force_value_warning: bool=False,
-                for_settings: bool=False,
-                ) -> Any:
+                allow_raises=False) -> Any:
         return await carry_out_calculation(option_bag.option,
                                            callback=self.function,
                                            callback_params=self.params,
@@ -181,29 +144,20 @@ class Calculation:
                                            config_bag=option_bag.config_bag,
                                            leadership_must_have_index=leadership_must_have_index,
                                            orig_value=orig_value,
-                                           allow_value_error=allow_value_error,
-                                           force_value_warning=force_value_warning,
-                                           for_settings=for_settings,
-                                           )
+                                           allow_raises=allow_raises)
 
     async def help(self,
                    option_bag: OptionBag,
-                   leadership_must_have_index: bool=False,
-                   for_settings: bool=False,
-                   ) -> str:
+                   leadership_must_have_index: bool=False) -> str:
         if not self.help_function:
             return await self.execute(option_bag,
-                                      leadership_must_have_index=leadership_must_have_index,
-                                      for_settings=for_settings,
-                                      )
+                                      leadership_must_have_index=leadership_must_have_index)
         return await carry_out_calculation(option_bag.option,
                                            callback=self.help_function,
                                            callback_params=self.params,
                                            index=option_bag.index,
                                            config_bag=option_bag.config_bag,
-                                           leadership_must_have_index=leadership_must_have_index,
-                                           for_settings=for_settings,
-                                           )
+                                           leadership_must_have_index=leadership_must_have_index)
 
     def has_index(self, current_option):
         if hasattr(self, '_has_index'):
@@ -221,14 +175,12 @@ class Break(Exception):
     pass
 
 
-async def manager_callback(callbk: Param,
+async def manager_callback(callbk: Union[ParamOption, ParamValue],
                            option,
                            index: Optional[int],
                            orig_value,
                            config_bag: ConfigBag,
-                           leadership_must_have_index: bool,
-                           for_settings: bool,
-                           ) -> Any:
+                           leadership_must_have_index: bool) -> Any:
     """replace Param by true value"""
     def calc_index(callbk, index, same_leadership):
         if index is not None:
@@ -262,10 +214,7 @@ async def manager_callback(callbk: Param,
             value = value[apply_index]
         return value
 
-    async def get_value(callbk,
-                        option_bag,
-                        path,
-                        ):
+    async def get_value(callbk, option_bag, path):
         try:
             # get value
             value = await config_bag.context.getattr(path,
@@ -278,10 +227,6 @@ async def manager_callback(callbk: Param,
                                 ', {}').format(option.impl_get_display_name(), err), err)
         except ValueError as err:
             raise ValueError(_('the option "{0}" is used in a calculation but is invalid ({1})').format(option_bag.option.impl_get_display_name(), err))
-        except AttributeError as err:
-            raise ConfigError(_('impossible to calculate "{0}", {1}').format(option_bag.option.impl_get_display_name(),
-                                                                             err,
-                                                                             ))
         return value
 
     async def get_option_bag(config_bag,
@@ -290,11 +235,9 @@ async def manager_callback(callbk: Param,
                              self_calc):
         # don't validate if option is option that we tried to validate
         config_bag = config_bag.copy()
-        if for_settings:
-            config_bag.properties = config_bag.true_properties - {'warnings'}
+        config_bag.properties = config_bag.true_properties - {'warnings'}
         config_bag.set_permissive()
-        if not for_settings:
-            config_bag.properties -= {'warnings'}
+        #config_bag.properties -= {'warnings'}
         option_bag = OptionBag()
         option_bag.set_option(opt,
                               index_,
@@ -312,32 +255,12 @@ async def manager_callback(callbk: Param,
     if isinstance(callbk, ParamValue):
         return callbk.value
 
-    if isinstance(callbk, ParamInformation):
-        if isinstance(callbk, ParamSelfInformation):
-            option_bag = OptionBag()
-            option_bag.set_option(option,
-                                  index,
-                                  config_bag,
-                                  )
-        else:
-            option_bag = None
-        try:
-            return await config_bag.context.impl_get_information(config_bag,
-                                                                 option_bag,
-                                                                 callbk.information_name,
-                                                                 callbk.default_value,
-                                                                 )
-        except ValueError as err:
-            raise ConfigError(_('option "{}" cannot be calculated: {}').format(option.impl_get_display_name(),
-                                                                               str(err),
-                                                                               ))
-
     if isinstance(callbk, ParamIndex):
         return index
 
     if isinstance(callbk, ParamSuffix):
         if not option.issubdyn():
-            raise ConfigError(_('option "{}" is not in a dynoptiondescription').format(option.impl_get_display_name()))
+            raise ConfigError('option "{}" is not in a dynoptiondescription'.format(option.impl_get_display_name()))
         return option.impl_getsuffix()
 
     if isinstance(callbk, ParamSelfOption):
@@ -349,60 +272,41 @@ async def manager_callback(callbk: Param,
         return {'name': option.impl_get_display_name(),
                 'value': value}
 
-    if isinstance(callbk, ParamOption):
-        callbk_option = callbk.option
-        if callbk_option.issubdyn():
-            if isinstance(callbk, ParamDynOption):
-                subdyn = callbk.dynoptiondescription
-                rootpath = subdyn.impl_getpath() + callbk.suffix
-                suffix = callbk.suffix
-            else:
-                if not option.impl_is_dynsymlinkoption():
-                    msg = 'option "{}" is not dynamic but is an argument of the dynamic option "{}" in a callback'
-                    raise ConfigError(_(msg).format(option.impl_get_display_name(),
-                                                    callbk_option.impl_get_display_name(),
-                                                    ))
-                #FIXME in same dynamic option?
-                rootpath = option.rootpath
-                suffix = option.impl_getsuffix()
-                subdyn = callbk_option.getsubdyn()
-            callbk_option = callbk_option.to_dynoption(rootpath,
-                                                       suffix,
-                                                       subdyn)
-        if leadership_must_have_index and callbk_option.impl_get_leadership() and index is None:
-            raise Break()
-        if config_bag is undefined:
-            return undefined
-        if index is not None and callbk_option.impl_get_leadership() and \
-                callbk_option.impl_get_leadership().in_same_group(option):
-            if not callbk_option.impl_is_follower():
-                # leader
-                index_ = None
-                with_index = True
-            else:
-                # follower
-                index_ = index
-                with_index = False
-        else:
+    # it's ParamOption
+    callbk_option = callbk.option
+    if callbk_option.issubdyn():
+        callbk_option = callbk_option.to_dynoption(option.rootpath,
+                                                   option.impl_getsuffix(),
+                                                   callbk_option.getsubdyn())
+    if leadership_must_have_index and callbk_option.impl_get_leadership() and index is None:
+        raise Break()
+    if config_bag is undefined:
+        return undefined
+    if index is not None and callbk_option.impl_get_leadership() and \
+            callbk_option.impl_get_leadership().in_same_group(option):
+        if not callbk_option.impl_is_follower():
+            # leader
             index_ = None
+            with_index = True
+        else:
+            # follower
+            index_ = index
             with_index = False
-        path = callbk_option.impl_getpath()
-        option_bag = await get_option_bag(config_bag,
-                                          callbk_option,
-                                          index_,
-                                          False)
-        value = await get_value(callbk,
-                                option_bag,
-                                path,
-                                )
-        if with_index:
-            value = value[index]
-        if not callbk.todict:
-            return value
-        return {'name': callbk_option.impl_get_display_name(),
-                'value': value}
-    raise ConfigError(_('unknown callback type {} in option {}').format(callbk,
-                                                                        option.impl_get_display_name()))
+    else:
+        index_ = None
+        with_index = False
+    path = callbk_option.impl_getpath()
+    option_bag = await get_option_bag(config_bag,
+                                      callbk_option,
+                                      index_,
+                                      False)
+    value = await get_value(callbk, option_bag, path)
+    if with_index:
+        value = value[index]
+    if not callbk.todict:
+        return value
+    return {'name': callbk_option.impl_get_display_name(),
+            'value': value}
 
 
 async def carry_out_calculation(option,
@@ -412,19 +316,18 @@ async def carry_out_calculation(option,
                                 config_bag: Optional[ConfigBag],
                                 orig_value=undefined,
                                 leadership_must_have_index: bool=False,
-                                allow_value_error: bool=False,
-                                force_value_warning: bool=False,
-                                for_settings: bool=False,
-                                ):
+                                allow_raises: int=False):
     """a function that carries out a calculation for an option's value
 
     :param option: the option
     :param callback: the name of the callback function
+    :type callback: str
     :param callback_params: the callback's parameters
                             (only keyword parameters are allowed)
+    :type callback_params: dict
     :param index: if an option is multi, only calculates the nth value
-    :param allow_value_error: to know if carry_out_calculation can return ValueError or ValueWarning (for example if it's a validation)
-    :param force_value_warning: transform valueError to ValueWarning object
+    :type index: int
+    :param allow_raises: to know if carry_out_calculation is used to validate a value
 
     The callback_params is a dict. Key is used to build args (if key is '')
     and kwargs (otherwise). Values are tuple of:
@@ -444,9 +347,7 @@ async def carry_out_calculation(option,
                                                index,
                                                orig_value,
                                                config_bag,
-                                               leadership_must_have_index,
-                                               for_settings,
-                                               )
+                                               leadership_must_have_index)
                 if value is undefined:
                     return undefined
                 if key is None:
@@ -463,14 +364,13 @@ async def carry_out_calculation(option,
                         kwargs[key] = {'propertyerror': str(err)}
             except Break:
                 continue
-    ret = await calculate(option,
-                          callback,
-                          allow_value_error,
-                          force_value_warning,
-                          args,
-                          kwargs)
+    ret = calculate(option,
+                    callback,
+                    allow_raises,
+                    args,
+                    kwargs)
     if isinstance(ret, list) and not option.impl_is_dynoptiondescription() and \
-            option.impl_is_follower() and not option.impl_is_submulti():
+            option.impl_is_follower():
         if args or kwargs:
             raise LeadershipError(_('the "{}" function with positional arguments "{}" '
                                     'and keyword arguments "{}" must not return '
@@ -489,13 +389,11 @@ async def carry_out_calculation(option,
     return ret
 
 
-async def calculate(option,
-                    callback: Callable,
-                    allow_value_error: bool,
-                    force_value_warning: bool,
-                    args,
-                    kwargs,
-                    ):
+def calculate(option,
+              callback: Callable,
+              allow_raises: bool,
+              args,
+              kwargs):
     """wrapper that launches the 'callback'
 
     :param callback: callback function
@@ -504,16 +402,13 @@ async def calculate(option,
 
     """
     try:
-        ret = callback(*args, **kwargs)
-        if isinstance(ret, CoroutineType):
-            ret = await ret
-        return ret
-    except (ValueError, ValueWarning) as err:
-        if allow_value_error:
-            if force_value_warning:
-                raise ValueWarning(str(err))
+        return callback(*args, **kwargs)
+    except ValueError as err:
+        if allow_raises:
             raise err
         error = err
+    except ValueWarning as err:
+        raise err
     except Exception as err:
         # import traceback
         # traceback.print_exc()
@@ -530,4 +425,5 @@ async def calculate(option,
                 '').format(str(error),
                            callback.__name__,
                            option.impl_get_display_name())
-    raise ConfigError(msg) from error
+    del error
+    raise ConfigError(msg)

tiramisu/config.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2012-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -64,11 +64,11 @@ class SubConfig:
                 (not isinstance(descr, (BaseOption, SynDynOptionDescription)) or
                  not descr.impl_is_optiondescription()):
             try:
-                msg = descr.impl_get_display_name()
+                msg = descr.impl_get_displayname()
             except AttributeError:
                 msg = descr
-            raise TypeError(_('cannot create a sub config for "{0}" this is a "{1}", not an "OptionDescription"'
-                              ).format(msg, descr.__class__.__name__))
+            raise TypeError(_('"{0}" must be an optiondescription, not an {1}'
+                              ).format(msg, type(descr)))
         self._impl_descr = descr
         self._impl_context = context
         self._impl_path = subpath
@@ -111,23 +111,8 @@ class SubConfig:
         for woption in option_bag.option._get_dependencies(self.cfgimpl_get_description()):
             option = woption()
             if option.impl_is_dynoptiondescription():
-                path = option.impl_getpath()
-                if '.' in path:
-                    subpath = option.impl_getpath().rsplit('.', 1)[0]
-                else:
-                    subpath = ''
+                subpath = option.impl_getpath().rsplit('.', 1)[0]
                 for suffix in await option.get_suffixes(option_bag.config_bag):
-                    async for coption in self.cfgimpl_get_description().get_children_recursively(None,
-                                                                                                 None,
-                                                                                                 option_bag.config_bag):
-                        coption_bag = OptionBag()
-                        coption_bag.set_option(coption,
-                                               option_bag.index,
-                                               option_bag.config_bag)
-                        await self.reset_one_option_cache(option,
-                                                          resetted_opts,
-                                                          coption_bag,
-                                                          )
                     doption = option.to_dynoption(subpath,
                                                   suffix,
                                                   option)
@@ -135,6 +120,7 @@ class SubConfig:
                     doption_bag.set_option(doption,
                                            option_bag.index,
                                            option_bag.config_bag)
+                    doption_bag.properties = await self.cfgimpl_get_settings().getproperties(doption_bag)
                     await self.reset_one_option_cache(desc,
                                                       resetted_opts,
                                                       doption_bag)
@@ -153,7 +139,7 @@ class SubConfig:
                     doption_bag.set_option(doption,
                                            option_bag.index,
                                            option_bag.config_bag)
-                    #doption_bag.properties = await self.cfgimpl_get_settings().getproperties(doption_bag)
+                    doption_bag.properties = await self.cfgimpl_get_settings().getproperties(doption_bag)
                     await self.reset_one_option_cache(desc,
                                                       resetted_opts,
                                                       doption_bag)
@@ -173,8 +159,7 @@ class SubConfig:
 
     async def cfgimpl_reset_cache(self,
                                   option_bag,
-                                  resetted_opts=None,
-                                  ):
+                                  resetted_opts=None):
         """reset all settings in cache
         """
         if resetted_opts is None:
@@ -183,16 +168,9 @@ class SubConfig:
         context = self.cfgimpl_get_context()
         desc = context.cfgimpl_get_description()
         if option_bag is not None:
-            if 'cache' in option_bag.config_bag.properties:
-                has_cache = True
-                option_bag.config_bag.properties = option_bag.config_bag.properties - {'cache'}
-            else:
-                has_cache = False
             await self.reset_one_option_cache(desc,
                                               resetted_opts,
                                               option_bag)
-            if has_cache:
-                option_bag.config_bag.properties = option_bag.config_bag.properties | {'cache'}
         else:
             context._impl_values_cache.reset_all_cache()
             context._impl_properties_cache.reset_all_cache()
@@ -431,8 +409,7 @@ class SubConfig:
                               flatten,
                               fullpath,
                               pathsvalues,
-                              leader_to_list,
-                              )
+                              leader_to_list)
         return pathsvalues
 
     async def _make_dict(self,
@@ -445,18 +422,6 @@ class SubConfig:
         for opt in await self.cfgimpl_get_description().get_children(config_bag):
             if leader_to_list and opt.impl_is_optiondescription() and opt.impl_is_leadership():
                 # leader
-                try:
-                    loption_bag = OptionBag()
-                    loption_bag.set_option(opt,
-                                           None,
-                                           config_bag)
-                    loption_bag.properties = await self.cfgimpl_get_settings().getproperties(loption_bag)
-                    await self.cfgimpl_get_settings().validate_properties(loption_bag,
-                                                                          need_help=False)
-                except PropertiesOptionError as err:
-                    if err.proptype in (['mandatory'], ['empty']):
-                        raise err
-                    continue
                 children = await opt.get_children(config_bag)
                 leader = children[0]
                 loption_bag = OptionBag()
@@ -465,7 +430,7 @@ class SubConfig:
                                        config_bag)
                 loption_bag.properties = await self.cfgimpl_get_settings().getproperties(loption_bag)
                 leader_pathsvalues = {}
-                leader_currpath = _currpath + [opt.impl_getname()]
+                leader_currpath = _currpath + [leader.impl_getname()]
                 await self._make_sub_dict(leader_pathsvalues,
                                           leader_currpath,
                                           loption_bag,
@@ -585,38 +550,27 @@ class _CommonConfig(SubConfig):
 
     # information
     async def impl_set_information(self,
-                                   config_bag,
+                                   connection,
                                    key,
-                                   value,
-                                   ):
+                                   value):
         """updates the information's attribute
 
         :param key: information's key (ex: "help", "doc"
         :param value: information's value (ex: "the help string")
         """
-        await self._impl_values.set_information(config_bag,
-                                                None,
+        await self._impl_values.set_information(connection,
                                                 key,
                                                 value)
-        for option in config_bag.context.cfgimpl_get_description()._cache_dependencies_information.get(key, []):
-            option_bag = OptionBag()
-            option_bag.set_option(option,
-                                  None,
-                                  config_bag)
-            await config_bag.context.cfgimpl_reset_cache(option_bag)
 
     async def impl_get_information(self,
-                                   config_bag,
-                                   option_bag,
+                                   connection,
                                    key,
-                                   default,
-                                   ):
+                                   default=undefined):
         """retrieves one information's item
 
         :param key: the item string (ex: "help")
         """
-        return await self._impl_values.get_information(config_bag,
-                                                       option_bag,
+        return await self._impl_values.get_information(connection,
                                                        key,
                                                        default)
 
@@ -681,9 +635,6 @@ class _CommonConfig(SubConfig):
         duplicated_settings = duplicated_config.cfgimpl_get_settings()
         await duplicated_values._p_.importation(connection,
                                                 await self.cfgimpl_get_values()._p_.exportation(connection))
-        await duplicated_values._p_.importation_informations(connection,
-                                                             await self.cfgimpl_get_values()._p_.exportation_informations(connection),
-                                                             )
         properties = await self.cfgimpl_get_settings()._p_.exportation(connection)
         await duplicated_settings._p_.importation(connection,
                                                   properties)
@@ -1225,30 +1176,13 @@ class KernelMixConfig(KernelGroupConfig):
                          session_id,
                          type_='config',
                          storage=None,
+                         new=None,
                          ):
-        if session_id in [child.impl_getname() for child in self._impl_children]:
+        if new is None:
+            new = session_id not in await list_sessions()
+        if new and session_id in [child.impl_getname() for child in self._impl_children]:
             raise ConflictError(_('config name must be uniq in '
                                   'groupconfig for {0}').format(session_id))
-        return await self.load_config(connection,
-                                      session_id,
-                                      type_,
-                                      storage,
-                                      new=True,
-                                      )
-
-    async def load_config(self,
-                          connection,
-                          session_id,
-                          type_='config',
-                          storage=None,
-                          new=False,
-                          ):
-        if storage is None:
-            storage = self._storage
-        if not new:
-            if session_id not in await list_sessions(storage=storage):
-                raise ConfigError(_('cannot find existing config with session_id to "{}"').format(session_id))
-
         assert type_ in ('config', 'metaconfig', 'mixconfig'), _('unknown type {}').format(type_)
         if type_ == 'config':
             config = await KernelConfig(self._impl_descr,
@@ -1294,9 +1228,8 @@ class KernelMixConfig(KernelGroupConfig):
                          apiconfig):
         config = apiconfig._config_bag.context
         if config.impl_getname() in [child.impl_getname() for child in self._impl_children]:
-            raise ConflictError(_('config name "{0}" is not uniq in '
-                                  'groupconfig "{1}"').format(config.impl_getname(),
-                                                              self.impl_getname()))
+            raise ConflictError(_('config name must be uniq in '
+                                  'groupconfig for {0}').format(config.impl_getname()))
 
         config.parents.append(weakref.ref(self))
         self._impl_children.append(config)

tiramisu/error.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2012-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -20,8 +20,6 @@ from .i18n import _
 
 
 def display_list(lst, separator='and', add_quote=False):
-    if not lst:
-        return '""'
     if separator == 'and':
         separator = _('and')
     elif separator == 'or':

tiramisu/function.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2018-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -311,10 +311,7 @@ class CalcValue:
                                min_args_len)
         if not multi:
             if join is not None:
-                if None not in value:
-                    value = join.join(value)
-                else:
-                    value = None
+                value = join.join(value)
             elif value and operator:
                 new_value = value[0]
                 op = {'mul': mul,
@@ -333,39 +330,14 @@ class CalcValue:
                         value = value[index]
                     else:
                         value = None
-        else:
-            if join is not None:
-                if None not in value:
-                    length_val = None
-                    for val in value:
-                        if isinstance(val, list):
-                            if None in val:
-                                length_val = None
-                                break
-                            lval = len(val)
-                            if length_val is not None and length_val != lval:
-                                raise ValueError(_(f'unexpected value in calc_value with join attribute "{val}" with invalid length "{length_val}"'))
-                            length_val = lval
-                    new_value = []
-                    for idx in range(length_val):
-                        idx_val = []
-                        for val in value:
-                            if isinstance(val, list):
-                                idx_val.append(val[idx])
-                            else:
-                                idx_val.append(val)
-                        new_value.append(join.join(idx_val))
-                    value = new_value
-                else:
-                    value = []
-            elif None in value and not allow_none:
-                value = []
-            elif remove_duplicate_value:
-                new_value = []
-                for val in value:
-                    if val not in new_value:
-                        new_value.append(val)
-                value = new_value
+        elif None in value and not allow_none:
+            value = []
+        elif remove_duplicate_value:
+            new_value = []
+            for val in value:
+                if val not in new_value:
+                    new_value.append(val)
+            value = new_value
         return value
 
     def value_from_kwargs(self,
@@ -425,10 +397,7 @@ class CalcValue:
             for idx, calculated_condition in calculated_conditions.items():
                 if isinstance(calculated_expected, dict):
                     if idx is not None:
-                        if isinstance(calculated_expected[idx], list):
-                            current_matches = calculated_condition in calculated_expected[idx]
-                        else:
-                            current_matches = calculated_condition == calculated_expected[idx]
+                        current_matches = calculated_condition == calculated_expected[idx]
                     else:
                         current_matches = calculated_condition in calculated_expected.values()
                 else:

tiramisu/i18n.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (C) 2012-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2012-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -55,8 +55,7 @@ def get_translation() -> str:
         trans = translation(domain=app_name,
                             localedir=translations_path,
                             languages=[user_locale],
-                            )
-#                            codeset='UTF-8')
+                            codeset='UTF-8')
     except FileNotFoundError:
         log.debug('cannot found translation file for langage {} in localedir {}'.format(user_locale,
                                                                                         translations_path))

tiramisu/log.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "logger for tiramisu"
-# Copyright (C) 2019-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2019-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/baseoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2014-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -29,7 +29,7 @@ from ..i18n import _
 from ..setting import undefined, Settings
 from ..value import Values
 from ..error import ConfigError, display_list
-from ..autolib import Calculation, Params, ParamOption
+from ..autolib import Calculation, Params, ParamOption, ParamIndex
 
 STATIC_TUPLE = frozenset()
 
@@ -40,8 +40,6 @@ submulti = 2
 def valid_name(name):
     if not isinstance(name, str):
         return False
-#    if '.' in name:
-#        return False
     return True
 
 
@@ -57,7 +55,6 @@ class Base:
                  '_properties',
                  '_has_dependency',
                  '_dependencies',
-                 '_suffixes_dependencies',
                  '__weakref__'
                 )
 
@@ -75,9 +72,13 @@ class Base:
         if is_multi:
             # if option is a multi, it cannot be 'empty' (None not allowed in the list) and cannot have multiple time the same value
             # 'empty' and 'unique' are removed for follower's option
-            if 'notunique' not in properties:
+            if 'notunique' in properties:
+                properties = properties - {'notunique'}
+            else:
                 properties = properties | {'unique'}
-            if 'notempty' not in properties:
+            if 'notempty' in properties:
+                properties = properties - {'notempty'}
+            else:
                 properties = properties | {'empty'}
         assert isinstance(properties, frozenset), _('invalid properties type {0} for {1},'
                                                     ' must be a frozenset').format(type(properties),
@@ -102,29 +103,18 @@ class Base:
         return hasattr(self, '_dependencies')
 
     def _get_dependencies(self,
-                          context_od,
-                          ) -> Set[str]:
+                          context_od) -> Set[str]:
         ret = set(getattr(self, '_dependencies', STATIC_TUPLE))
         if context_od and hasattr(context_od, '_dependencies'):
-            # add options that have context is set in calculation
+            # if context is set in options, add those options
             return set(context_od._dependencies) | ret
         return ret
 
-    def _get_suffixes_dependencies(self) -> Set[str]:
-        return getattr(self, '_suffixes_dependencies', STATIC_TUPLE)
-
     def _add_dependency(self,
-                        option,
-                        is_suffix: bool=False,
-                        ) -> None:
-        woption = weakref.ref(option)
+                        option) -> None:
         options = self._get_dependencies(None)
         options.add(weakref.ref(option))
         self._dependencies = tuple(options)
-        if is_suffix:
-            options = list(self._get_suffixes_dependencies())
-            options.append(weakref.ref(option))
-            self._suffixes_dependencies = tuple(options)
 
     def _impl_set_callback(self,
                            callback: Callable,
@@ -280,36 +270,20 @@ class BaseOption(Base):
         return self.impl_get_callback()[0] is not None
 
     def _impl_get_display_name(self,
-                               dyn_name: Base=None,
-                               suffix: str=None,
-                               ) -> str:
+                               dyn_name: Base=None) -> str:
         name = self.impl_get_information('doc', None)
         if name is None or name == '':
             if dyn_name is not None:
                 name = dyn_name
             else:
                 name = self.impl_getname()
-        elif suffix:
-            name += suffix
         return name
 
-    def _get_display_name(self,
-                          dyn_name,
-                          suffix,
-                          ):
+    def impl_get_display_name(self,
+                              dyn_name: Base=None) -> str:
         if hasattr(self, '_display_name_function'):
-            return self._display_name_function(self,
-                                               dyn_name,
-                                               suffix,
-                                               )
-        return self._impl_get_display_name(dyn_name,
-                                           suffix,
-                                           )
-
-    def impl_get_display_name(self) -> str:
-        return self._get_display_name(None,
-                                      None,
-                                      )
+            return self._display_name_function(self, dyn_name)
+        return self._impl_get_display_name(dyn_name)
 
     def reset_cache(self,
                     path: str,

tiramisu/option/booloption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/broadcastoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/choiceoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -60,8 +60,8 @@ class ChoiceOption(Option):
         if isinstance(self._choice_values, Calculation):
             values = await self._choice_values.execute(option_bag)
             if values is not undefined and not isinstance(values, list):
-                raise ConfigError(_('the calculated values "{0}" for "{1}" is not a list'
-                                    '').format(values, self.impl_getname()))
+                raise ConfigError(_('calculated values for {0} is not a list'
+                                    '').format(self.impl_getname()))
         else:
             values = self._choice_values
         return values
@@ -76,18 +76,17 @@ class ChoiceOption(Option):
         if isinstance(self._choice_values, Calculation):
             return
         values = self._choice_values
-        self.validate_values(value, values)
-
-    async def validate_with_option(self,
-                                   value: Any,
-                                   option_bag: OptionBag) -> None:
-        values = await self.impl_get_values(option_bag)
-        self.validate_values(value, values)
-
-    def validate_values(self,
-                        value,
-                        values,
-                        ) -> None:
+        if values is not undefined and value not in values:
+            if len(values) == 1:
+                raise ValueError(_('only "{0}" is allowed'
+                                   '').format(values[0]))
+            raise ValueError(_('only {0} are allowed'
+                               '').format(display_list(values, add_quote=True)))
+
+    async def validate_with_option(self,
+                                   value: Any,
+                                   option_bag: OptionBag) -> None:
+        values = await self.impl_get_values(option_bag)
         if values is not undefined and value not in values:
             if len(values) == 1:
                 raise ValueError(_('only "{0}" is allowed'

tiramisu/option/dateoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/domainnameoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/dynoptiondescription.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -20,8 +20,6 @@
 # ____________________________________________________________
 import re
 from typing import List, Callable
-from itertools import chain
-from ..autolib import ParamOption
 
 
 from ..i18n import _
@@ -62,14 +60,8 @@ class DynOptionDescription(OptionDescription):
                                     'dynoptiondescription'))
             child._setsubdyn(self)
         # add suffixes
-        if __debug__ and not isinstance(suffixes, Calculation):
-            raise ConfigError(_('suffixes in dynoptiondescription has to be a calculation'))
-        for param in chain(suffixes.params.args, suffixes.params.kwargs.values()):
-            if isinstance(param, ParamOption):
-                param.option._add_dependency(self,
-                                             is_suffix=True,
-                                             )
-        self._suffixes = suffixes
+        if __debug__ and isinstance(suffixes, Calculation):
+            self._suffixes = suffixes
 
     def convert_suffix_to_path(self,
                                suffix):
@@ -82,8 +74,6 @@ class DynOptionDescription(OptionDescription):
                               None,
                               config_bag)
         values = await self._suffixes.execute(option_bag)
-        if values is None:
-            values = []
         if __debug__:
             if not isinstance(values, list):
                 raise ValueError(_('DynOptionDescription suffixes for option "{}", is not a list ({})'

tiramisu/option/emailoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/filenameoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -21,17 +21,11 @@
 import re
 
 from ..i18n import _
-from .stroption import StrOption
+from .stroption import RegexpOption
 
 
-class FilenameOption(StrOption):
+class FilenameOption(RegexpOption):
     __slots__ = tuple()
+    _regexp = re.compile(r"^[a-zA-Z0-9\-\._~/+]+$")
     _type = 'filename'
     _display_name = _('file name')
-
-    def validate(self,
-                 value: str,
-                 ) -> None:
-        super().validate(value)
-        if not value.startswith('/'):
-            raise ValueError(_('must starts with "/"'))

tiramisu/option/floatoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/intoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/ipoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -62,9 +62,7 @@ class IPOption(StrOption):
 
     def _validate_ip(self, value):
         try:
-            new_value = str(ip_address(value))
-            if value != new_value:
-                raise ValueError(f'should be {new_value}')
+            ip_address(value)
         except ValueError:
             raise ValueError()
 

tiramisu/option/leadership.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "Leadership support"
-# Copyright (C) 2014-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2014-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -69,21 +69,11 @@ class Leadership(OptionDescription):
                                                   child.impl_get_display_name()))
                 if idx != 0:
                     default = child.impl_getdefault()
-                    if default != []:
-                        if child.impl_is_submulti() and isinstance(default, tuple):
-                            for val in default:
-                                if not isinstance(val, Calculation):
-                                    calculation = False
-                            else:
-                                # empty default is valid
-                                calculation = True
-                        else:
-                            calculation = isinstance(default, Calculation)
-                        if not calculation:
-                            raise ValueError(_('not allowed default value for follower option "{0}" '
-                                               'in leadership "{1}"'
-                                               '').format(child.impl_get_display_name(),
-                                                          self.impl_get_display_name()))
+                    if default != [] and not isinstance(default, Calculation):
+                        raise ValueError(_('not allowed default value for follower option "{0}" '
+                                           'in leadership "{1}"'
+                                           '').format(child.impl_get_display_name(),
+                                                      self.impl_get_display_name()))
             if idx != 0:
                 # remove empty property for follower
                 child._properties = frozenset(child._properties - {'empty', 'unique'})

tiramisu/option/macoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2020-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/netmaskoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/networkoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/option.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "option types and option description"
-# Copyright (C) 2012-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2012-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -27,7 +27,7 @@ from itertools import chain
 from .baseoption import BaseOption, submulti, STATIC_TUPLE
 from ..i18n import _
 from ..setting import undefined, OptionBag, Undefined
-from ..autolib import Calculation, Params, ParamOption, ParamInformation, ParamSelfInformation
+from ..autolib import Calculation, Params, ParamValue, ParamOption
 from ..error import (ConfigError, ValueWarning, ValueErrorWarning, PropertiesOptionError,
                      ValueOptionError, display_list)
 from .syndynoption import SynDynOption
@@ -50,7 +50,6 @@ class Option(BaseOption):
                  #
                  '_validators',
                  #
-                 '_dependencies_information',
                  '_leadership',
                  '_choice_values',
                  '_choice_values_params',
@@ -67,7 +66,6 @@ class Option(BaseOption):
                  warnings_only: bool=False,
                  extra: Optional[Dict]=None):
         _setattr = object.__setattr__
-        _dependencies_information = [[], []]
         if not multi and default_multi is not None:
             raise ValueError(_("default_multi is set whereas multi is False"
                                " in option: {0}").format(name))
@@ -86,9 +84,7 @@ class Option(BaseOption):
             is_multi = True
             _multi = submulti
         else:
-            raise ValueError(_('invalid multi type "{}" for "{}"').format(multi,
-                                                                          name,
-                                                                          ))
+            raise ValueError(_('invalid multi type "{}"').format(multi))
         if _multi != 1:
             _setattr(self, '_multi', _multi)
         if multi is not False and default is None:
@@ -97,20 +93,17 @@ class Option(BaseOption):
                          doc,
                          properties=properties,
                          is_multi=is_multi)
-        if validators is not None:
-            if __debug__ and not isinstance(validators, list):
-                raise ValueError(_('validators must be a list of Calculation for "{}"').format(name))
-            for validator in validators:
-                if __debug__ and not isinstance(validator, Calculation):
-                    raise ValueError(_('validators must be a Calculation for "{}"').format(name))
-                for param in chain(validator.params.args, validator.params.kwargs.values()):
-                    if isinstance(param, ParamOption):
-                        param.option._add_dependency(self)
-                        self._has_dependency = True
-                    elif isinstance(param, ParamSelfInformation):
-                        _dependencies_information[1].append(param.information_name)
-                    elif isinstance(param, ParamInformation):
-                        _dependencies_information[0].append(param.information_name)
+        if __debug__:
+            if validators is not None:
+                if not isinstance(validators, list):
+                    raise ValueError(_('validators must be a list of Calculation for "{}"').format(name))
+                for validator in validators:
+                    if not isinstance(validator, Calculation):
+                        raise ValueError(_('validators must be a Calculation for "{}"').format(name))
+                    for param in chain(validator.params.args, validator.params.kwargs.values()):
+                        if isinstance(param, ParamOption):
+                            param.option._add_dependency(self)
+                            self._has_dependency = True
 
                 self._validators = tuple(validators)
         if extra is not None and extra != {}:
@@ -161,39 +154,29 @@ class Option(BaseOption):
         self.sync_impl_validate(default,
                                 option_bag,
                                 check_error=False)
-        self.value_dependencies(default, _dependencies_information)
+        self.value_dependencies(default)
         if (is_multi and default != []) or \
                 (not is_multi and default is not None):
             if is_multi and isinstance(default, list):
                 default = tuple(default)
             _setattr(self, '_default', default)
-        if _dependencies_information[0] or _dependencies_information[1]:
-            self._dependencies_information = _dependencies_information
 
     def value_dependencies(self,
-                           value: Any,
-                           _dependencies_information: List[str],
-                           ) -> Any:
+                           value: Any) -> Any:
         if isinstance(value, list):
             for val in value:
                 if isinstance(value, list):
-                    self.value_dependencies(val, _dependencies_information)
+                    self.value_dependencies(val)
                 elif isinstance(value, Calculation):
-                    self.value_dependency(val, _dependencies_information)
+                    self.value_dependency(val)
         elif isinstance(value, Calculation):
-            self.value_dependency(value, _dependencies_information)
+            self.value_dependency(value)
 
     def value_dependency(self,
-                         value: Any,
-                         _dependencies_information: List[str],
-                         ) -> Any:
+                         value: Any) -> Any:
         for param in chain(value.params.args, value.params.kwargs.values()):
             if isinstance(param, ParamOption):
                 param.option._add_dependency(self)
-            elif isinstance(param, ParamSelfInformation):
-                _dependencies_information[1].append(param.information_name)
-            elif isinstance(param, ParamInformation):
-                _dependencies_information[0].append(param.information_name)
 
     #__________________________________________________________________________
     # option's information
@@ -207,15 +190,6 @@ class Option(BaseOption):
     def impl_is_dynsymlinkoption(self) -> bool:
         return False
 
-    def get_dependencies_information(self,
-                                     itself=False,
-                                     ) -> List[str]:
-        if itself:
-            idx = 1
-        else:
-            idx = 0
-        return getattr(self, '_dependencies_information', [[], []])[idx]
-
     def get_type(self) -> str:
         # _display_name for compatibility with older version than 3.0rc3
         return getattr(self, '_type', self._display_name)
@@ -333,8 +307,7 @@ class Option(BaseOption):
                             value: Any,
                             option_bag: OptionBag,
                             check_error: bool=True) -> None:
-        """Return True if value is really valid
-        If not validate or invalid return it returns False
+        """
         """
         config_bag = option_bag.config_bag
         force_index = option_bag.index
@@ -342,7 +315,7 @@ class Option(BaseOption):
 
         if check_error and config_bag is not undefined and \
                 not 'validator' in config_bag.properties:
-            return False
+            return
 
 
         def _is_not_unique(value, option_bag):
@@ -363,9 +336,7 @@ class Option(BaseOption):
                 if ((check_error and not calc_is_warnings_only) or
                         (not check_error and calc_is_warnings_only)):
                     try:
-                        kwargs = {'allow_value_error': True,
-                                  'force_value_warning': calc_is_warnings_only,
-                                  }
+                        kwargs = {'allow_raises': True}
                         if _index is not None and option_bag.index == _index:
                             soption_bag = option_bag
                         else:
@@ -376,6 +347,17 @@ class Option(BaseOption):
                         await validator.execute(soption_bag,
                                                 leadership_must_have_index=True,
                                                 **kwargs)
+                    except ValueError as err:
+                        if calc_is_warnings_only:
+                            warnings.warn_explicit(ValueWarning(val,
+                                                                self._display_name,
+                                                                self,
+                                                                '{0}'.format(err),
+                                                                _index),
+                                                   ValueWarning,
+                                                   self.__class__.__name__, 306)
+                        else:
+                            raise err
                     except ValueWarning as warn:
                         warnings.warn_explicit(ValueWarning(val,
                                                             self._display_name,
@@ -383,7 +365,7 @@ class Option(BaseOption):
                                                             '{0}'.format(warn),
                                                             _index),
                                                ValueWarning,
-                                               self.__class__.__name__, 356)
+                                               self.__class__.__name__, 316)
 
         async def do_validation(_value,
                                 _index):
@@ -391,7 +373,7 @@ class Option(BaseOption):
                 raise ValueError(_('which must not be a list').format(_value,
                                                                       self.impl_get_display_name()))
             if isinstance(_value, Calculation) and config_bag is undefined:
-                return False
+                return
             if _value is not None:
                 if check_error:
                     # option validation
@@ -460,7 +442,7 @@ class Option(BaseOption):
                                        self._display_name,
                                        option_bag.ori_option,
                                        '{0}'.format(err),
-                                       err_index) from err
+                                       err_index)
             warnings.warn_explicit(ValueErrorWarning(val,
                                                      self._display_name,
                                                      option_bag.ori_option,
@@ -468,8 +450,6 @@ class Option(BaseOption):
                                                      err_index),
                                    ValueErrorWarning,
                                    self.__class__.__name__, 0)
-            return False
-        return True
 
     def _validate_calculator(self,
                             callback: Callable,

tiramisu/option/optiondescription.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2014-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -30,9 +30,7 @@ from ..error import ConfigError, ConflictError
 
 
 class CacheOptionDescription(BaseOption):
-    __slots__ = ('_cache_force_store_values',
-                 '_cache_dependencies_information',
-                 )
+    __slots__ = ('_cache_force_store_values',)
 
     def impl_already_build_caches(self) -> bool:
         return self.impl_is_readonly()
@@ -44,9 +42,7 @@ class CacheOptionDescription(BaseOption):
                            currpath: List[str]=None,
                            cache_option=None,
                            force_store_values=None,
-                           dependencies_information=None,
-                           display_name=None,
-                           ) -> None:
+                           display_name=None) -> None:
         """validate options and set option has readonly option
         """
         # _consistencies is None only when we start to build cache
@@ -56,7 +52,6 @@ class CacheOptionDescription(BaseOption):
             if __debug__:
                 cache_option = []
             force_store_values = []
-            dependencies_information = {}
             currpath = []
         else:
             init = False
@@ -78,15 +73,17 @@ class CacheOptionDescription(BaseOption):
                                           sub_currpath,
                                           cache_option,
                                           force_store_values,
-                                          dependencies_information,
                                           display_name)
             else:
-                for information in option.get_dependencies_information():
-                    dependencies_information.setdefault(information, []).append(option)
                 is_multi = option.impl_is_multi()
                 if not option.impl_is_symlinkoption():
                     properties = option.impl_getproperties()
                     if 'force_store_value' in properties:
+                        if __debug__:
+                            if option.issubdyn():
+                                raise ConfigError(_('the dynoption "{0}" cannot have '
+                                                    '"force_store_value" property').format(
+                                                        option.impl_get_display_name()))
                         force_store_values.append((subpath, option))
                     if __debug__ and ('force_default_on_freeze' in properties or \
                             'force_metaconfig_on_freeze' in properties) and \
@@ -105,13 +102,11 @@ class CacheOptionDescription(BaseOption):
             option._set_readonly()
         if init:
             self._cache_force_store_values = force_store_values
-            self._cache_dependencies_information = dependencies_information
             self._path = self._name
             self._set_readonly()
 
     async def impl_build_force_store_values(self,
-                                            config_bag: ConfigBag,
-                                            ) -> None:
+                                            config_bag: ConfigBag) -> None:
         if 'force_store_value' not in config_bag.properties:
             return
         values = config_bag.context.cfgimpl_get_values()
@@ -139,37 +134,17 @@ class CacheOptionDescription(BaseOption):
                                                   index,
                                                   False)
                 else:
-                    option_bags = []
-                    if option.issubdyn():
-                        dynopt = option.getsubdyn()
-                        rootpath = dynopt.impl_getpath()
-                        subpaths = [rootpath] + option.impl_getpath()[len(rootpath) + 1:].split('.')[1:]
-                        for suffix in await dynopt.get_suffixes(config_bag):
-                            path_suffix = dynopt.convert_suffix_to_path(suffix)
-                            subpath = '.'.join([subp + path_suffix for subp in subpaths])
-                            doption = option.to_dynoption(subpath,
-                                                          suffix,
-                                                          option)
-                            doption_bag = OptionBag()
-                            doption_bag.set_option(doption,
-                                                   None,
-                                                   config_bag)
-                            option_bags.append(doption_bag)
-                    else:
-                        option_bag = OptionBag()
-                        option_bag.set_option(option,
+                    option_bag = OptionBag()
+                    option_bag.set_option(option,
+                                          None,
+                                          config_bag)
+                    option_bag.properties = frozenset()
+                    await values._p_.setvalue(config_bag.connection,
+                                              subpath,
+                                              await values.getvalue(option_bag),
+                                              owners.forced,
                                               None,
-                                              config_bag)
-                        option_bags.append(option_bag)
-                    for option_bag in option_bags:
-                        option_bag.properties = frozenset()
-                        await values._p_.setvalue(config_bag.connection,
-                                                  option_bag.path,
-                                                  await values.getvalue(option_bag),
-                                                  owners.forced,
-                                                  None,
-                                                  False,
-                                                  )
+                                              False)
 
 
 class OptionDescriptionWalk(CacheOptionDescription):
@@ -203,8 +178,7 @@ class OptionDescriptionWalk(CacheOptionDescription):
 
     async def get_children(self,
                            config_bag: Union[ConfigBag, Undefined],
-                           dyn: bool=True,
-                           ) -> Union[BaseOption, SynDynOptionDescription]:
+                           dyn: bool=True) -> Union[BaseOption, SynDynOptionDescription]:
         if not dyn or config_bag is undefined or \
                 config_bag.context.cfgimpl_get_description() == self:
             subpath = ''

tiramisu/option/passwordoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/portoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/stroption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/symlinkoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/syndynoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2018-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2018-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -59,9 +59,7 @@ class SynDynOption:
         return self.opt.impl_getname() + self.suffix
 
     def impl_get_display_name(self) -> str:
-        return self.opt._get_display_name(dyn_name=self.impl_getname(),
-                                          suffix=self.suffix,
-                                          )
+        return self.opt.impl_get_display_name(dyn_name=self.impl_getname()) + self.suffix
 
     def impl_getsuffix(self) -> str:
         return self.suffix

tiramisu/option/syndynoptiondescription.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -84,8 +84,7 @@ class SynDynOptionDescription:
 
     async def get_children(self,
                            config_bag: ConfigBag,
-                           dyn: bool=True,
-                           ):
+                           dyn: bool=True):
         subpath = self.impl_getpath()
         children = []
         for child in await self._opt.get_children(config_bag):

tiramisu/option/urloption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/option/usernameoption.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2017-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/setting.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "sets the options of the configuration objects Config object itself"
-# Copyright (C) 2012-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2012-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -117,7 +117,6 @@ FORBIDDEN_SET_PERMISSIVES = frozenset(['force_default_on_freeze',
                                        'force_metaconfig_on_freeze',
                                        'force_store_value'])
 ALLOWED_LEADER_PROPERTIES = frozenset(['empty',
-                                       'notunique',
                                        'unique',
                                        'force_store_value',
                                        'mandatory',
@@ -459,14 +458,10 @@ class Settings(object):
                 elif apply_requires:
                     if not help_property:
                         new_prop = await prop.execute(option_bag,
-                                                      leadership_must_have_index=True,
-                                                      for_settings=True,
-                                                      )
+                                                      leadership_must_have_index=True)
                     else:
                         new_prop = await prop.help(option_bag,
-                                                   leadership_must_have_index=True,
-                                                   for_settings=True,
-                                                   )
+                                                   leadership_must_have_index=True)
                         if isinstance(new_prop, str):
                             new_prop = (new_prop, new_prop)
                     if new_prop is None:

tiramisu/storage/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/cache/dictionary.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2018-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2018-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/cacheobj.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "cache used by storage"
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/dictionary/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/dictionary/setting.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "default plugin for setting: set it in a simple dictionary"
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/dictionary/storage.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/dictionary/value.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "default plugin for value: set it in a simple dictionary"
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -25,11 +25,14 @@ from copy import deepcopy
 
 class Values:
     __slots__ = ('_values',
+                 '_informations',
                  '_storage',
                  '__weakref__')
     def __init__(self, storage):
         """init plugin means create values storage
         """
+        #self._values = ([], [], [], [])
+        #self._informations = {}
         self._storage = storage
 
     def _setvalue_info(self, nb, idx, value, index, follower_idx=None):
@@ -257,12 +260,16 @@ class Values:
                               connection,
                               path,
                               key,
-                              ):
+                              default):
         """retrieves one information's item
 
         :param key: the item string (ex: "help")
         """
-        return self._storage.get_informations().get(path, {})[key]
+        value = self._storage.get_informations().get(path, {}).get(key, default)
+        if value is undefined:
+            raise ValueError(_("information's item"
+                               " not found: {0}").format(key))
+        return value
 
     async def del_information(self,
                               connection,
@@ -289,18 +296,6 @@ class Values:
                                connection):
         self._storage.set_informations({})
 
-    async def exportation_informations(self,
-                                       connection,
-                                       ):
-        return deepcopy(self._storage.get_informations())
-
-    async def importation_informations(self,
-                                       connection,
-                                       informations,
-                                       ):
-        #deepcopy(informations)
-        return self._storage.set_informations(informations)
-
     async def exportation(self,
                           connection):
         return deepcopy(self._storage.get_values())

tiramisu/storage/postgres/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2020-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/postgres/setting.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "default plugin for setting: set it in a simple dictionary"
-# Copyright (C) 2020-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/postgres/storage.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2020-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/postgres/value.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2020-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -186,7 +186,7 @@ class Values:
                               connection,
                               path,
                               key,
-                              ):
+                              default):
         """retrieves one information's item
 
         :param key: the item string (ex: "help")
@@ -197,8 +197,12 @@ class Values:
                                           "session_id = $2 AND path = $3",
                                           key, self._storage.database_id, path)
         if value is None:
-            raise KeyError()
-        return loads(value)
+            if default is undefined:
+                raise ValueError(_("information's item"
+                                   " not found: {0}").format(key))
+            return default
+        else:
+            return loads(value)
 
     async def del_information(self,
                               connection,
@@ -227,26 +231,6 @@ class Values:
         await connection.execute("DELETE FROM information WHERE session_id = $1",
                                  self._storage.database_id)
 
-    async def exportation_informations(self,
-                                       connection,
-                                       ):
-        informations = {}
-        for path, key, value in await connection.fetch("SELECT path, key, value FROM information WHERE session_id = $1", self._storage.database_id):
-            path = self._storage.load_path(path)
-            informations.setdefault(path, {})[key] = loads(value)
-        return informations
-
-    async def importation_informations(self,
-                                       connection,
-                                       informations,
-                                       ):
-        await self.del_informations(connection)
-        for path, path_infos in informations.items():
-            path = self._storage.convert_path(path)
-            for key, value in path_infos.items():
-                await connection.execute("INSERT INTO information(key, value, session_id, path) VALUES "
-                                         "($1, $2, $3, $4)", key, dumps(value), self._storage.database_id, path)
-
     async def exportation(self,
                           connection):
         # log.debug('exportation')

tiramisu/storage/sqlite3/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/sqlite3/setting.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "default plugin for setting: set it in a simple dictionary"
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/sqlite3/sqlite3db.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "sqlite3"
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/sqlite3/storage.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 " with sqlite3 engine"
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/storage/sqlite3/value.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "default plugin for value: set it in a simple dictionary"
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the

tiramisu/value.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 "takes care of the option's values and multi values"
-# Copyright (C) 2013-2021 Team tiramisu (see AUTHORS for all contributors)
+# Copyright (C) 2013-2020 Team tiramisu (see AUTHORS for all contributors)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by the
@@ -57,12 +57,11 @@ class Values:
                                     None,
                                     new=True)
 
-
     #______________________________________________________________________
     # get value
+
     async def get_cached_value(self,
-                               option_bag: OptionBag,
-                               ) -> Any:
+                               option_bag):
         """get value directly in cache if set
         otherwise calculated value and set it in cache
 
@@ -76,34 +75,31 @@ class Values:
                                                      option_bag.index,
                                                      setting_properties,
                                                      option_bag.properties,
-                                                     'value',
-                                                     )
-        # no cached value so get value
-        if not is_cached:
-            value = await self.getvalue(option_bag)
-        # validates and warns value
+                                                     'value')
         if not validated:
-            validate = await option_bag.option.impl_validate(value,
-                                                             option_bag,
-                                                             check_error=True,
-                                                             )
+            # no cached value so get value
+            value = await self.getvalue(option_bag)
+            # validate value
+            await option_bag.option.impl_validate(value,
+                                                  option_bag,
+                                                  check_error=True)
+            # store value in cache
+            validator = 'validator' in setting_properties and 'demoting_error_warning' not in setting_properties
+            if not is_cached or validator:
+                cache.setcache(option_bag.path,
+                               option_bag.index,
+                               value,
+                               option_bag.properties,
+                               setting_properties,
+                               validator)
         if 'warnings' in setting_properties:
             await option_bag.option.impl_validate(value,
                                                   option_bag,
-                                                  check_error=False,
-                                                  )
-        # set value to cache
-        if not is_cached:
-            cache.setcache(option_bag.path,
-                           option_bag.index,
-                           value,
-                           option_bag.properties,
-                           setting_properties,
-                           validate,
-                           )
+                                                  check_error=False)
         if isinstance(value, list):
             # return a copy, so value cannot be modified
-            value = value.copy()
+            from copy import copy
+            value = copy(value)
         # and return it
         return value
 
@@ -173,7 +169,8 @@ class Values:
                          value,
                          reset_cache=True):
         if isinstance(value, Calculation):
-            value = await value.execute(option_bag)
+            value = await value.execute(option_bag,
+                                        leadership_must_have_index=True)
         elif isinstance(value, (list, tuple)):
             value = await self._do_value_list(value, option_bag)
         if reset_cache:
@@ -201,27 +198,15 @@ class Values:
         # now try to get default value:
         value = await self.calc_value(option_bag,
                                       option_bag.option.impl_getdefault())
-        if option_bag.index is not None and isinstance(value, (list, tuple)):
-            if value and option_bag.option.impl_is_submulti():
-                # first index is a list, assume other data are list too
-                if isinstance(value[0], list):
-                    # if index, must return good value for this index
-                    if len(value) > option_bag.index:
-                        value = value[option_bag.index]
-                    else:
-                        # no value for this index, retrieve default multi value
-                        # default_multi is already a list for submulti
-                        value = await self.calc_value(option_bag,
-                                                      option_bag.option.impl_getdefault_multi())
-            elif option_bag.option.impl_is_multi():
-                # if index, must return good value for this index
-                if len(value) > option_bag.index:
-                    value = value[option_bag.index]
-                else:
-                    # no value for this index, retrieve default multi value
-                    # default_multi is already a list for submulti
-                    value = await self.calc_value(option_bag,
-                                            option_bag.option.impl_getdefault_multi())
+        if option_bag.option.impl_is_multi() and option_bag.index is not None and isinstance(value, (list, tuple)):
+            # if index, must return good value for this index
+            if len(value) > option_bag.index:
+                value = value[option_bag.index]
+            else:
+                # no value for this index, retrieve default multi value
+                # default_multi is already a list for submulti
+                value = await self.calc_value(option_bag,
+                                        option_bag.option.impl_getdefault_multi())
         return value
 
     async def calculate_reset_cache(self,
@@ -242,12 +227,9 @@ class Values:
             return
         # calculated value is a new value, so reset cache
         await option_bag.config_bag.context.cfgimpl_reset_cache(option_bag)
-        # and manage force_store_value
-        await self._set_force_value_suffix(option_bag)
 
     async def calculate_value(self,
-                              option_bag: OptionBag,
-                              ) -> Any:
+                              option_bag: OptionBag) -> Any:
 
         # if value has callback, calculate value
         callback, callback_params = option_bag.option.impl_get_callback()
@@ -363,58 +345,15 @@ class Values:
                                     check_error=False)
 
     async def _setvalue(self,
-                        option_bag: OptionBag,
-                        value: Any,
-                        owner: str,
-                        ) -> None:
+                        option_bag,
+                        value,
+                        owner):
         await option_bag.config_bag.context.cfgimpl_reset_cache(option_bag)
         await self._p_.setvalue(option_bag.config_bag.connection,
                                 option_bag.path,
                                 value,
                                 owner,
                                 option_bag.index)
-        await self._set_force_value_suffix(option_bag)
-
-    async def _set_force_value_suffix(self,
-                                      option_bag: OptionBag,
-                                      ) -> None:
-        if 'force_store_value' not in option_bag.config_bag.properties:
-            return
-        for woption in option_bag.option._get_suffixes_dependencies():
-            option = woption()
-            force_store_options = []
-            async for coption in option.get_children_recursively(None,
-                                                                 None,
-                                                                 option_bag.config_bag,
-                                                                 ):
-                if 'force_store_value' in coption.impl_getproperties():
-                    force_store_options.append(coption)
-            if not force_store_options:
-                continue
-            rootpath = option.impl_getpath()
-            settings = option_bag.config_bag.context.cfgimpl_get_settings()
-            for suffix in await option.get_suffixes(option_bag.config_bag):
-                for coption in force_store_options:
-                    subpaths = [rootpath] + coption.impl_getpath()[len(rootpath) + 1:].split('.')[:-1]
-                    path_suffix = option.convert_suffix_to_path(suffix)
-                    subpath = '.'.join([subp + path_suffix for subp in subpaths])
-                    doption = coption.to_dynoption(subpath,
-                                                   suffix,
-                                                   coption,
-                                                   )
-                    coption_bag = OptionBag()
-                    coption_bag.set_option(doption,
-                                           None,
-                                           option_bag.config_bag,
-                                           )
-                    coption_bag.properties = await settings.getproperties(coption_bag)
-                    await self._p_.setvalue(coption_bag.config_bag.connection,
-                                            coption_bag.path,
-                                            await self.getvalue(coption_bag),
-                                            owners.forced,
-                                            None,
-                                            False,
-                                            )
 
     async def _get_modified_parent(self,
                                    option_bag: OptionBag) -> Optional[OptionBag]:
@@ -631,53 +570,33 @@ class Values:
     # information
 
     async def set_information(self,
-                              config_bag,
-                              option_bag,
+                              connection,
                               key,
                               value,
-                              ):
+                              path=None):
         """updates the information's attribute
 
         :param key: information's key (ex: "help", "doc"
         :param value: information's value (ex: "the help string")
         """
-        if option_bag is None:
-            path = None
-        else:
-            path = option_bag.path
-        await self._p_.set_information(config_bag.connection,
+        await self._p_.set_information(connection,
                                        path,
                                        key,
                                        value)
-        if path is not None:
-            for option in option_bag.option.get_dependencies_information(itself=True):
-                await config_bag.context.cfgimpl_reset_cache(option_bag)
 
     async def get_information(self,
-                              config_bag,
-                              option_bag,
+                              connection,
                               key,
-                              default,
-                              ):
+                              default=undefined,
+                              path=None):
         """retrieves one information's item
 
         :param key: the item string (ex: "help")
         """
-        if option_bag is None:
-            path = None
-        else:
-            path = option_bag.path
-        try:
-            return await self._p_.get_information(config_bag.connection,
-                                                  path,
-                                                  key,
-                                                  )
-        except KeyError as err:
-            if option_bag:
-                return option_bag.option.impl_get_information(key, default)
-            if default is not undefined:
-                return default
-            raise ValueError(_("information's item not found: {0}").format(key))
+        return await self._p_.get_information(connection,
+                                              path,
+                                              key,
+                                              default)
 
     async def del_information(self,
                               connection,