Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-managesieve for
openSUSE:Factory checked in at 2021-10-16 22:47:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-managesieve (Old)
and /work/SRC/openSUSE:Factory/.python-managesieve.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-managesieve"
Sat Oct 16 22:47:11 2021 rev:18 rq:925622 version:0.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-managesieve/python-managesieve.changes
2020-05-26 17:23:21.128494868 +0200
+++
/work/SRC/openSUSE:Factory/.python-managesieve.new.1890/python-managesieve.changes
2021-10-16 22:47:47.096699235 +0200
@@ -1,0 +2,21 @@
+Thu Sep 2 11:56:34 UTC 2021 - pgaj...@suse.com
+
+- version update to 0.7.1
+ 0.7.1 (2021-03-11)
+ ------------------
+ :managesieve:
+ - Actually raise debug-only exceptions instead of jsut returning them.
+ - Fix invalid string-escape in docstring.
+ - Some minor clean-up.
+ :sieveshell:
+ - Some minor clean-up.
+ 0.7 (2021-03-05)
+ ----------------
+ :sieveshell:
+ - For ``get`` and ``put`` expand ``~`` and ``~user`` constructions in
+ `filename` . For ``put``, if script-name is not given, the file's
+ basename is used.
+ :managesieve:
+ - Fix error when constructing debug error message.
+
+-------------------------------------------------------------------
Old:
----
managesieve-v0.6.tar.bz2
New:
----
managesieve-v0.7.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-managesieve.spec ++++++
--- /var/tmp/diff_new_pack.lyLDfD/_old 2021-10-16 22:47:47.512699586 +0200
+++ /var/tmp/diff_new_pack.lyLDfD/_new 2021-10-16 22:47:47.512699586 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-managesieve
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2009 Guido Berhoerster.
#
# All modifications and additions to the file contributed by third parties
@@ -20,7 +20,7 @@
%define oname managesieve
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-managesieve
-Version: 0.6
+Version: 0.7.1
Release: 0
Summary: Python Module Implementing the ManageSieve Protocol
License: GPL-3.0-or-later AND Python-2.0
@@ -28,11 +28,11 @@
URL: https://managesieve.readthedocs.io/
Source:
https://gitlab.com/htgoebel/managesieve/-/archive/v%{version}/managesieve-v%{version}.tar.bz2
BuildRequires: %{python_module devel}
-BuildRequires: %{python_module pytest-runner}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: python-rpm-macros
Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
# provides same binary: /usr/bin/sieveshell
Conflicts: perl-Cyrus-SIEVE-managesieve
BuildArch: noarch
@@ -45,7 +45,6 @@
%prep
%setup -q -n %{oname}-v%{version}
touch test/__init__.py
-
# Fix URL
sed -i 's|http://packages.python.org/managesieve|%{url}|' setup.py
@@ -57,7 +56,7 @@
%python_clone -a %{buildroot}%{_bindir}/sieveshell
%check
-%python_exec setup.py test -v
+%pytest
%post
%python_install_alternative sieveshell
++++++ managesieve-v0.6.tar.bz2 -> managesieve-v0.7.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/HISTORY
new/managesieve-v0.7.1/HISTORY
--- old/managesieve-v0.6/HISTORY 2018-06-27 09:54:56.000000000 +0200
+++ new/managesieve-v0.7.1/HISTORY 2021-03-11 20:58:41.000000000 +0100
@@ -1,3 +1,32 @@
+0.7.1 (2021-03-11)
+------------------
+
+Author: Hartmut Goebel, Thanks to Wouter Bolsterlee.
+
+:managesieve:
+ - Actually raise debug-only exceptions instead of jsut returning them.
+ - Fix invalid string-escape in docstring.
+ - Some minor clean-up.
+
+:sieveshell:
+ - Some minor clean-up.
+
+
+0.7 (2021-03-05)
+----------------
+
+Author: Hartmut Goebel
+
+:sieveshell:
+
+ - For ``get`` and ``put`` expand ``~`` and ``~user`` constructions in
+ `filename` . For ``put``, if script-name is not given, the file's
+ basename is used.
+
+:managesieve:
+ - Fix error when constructing debug error message.
+
+
0.6 (2018-06-27)
----------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/LICENSE
new/managesieve-v0.7.1/LICENSE
--- old/managesieve-v0.6/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ new/managesieve-v0.7.1/LICENSE 2021-03-11 20:58:41.000000000 +0100
@@ -0,0 +1,735 @@
+
+:License for `managesieve`: PSF-like License
+SPDX-License-Identifier: Python-2.0-like
+
+:License for 'sieveshell' and test suite: GPL v3
+SPDX-License-Identifier: GPL-3.0-only
+
+=======================================
+PSF-like License
+=======================================
+
+Based on the "Python Software Foundation License"
+<https://opensource.org/licenses/PythonSoftFoundation.html>
+
+1. This LICENSE AGREEMENT is between the "Managesieve" authors ("Authors"),
+ and the Individual or Organization ("Licensee") accessing and otherwise
+ using this software ("Managesieve") in source or binary form and its
+ associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, Authors
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide license to
+ reproduce, analyze, test, perform and/or display publicly, prepare
+ derivative works, distribute, and otherwise use Managesieve alone or in any
+ derivative version, provided, however, that Authors's License Agreement and
+ Authors's notice of copyright, i.e., "Copyright (c) 2001-2021 Hartmut
+ Goebel; All Rights Reserved" are retained in the software alone or in any
+ derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on or
+ incorporates Managesieve or any part thereof, and wants to make the
+ derivative work available to others as provided herein, then Licensee
+ hereby agrees to include in any such work a brief summary of the changes
+ made to Managesieve.
+
+4. Authors is making Managesieve available to Licensee on an "AS IS" basis.
+ Authors MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
+ OF EXAMPLE, BUT NOT LIMITATION, AUTHORS MAKES NO AND DISCLAIMS ANY
+ REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+ PURPOSE OR THAT THE USE OF MANAGESIEVE WILL NOT INFRINGE ANY THIRD PARTY
+ RIGHTS.
+
+5. AUTHORS SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MANAGESIEVE
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT
+ OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING MANAGESIEVE, OR ANY
+ DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material breach
+ of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between Authors and
+ Licensee. This License Agreement does not grant permission to use Authors
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Managesieve, Licensee agrees to
+ be bound by the terms and conditions of this License Agreement
+
+
+=========================================================================
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 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 General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is 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. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ 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.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ 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 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. Use with the GNU Affero General Public License.
+
+ 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 Affero 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 special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 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 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 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 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 General Public License for more details.
+
+ You should have received a copy of the GNU 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 the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ 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 GPL, see
+<https://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/MANIFEST.in
new/managesieve-v0.7.1/MANIFEST.in
--- old/managesieve-v0.6/MANIFEST.in 2018-06-27 09:54:56.000000000 +0200
+++ new/managesieve-v0.7.1/MANIFEST.in 2021-03-11 20:58:41.000000000 +0100
@@ -1,6 +1,7 @@
recursive-include docs *
prune docs/_build
include HISTORY
+include LICENSE
exclude projectlogo.*
exclude .gitignore .gitattributes .dir-locals.el
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/README.txt
new/managesieve-v0.7.1/README.txt
--- old/managesieve-v0.6/README.txt 2018-06-27 09:54:56.000000000 +0200
+++ new/managesieve-v0.7.1/README.txt 2021-03-11 20:58:41.000000000 +0100
@@ -7,8 +7,8 @@
-------------------------------------------------------------------------------------------------------------------------------------
:Author: Hartmut Goebel <h.goe...@crazy-compiler.com>
-:Version: 0.6
-:Copyright: 2003-2018 by Hartmut Goebel
+:Version: 0.7.1
+:Copyright: 2003-2021 by Hartmut Goebel
:Licence: Python Software Foundation License and
GNU Public Licence v3 (GPLv3)
:Homepage: https://managesieve.readthedocs.io/
@@ -27,30 +27,22 @@
'sieveshell'.
-Changes since 0.5
+Changes since 0.6
~~~~~~~~~~~~~~~~~~~~~
-* Add support for Python 3. Minimum required Python version is now
- Python 2.7.
-* Homepage is now hosted at https://managesieve.readthedocs.io/
-* Documentation is extended and includes API documentation.
+* Minimum required Python version is now Python 3.6.
:sieveshell:
- - Security fix: No longer leak environment variable SIEVE_PASSWORD
- when displaying usage help.
- - Per default enforce secure transport. Suggested by Jan Zerebecki.
- - Add possibility to use username/password from the .netrc file.
- The order is: command line options -> environment variables ->
- .netrc file -> ask user. Thanks to Gr??goire D??trez.
+ - For ``get`` and ``put`` expand ``~`` and ``~user`` constructions in
+ `filename` . For ``put``, if script-name is not given, the file's
+ basename is used.
+ - Some minor clean-up.
:managesieve:
- - Fail if TLS is requested, but server doesn't support TLS.
- Suggested by Jan Zerebecki.
-
-:project:
- - Rework and enhance test-suite. Thanks to Mat??j Cepl for nudging
- to proper pytest integration.
- - Lots if internal cleanup.
+ - Fix error when constructing debug error message.
+ - Actually raise debug-only exceptions instead of jsut returning them.
+ - Fix invalid string-escape in docstring.
+ - Some minor clean-up.
Requirements and Installation
@@ -76,11 +68,10 @@
Copyright and License
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:Copyright: (C) 2003-2018 by Hartmut Goebel <h.goe...@crazy-compilers.com>
+:Copyright: (C) 2003-2021 by Hartmut Goebel <h.goe...@crazy-compilers.com>
:License for `managesieve`:
- `Python Software Foundation License
- <https://opensource.org/licenses/PythonSoftFoundation.html>`_
+ PSF-like License, see enclosed file
:License for 'sieveshell' and test suite: `GPL v3
<https://opensource.org/licenses/GPL-3.0>`_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/_zest_release_hooks.py
new/managesieve-v0.7.1/_zest_release_hooks.py
--- old/managesieve-v0.6/_zest_release_hooks.py 1970-01-01 01:00:00.000000000
+0100
+++ new/managesieve-v0.7.1/_zest_release_hooks.py 2021-03-11
20:58:41.000000000 +0100
@@ -0,0 +1,59 @@
+# Copyright 2020-2021 Hartmut Goebel <h.goe...@crazy-compilers.com>
+# This file is licensed under the
+# GNU Affero General Public License v3 or later (AGPLv3+)
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+import glob
+import os
+import shutil
+import subprocess
+import sys
+import zest.releaser.utils
+
+
+def sign_release(data):
+ "Sign the archive that will be uploaded to PYPI."
+ # zest.releaser does a clean checkout where it generates tgz/zip in 'dist'
+ # directory and those files will be then uploaded to pypi.
+ dist_dir = os.path.join(data['tagdir'], 'dist')
+ cmd = ['gpg', '--detach-sign', '--armor']
+ codesigning_id = os.getenv("CODESIGNING_ID")
+ if not codesigning_id:
+ rc, codesigning_id = subprocess.getstatusoutput(
+ "git config --get user.signingkey")
+ if rc:
+ raise SystemExit(f"ERROR in sign_release hook: {codesigning_id}")
+ codesigning_id = None
+ if codesigning_id:
+ print("Using gpg identity", codesigning_id, "for signing.")
+ print()
+ cmd.extend(['--local-user', codesigning_id])
+ # Sign all files in the 'dist' directory.
+ for f in list(os.listdir(dist_dir)):
+ f = os.path.join(dist_dir, f)
+ print('Signing file %s' % f)
+ subprocess.run(cmd + [f])
+
+
+def run_twine_check(data):
+ import twine.cli
+ dist_dir = os.path.join(data['tagdir'], 'dist')
+ dist_files = list(glob.glob(os.path.join(dist_dir, "*")))
+ twine.cli.dispatch(["check"] + dist_files)
+
+
+def safe_dist_files(data):
+ repo_dist_dir = os.path.join(data['reporoot'], 'dist')
+ dist_dir = os.path.join(data['tagdir'], 'dist')
+ dist_files = glob.glob(os.path.join(dist_dir, "*"))
+ for fn in sorted(os.listdir(dist_dir)):
+ src = os.path.join(dist_dir, fn)
+ dest = os.path.join(repo_dist_dir, fn)
+ if (os.path.exists(dest) and
+ not zest.releaser.utils.ask("Overwrite dist/%s" % fn,
+ default=True)):
+ # skip this file
+ print("Skipping", fn)
+ continue
+ print("Saving", fn)
+ shutil.copy2(src, dest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/docs/conf.py
new/managesieve-v0.7.1/docs/conf.py
--- old/managesieve-v0.6/docs/conf.py 2018-06-27 09:54:56.000000000 +0200
+++ new/managesieve-v0.7.1/docs/conf.py 2021-03-11 20:58:41.000000000 +0100
@@ -48,16 +48,16 @@
# General information about the project.
project = u'managesieve'
-copyright = u'2003-2018 by Hartmut Goebel'
+copyright = u'2003-2021 by Hartmut Goebel'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '0.6'
+version = '0.7'
# The full version, including alpha/beta/rc tags.
-release = '0.6'
+release = '0.7.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/managesieve.py
new/managesieve-v0.7.1/managesieve.py
--- old/managesieve-v0.6/managesieve.py 2018-06-27 09:54:56.000000000 +0200
+++ new/managesieve-v0.7.1/managesieve.py 2021-03-11 20:58:41.000000000
+0100
@@ -1,4 +1,5 @@
# -*- ispell-local-dictionary: "american" -*-
+# SPDX-License-Identifier: Python-2.0-like
"""ManageSieve (RFC 5804) client module for remotely managing Sieve Scripts.
@@ -8,16 +9,18 @@
"""
-__version__ = "0.6"
+__version__ = "0.7.1"
__author__ = """Hartmut Goebel <h.goe...@crazy-compilers.com>
Ulrich Eck <u...@net-labs.de> April 2001
"""
-__copyright__ = "Copyright (C) 2003-2018 by Hartmut Goebel
<h.goe...@crazy-compilers.com> and others"
+__copyright__ = "Copyright (C) 2003-2021 by Hartmut Goebel
<h.goe...@crazy-compilers.com> and others"
__license__ = "Python-2.0 like"
-import binascii, re, socket, time, random, sys
+import binascii
import logging
+import re
+import socket
from logging import log
try:
import ssl
@@ -25,12 +28,6 @@
except ImportError:
ssl_wrap_socket = socket.ssl
-# only used for assertion. TODO: Remove
-try:
- unicode
-except:
- unicode = str
-
__all__ = [ 'MANAGESIEVE', 'SIEVE_PORT', 'OK', 'NO', 'BYE',
'INFO', 'DEBUG', 'DEBUG0', 'DEBUG1', 'DEBUG2', 'DEBUG3']
@@ -167,7 +164,7 @@
However, the 'password' argument to the LOGIN command is always
quoted. If you want to avoid having an argument string quoted (eg:
the 'flags' argument to STORE) then enclose the string in
- parentheses (eg: "(\Deleted)").
+ parentheses (eg: "(\\Deleted)").
Errors raise the exception class <instance>.error("<reason>").
IMAP4 server errors raise <instance>.abort("<reason>"),
@@ -284,7 +281,7 @@
line = self.file.readline()
assert isinstance(line, bytes)
line = line.decode('utf-8')
- assert isinstance(line, unicode)
+ assert isinstance(line, str)
return line
def _send(self, data):
@@ -294,7 +291,7 @@
line = self._readline()
if not line:
raise self.abort('socket error: EOF')
- assert isinstance(line, unicode)
+ assert isinstance(line, str)
# Protocol mandates all lines terminated by CRLF
line = line[:-2]
if __debug__:
@@ -340,14 +337,14 @@
except (socket.error, OSError) as val:
raise self.abort('socket error: %s' % val)
return self._get_response()
- except self.abort as val:
+ except self.abort:
if __debug__:
self._print_log()
raise
def _readstring(self, data):
- assert isinstance(data, unicode)
+ assert isinstance(data, str)
if data.startswith(" ") : # space -> error
raise self.error('Unexpected space: %r' % data)
elif data.startswith('"'): # handle double quote:
@@ -402,7 +399,7 @@
"""
data = [] ; dat = None
resp = self._get_line()
- assert isinstance(resp, unicode)
+ assert isinstance(resp, str)
while 1:
if self._match(Oknobye, resp):
typ, code, dat = self.mo.group('type','code','data')
@@ -432,7 +429,7 @@
dat.append(None)
data.append(dat)
resp = self._get_line()
- return self.error('Should not come here')
+ raise self.error('Should not come here')
def _match(self, cre, s):
@@ -547,7 +544,8 @@
for dat in data:
if __debug__:
if not len(dat) in (1, 2):
- self.error("Unexpected result from LISTSCRIPTS: %r" (dat,))
+ raise self.error("Unexpected result from LISTSCRIPTS: %r"
+ % (dat,))
scripts.append( (dat[0], dat[1] is not None ))
return typ, scripts
@@ -566,7 +564,7 @@
typ, data = self._command(b'GETSCRIPT', sieve_name(scriptname))
if typ != 'OK': return typ, data
if len(data) != 1:
- self.error('GETSCRIPT returned more than one string/script')
+ raise self.error('GETSCRIPT returned more than one string/script')
# todo: decode data?
return typ, data[0][0]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/pyproject.toml
new/managesieve-v0.7.1/pyproject.toml
--- old/managesieve-v0.6/pyproject.toml 1970-01-01 01:00:00.000000000 +0100
+++ new/managesieve-v0.7.1/pyproject.toml 2021-03-11 20:58:41.000000000
+0100
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=39.2.0", "wheel"]
+build-backend = "setuptools.build_meta"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/setup.cfg
new/managesieve-v0.7.1/setup.cfg
--- old/managesieve-v0.6/setup.cfg 2018-06-27 09:54:56.000000000 +0200
+++ new/managesieve-v0.7.1/setup.cfg 2021-03-11 20:58:41.000000000 +0100
@@ -1,16 +1,62 @@
+# SPDX-License-Identifier: GPL-3.0-only
+
[sdist]
formats=gztar
[bdist_wheel]
universal=1
-[aliases]
-test = pytest
+[metadata]
+name = managesieve
+version = attr: managesieve.__version__
+description = ManageSieve client library for remotely managing Sieve scripts
+long_description = file: README.txt
+long_description_content_type = text/x-rst
+url = https://managesieve.readthedocs.io/
+#http://crazy-compilers.com/flyer-composer
+download_url = https://pypi.org/project/managesieve/
+author = Hartmut Goebel
+author_email = h.goe...@crazy-compilers.com
+license = Python, GPLv3
+platforms = POSIX
+keywords = sieve, managesieve, sieveshell, RFC 5804
+classifiers =
+ Development Status :: 5 - Production/Stable
+ Environment :: Console
+ Intended Audience :: End Users/Desktop
+ Intended Audience :: Developers
+ License :: OSI Approved :: Python Software Foundation License
+ License :: OSI Approved :: GNU General Public License (GPL)
+ Natural Language :: English
+ Operating System :: OS Independent
+ Programming Language :: Python :: 3
+ Topic :: Communications :: Email
+ Topic :: Software Development :: Libraries :: Python Modules
+ Topic :: Utilities
+project_urls =
+ Documentation = https://managesieve.readthedocs.io/
+ Source Code = https://gitlab.com/htgoebel/managesieve/
+ Bug Tracker = https://gitlab.com/htgoebel/managesieve/issues
+ Funding = http://crazy-compilers.com/donate.html
+
+
+[options]
+py_modules = managesieve
+scripts = sieveshell
+python_requires = >=3.6
+tests_require = pytest
+zip_safe = true
+
[zest.releaser]
-history-file = CHANGES
+history-file = HISTORY
push-changes = no
tag-format = v{version}
-tag-message = pdfposter {version}
+tag-message = managesieve {version}
tag-signing = yes
create-wheel = yes
+python-file-with-version = managesieve.py
+releaser.before_upload =
+ _zest_release_hooks.sign_release
+ _zest_release_hooks.run_twine_check
+ _zest_release_hooks.safe_dist_files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/setup.py
new/managesieve-v0.7.1/setup.py
--- old/managesieve-v0.6/setup.py 2018-06-27 09:54:56.000000000 +0200
+++ new/managesieve-v0.7.1/setup.py 2021-03-11 20:58:41.000000000 +0100
@@ -1,57 +1,4 @@
#!/usr/bin/env python
-# -*- ispell-local-dictionary: "american" -*-
-
-"""Setup script for the managesieve"""
from setuptools import setup
-
-description = "ManageSieve client library for remotely managing Sieve scripts"
-
-# Read the contents of the README file
-from os import path
-import io
-this_directory = path.abspath(path.dirname(__file__))
-with io.open(path.join(this_directory, 'README.txt'), encoding='utf-8') as f:
- long_description = f.read()
-
-setup (name = "managesieve",
- version='0.6',
- python_requires='>=2.7',
- setup_requires=["pytest-runner"],
- tests_require=["pytest"],
- description = description,
- long_description = long_description,
- long_description_content_type = 'text/x-rst',
- author = "Hartmut Goebel",
- author_email = "h.goe...@crazy-compilers.com",
- #maintainer = "Hartmut Goebel",
- #maintainer_email = "h.goe...@crazy-compilers.com",
- url = "https://managesieve.readthedocs.io/";,
- download_url = "https://pypi.org/project/managesieve";,
- project_urls={
- 'Documentation': 'https://managesieve.readthedocs.io/',
- 'Source Code': 'https://gitlab.com/htgoebel/managesieve/',
- "Bug Tracker": "https://gitlab.com/htgoebel/managesieve/issues";,
- 'Funding': 'http://crazy-compilers.com/donate.html',
- },
- license = 'Python',
- platforms = ['POSIX'],
- keywords = ['sieve', 'managesieve', 'sieveshell', 'RFC 5804'],
- py_modules = ['managesieve'],
- scripts = ['sieveshell'],
- classifiers = [
- 'Development Status :: 5 - Production/Stable',
- 'Environment :: Console',
- 'Intended Audience :: End Users/Desktop',
- 'Intended Audience :: Developers',
- 'License :: OSI Approved :: Python Software Foundation License',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
- 'Natural Language :: English',
- 'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3',
- 'Topic :: Communications :: Email',
- 'Topic :: Software Development :: Libraries :: Python Modules',
- 'Topic :: Utilities'
- ],
- )
+setup()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/sieveshell
new/managesieve-v0.7.1/sieveshell
--- old/managesieve-v0.6/sieveshell 2018-06-27 09:54:56.000000000 +0200
+++ new/managesieve-v0.7.1/sieveshell 2021-03-11 20:58:41.000000000 +0100
@@ -1,5 +1,6 @@
#!/usr/bin/python
# -*- ispell-local-dictionary: "american" -*-
+# SPDX-License-Identifier: GPL-3.0-only
"""
sieveshell - remotely manipulate sieve scripts
@@ -29,11 +30,9 @@
quit - quit
"""
-from __future__ import print_function
-
-__version__ = "0.6"
+__version__ = "0.7.1"
__author__ = "Hartmut Goebel <h.goe...@crazy-compilers.com>"
-__copyright__ = "Copyright (C) 2003-2018 by Hartmut Goebel
<h.goe...@crazy-compilers.com>"
+__copyright__ = "Copyright (C) 2003-2021 by Hartmut Goebel
<h.goe...@crazy-compilers.com>"
__license__ = "GNU General Public License, version 3"
from netrc import netrc
@@ -41,10 +40,6 @@
import subprocess
import readline
-try:
- stdin_input = raw_input
-except NameError:
- stdin_input = input
sieve = None
@@ -88,7 +83,9 @@
def cmd_put(filename, scriptname=None):
"""put <filename> [<target name>]
- upload script to server"""
- if not scriptname: scriptname = filename
+ filename = os.path.expanduser(filename)
+ if not scriptname:
+ scriptname = os.path.basename(filename)
try:
scriptdata = open(filename).read()
except IOError as e:
@@ -103,6 +100,7 @@
res, scriptdata = sieve.getscript(scriptname)
if res == 'OK':
if filename:
+ filename = os.path.expanduser(filename)
try:
open(filename, 'w').write(scriptdata)
except IOError as e:
@@ -119,7 +117,7 @@
def Choice(msg, choices):
while 1:
- answer = stdin_input(msg + ' ').strip()[:1].lower()
+ answer = input(msg + ' ').strip()[:1].lower()
i = choices.find(answer)
if i >= 0:
# valid answer
@@ -134,7 +132,7 @@
if not YesNoQuestion('%s Save script to file?' % msg):
return
scriptname = os.path.join(os.getcwd(), scriptname)
- filename = stdin_input('Enter filename (default %s):' % scriptname)
+ filename = input('Enter filename (default %s):' % scriptname)
if filename == '':
filename = scriptname
scriptdata = open(tmpname).read()
@@ -244,7 +242,7 @@
"""Command loop: read and execute lines from stdin."""
global sieve
while 1:
- line = stdin_input('> ')
+ line = input('> ')
if not line:
# EOF/control-d
cmd_quit()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/test/test_managesieve.py
new/managesieve-v0.7.1/test/test_managesieve.py
--- old/managesieve-v0.6/test/test_managesieve.py 2018-06-27
09:54:56.000000000 +0200
+++ new/managesieve-v0.7.1/test/test_managesieve.py 2021-03-11
20:58:41.000000000 +0100
@@ -1,10 +1,11 @@
#!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-only
"""
Unit tests for managesieve.py
"""
__author__ = "Hartmut Goebel <h.goe...@crazy-compilers.com>"
-__copyright__ = "(c) Copyright 2003-2018 by Hartmut Goebel"
+__copyright__ = "(c) Copyright 2003-2021 by Hartmut Goebel"
__license__ = "GNU General Public License, version 3"
import io
@@ -14,12 +15,6 @@
import managesieve
-try:
- unicode
-except:
- unicode = str
-
-
def make_string(string):
assert isinstance(string, str)
# According to RFC 5804, sec 1.4 all strings are UTF-8 encoded
@@ -27,10 +22,13 @@
return b''.join((('{%d+}' % len(octets)).encode('ascii'),
CRLF, octets))
-def cmd_str(*args):
- args = [a.encode('utf-8') if isinstance(a, unicode) else a
- for a in args]
- return b' '.join(args)
+
+def cmd_str(cmd, string=None, thirdarg=None):
+ args = (cmd.encode('utf-8'),
+ string.encode('utf-8') if string is not None else None,
+ thirdarg if thirdarg is not None else None) # bytes or None
+ return b' '.join(a for a in args if a is not None)
+
def __makeResponses(responseTuples):
"""
@@ -261,7 +259,7 @@
@pytest.mark.parametrize("exp_res, exp_code, exp_text, send_cmd", Responses)
def testSimpleCommands2(testSieve, exp_res, exp_code, exp_text, send_cmd):
_test_simple(testSieve, exp_res, exp_code, exp_text, send_cmd,
- cmd_str('HAVESPACE', '"%s"' % SieveNames[0], '9999'),
+ cmd_str('HAVESPACE', '"%s"' % SieveNames[0], b'9999'),
testSieve.havespace, SieveNames[0], 9999)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/managesieve-v0.6/test/test_res.py
new/managesieve-v0.7.1/test/test_res.py
--- old/managesieve-v0.6/test/test_res.py 2018-06-27 09:54:56.000000000
+0200
+++ new/managesieve-v0.7.1/test/test_res.py 2021-03-11 20:58:41.000000000
+0100
@@ -1,10 +1,11 @@
#!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-only
"""
Unit test patterns in for managesieve.py
"""
__author__ = "Hartmut Goebel <h.goe...@crazy-compilers.com>"
-__copyright__ = "(c) Copyright 2003-2018 by Hartmut Goebel"
+__copyright__ = "(c) Copyright 2003-2021 by Hartmut Goebel"
__license__ = "GNU General Public License, version 3"
import pytest
