[Python-modules-commits] [python-amqp] 03/12: New upstream version 2.1.4

Christopher Stuart Hoskin mans0954 at moszumanska.debian.org
Sun Mar 19 09:29:12 UTC 2017


This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch debian/experimental
in repository python-amqp.

commit 3e149e5e8478c436a7f139fe4dff89b41ae89c26
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Wed Mar 15 19:44:21 2017 +0000

    New upstream version 2.1.4
---
 Changelog                                          |  289 +++++-
 LICENSE                                            |  505 +--------
 MANIFEST.in                                        |    7 +-
 PKG-INFO                                           |   54 +-
 README.rst                                         |   38 +-
 amqp.egg-info/PKG-INFO                             |   54 +-
 amqp.egg-info/SOURCES.txt                          |   54 +-
 amqp.egg-info/requires.txt                         |    1 +
 amqp/__init__.py                                   |   68 +-
 amqp/abstract_channel.py                           |  105 +-
 amqp/basic_message.py                              |  153 +--
 amqp/channel.py                                    | 1093 ++++++--------------
 amqp/connection.py                                 | 1050 +++++++------------
 amqp/exceptions.py                                 |   80 +-
 amqp/five.py                                       |  191 +---
 amqp/method_framing.py                             |  360 +++----
 amqp/platform.py                                   |   73 ++
 amqp/protocol.py                                   |    3 +-
 amqp/serialization.py                              |  916 ++++++++--------
 amqp/spec.py                                       |  122 +++
 amqp/tests/case.py                                 |   85 --
 amqp/tests/test_channel.py                         |   35 -
 amqp/transport.py                                  |  303 ++++--
 amqp/utils.py                                      |  142 +--
 demo/amqp_clock.py                                 |   78 --
 demo/demo_receive.py                               |   83 --
 demo/demo_send.py                                  |   66 --
 docs/.templates/page.html                          |    4 -
 docs/.templates/sidebarintro.html                  |    4 -
 docs/.templates/sidebarlogo.html                   |    3 -
 docs/Makefile                                      |  223 +++-
 docs/_ext/applyxrefs.py                            |   92 --
 docs/_ext/literals_to_xrefs.py                     |  173 ----
 docs/{.static => _static}/.keep                    |    0
 docs/_templates/sidebardonations.html              |   10 +
 docs/_theme/celery/static/celery.css_t             |  401 -------
 docs/_theme/celery/theme.conf                      |    5 -
 docs/changelog.rst                                 |  545 +---------
 docs/conf.py                                       |  151 +--
 docs/images/celery_128.png                         |  Bin 0 -> 26250 bytes
 docs/images/favicon.ico                            |  Bin 0 -> 3364 bytes
 docs/includes/{intro.txt => introduction.txt}      |    6 +-
 docs/index.rst                                     |    2 +-
 docs/make.bat                                      |  272 +++++
 docs/reference/amqp.abstract_channel.rst           |    2 +-
 docs/reference/amqp.basic_message.rst              |    2 +-
 docs/reference/amqp.channel.rst                    |    2 +-
 docs/reference/amqp.connection.rst                 |    2 +-
 docs/reference/amqp.exceptions.rst                 |    2 +-
 docs/reference/amqp.five.rst                       |    2 +-
 docs/reference/amqp.method_framing.rst             |    2 +-
 .../{amqp.protocol.rst => amqp.platform.rst}       |    6 +-
 docs/reference/amqp.protocol.rst                   |    2 +-
 docs/reference/amqp.serialization.rst              |    2 +-
 docs/reference/{amqp.five.rst => amqp.spec.rst}    |    6 +-
 docs/reference/amqp.transport.rst                  |    2 +-
 docs/reference/amqp.utils.rst                      |    2 +-
 docs/reference/index.rst                           |    2 +
 docs/templates/readme.txt                          |   27 +-
 extra/README                                       |   10 -
 extra/generate_skeleton_0_8.py                     |  377 -------
 extra/release/bump_version.py                      |  181 ----
 extra/release/sphinx-to-rst.py                     |   75 --
 extra/update_comments_from_spec.py                 |    8 +-
 funtests/run_all.py                                |   38 -
 funtests/settings.py                               |   91 --
 funtests/test_basic_message.py                     |  132 ---
 funtests/test_channel.py                           |  317 ------
 funtests/test_connection.py                        |  127 ---
 funtests/test_exceptions.py                        |   47 -
 funtests/test_serialization.py                     |  411 --------
 funtests/test_with.py                              |   70 --
 requirements/default.txt                           |    1 +
 requirements/docs.txt                              |    3 +-
 requirements/pkgutils.txt                          |   13 +-
 requirements/test-ci.txt                           |    2 +
 requirements/test.txt                              |    7 +-
 setup.cfg                                          |   14 +-
 setup.py                                           |   90 +-
 {amqp/tests => t}/__init__.py                      |    0
 {amqp/tests => t/unit}/__init__.py                 |    0
 t/unit/test_abstract_channel.py                    |  122 +++
 t/unit/test_basic_message.py                       |   19 +
 t/unit/test_channel.py                             |  408 ++++++++
 t/unit/test_connection.py                          |  316 ++++++
 t/unit/test_exceptions.py                          |   22 +
 t/unit/test_method_framing.py                      |  101 ++
 t/unit/test_platform.py                            |   14 +
 t/unit/test_serialization.py                       |  195 ++++
 t/unit/test_transport.py                           |  374 +++++++
 t/unit/test_utils.py                               |   80 ++
 91 files changed, 4807 insertions(+), 6820 deletions(-)

diff --git a/Changelog b/Changelog
index 0612fff..7dd0f0c 100644
--- a/Changelog
+++ b/Changelog
@@ -5,13 +5,294 @@ py-amqp is fork of amqplib used by Kombu containing additional features and impr
 The previous amqplib changelog is here:
 http://code.google.com/p/py-amqplib/source/browse/CHANGES
 
+.. _version-2.1.4:
+
+2.1.4
+=====
+:release-date: 2016-12-14 03:40 P.M PST
+:release-by: Ask Solem
+
+- Removes byte string comparison warnings when running under ``python -b``.
+
+    Fix contributed by **Jon Dufresne**.
+
+- Linux version parsing broke when the version included a '+' character
+  (Issue #119).
+
+- Now sets default TCP settings for platforms that support them (e.g. Linux).
+
+    +----------------------+---------------+
+    |   Constant           |   Value       |
+    +======================+===============+
+    | ``TCP_KEEPIDLE``     | ``60``        |
+    +----------------------+---------------+
+    | ``TCP_KEEPINTVL``    | ``10``        |
+    +----------------------+---------------+
+    | ``TCP_KEEPCNT``      | ``9``         |
+    +----------------------+---------------+
+    | ``TCP_USER_TIMEOUT`` | ``1000`` (1s) |
+    +----------------------+---------------+
+
+    This will help detecting the socket being closed earlier, which is very
+    important in failover and load balancing scenarios.
+
+.. _version-2.1.3:
+
+2.1.3
+=====
+:release-date: 2016-12-07 06:00 P.M PST
+:release-by: Ask Solem
+
+- Fixes compatibility with Python 2.7.5 and below (Issue #107).
+
+.. _version-2.1.2:
+
+2.1.2
+=====
+:release-date: 2016-12-07 02:00 P.M PST
+
+- Linux: Now sets the :data:`~socket.TCP_USER_TIMEOUT` flag if available
+  for better failed connection detection.
+
+    Contributed by **Jelte Fennema**.
+
+    The timeout is set to the ``connect_timeout`` value by default,
+    but can also be specified by using the ``socket_settings`` argument
+    to :class:`~amqp.Connection`:
+
+    .. code-block:: python
+
+        from amqp import Connection
+        from amqp.platform import TCP_USER_TIMEOUT
+
+        conn = Connection(socket_settings={
+            TCP_USER_TIMEOUT: int(60 * 1000),  # six minutes in ms.
+        })
+
+    When using :pypi:`Kombu` this can be specified as part of the
+    ``transport_options``:
+
+    .. code-block:: python
+
+        from amqp.platform import TCP_USER_TIMEOUT
+        from kombu import Connection
+
+        conn = Connection(transport_options={
+            'socket_settings': {
+                TCP_USER_TIMEOUT: int(60 * 1000),  # six minutes in ms.
+            },
+        })
+
+    Or when using :pypi:`Celery` it can be specified using the
+    ``broker_transport_options`` setting:
+
+    .. code-block:: python
+
+        from amqp.platform import TCP_USER_TIMEOUT
+        from celery import Celery
+
+        app = Celery()
+        app.conf.update(
+            broker_transport_options={
+                TCP_USER_TIMEOUT: int(60 * 1000),  # six minutes in ms.
+            }
+        )
+
+- Python compatibility: Fixed compatibility when using the python ``-b`` flag.
+
+    Fix contributed by Jon Dufresne.
+
+.. _version-2.1.1:
+
+2.1.1
+=====
+:release-date: 2016-10-13 06:36 P.M PDT
+:release-by: Ask Solem
+
+.. _version-2.1.0:
+
+- **Requirements**
+
+    - Now depends on :ref:`Vine 1.1.3 <vine:version-1.1.3>`.
+
+- Frame writer: Account for overhead when calculating frame size.
+
+    The client would crash if the message was within a certain size.
+
+-  Fixed struct unicode problems (#108)
+
+    * Standardize pack invocations on bytestrings.
+
+    * Leave some literals as strings to enable interpolation.
+
+    * Fix flake8 fail.
+
+    Fix contributed by **Brendan Smithyman**.
+
+
+2.1.0
+=====
+:release-date: 2016-09-07 04:23 P.M PDT
+:release-by: Ask Solem
+
+- **Requirements**
+
+    - Now depends on :ref:`Vine 1.1.2 <vine:version-1.1.2>`.
+
+- Now licensed under the BSD license!
+
+    Thanks to Barry Pederson for approving the license change,
+    which unifies the license used across all projects in the Celery
+    organization.
+
+- Datetimes in method frame arguments are now handled properly.
+
+- Fixed compatibility with Python <= 2.7.6
+
+- Frame_writer is no longer a generator, which should solve
+  a rare "generator already executing" error (Issue #103).
+
+.. _version-2.0.3:
+
+2.0.3
+=====
+:release-date: 2016-07-11 08:00 P.M PDT
+:release-by: Ask Solem
+
+- SSLTransport: Fixed crash "no attribute sslopts" when ``ssl=True``
+  (Issue #100).
+
+- Fixed incompatible argument spec for ``Connection.Close`` (Issue #45).
+
+    This caused the RabbitMQ server to raise an exception (INTERNAL ERROR).
+
+- Transport: No longer implements `__del__` to make sure gc can collect
+  connections.
+
+    It's the responsibility of the caller to close connections, this was
+    simply a relic from the amqplib library.
+
+.. _version-2.0.2:
+
+2.0.2
+=====
+:release-date: 2016-06-10 5:40 P.M PDT
+:release-by: Ask Solem
+
+- Python 3: Installation requirements ended up being a generator
+  and crashed setup.py.
+
+    Fix contributed by ChangBo Guo(gcb).
+
+- Python <= 2.7.7: struct.pack arguments cannot be unicode
+
+    Fix contributed by Alan Justino and Xin Li.
+
+- Python 3.4: Fixed use of `bytes % int`.
+
+    Fix contributed by Alan Justino.
+
+- Connection/Transport: Fixed handling of default port.
+
+    Fix contributed by Quentin Pradet.
+
+.. _version-2.0.1:
+
+2.0.1
+=====
+:release-date: 2016-05-31 6:20 P.M PDT
+:release-by: Ask Solem
+
+- Adds backward compatibility layer for the 1.4 API.
+
+    Using the connection without calling ``.connect()`` first will now work,
+    but a warning is emitted and the behavior is deprecated and will be
+    removed in version 2.2.
+
+- Fixes kombu 3.0/celery 3.1 compatibility (Issue #88).
+
+    Fix contributed by Bas ten Berge.
+
+- Fixed compatibility with Python 2.7.3 (Issue #85)
+
+    Fix contributed by Bas ten Berge.
+
+- Fixed bug where calling drain_events() with a timeout of 0 would actually
+  block until a frame is received.
+
+- Documentation moved to http://amqp.readthedocs.io (Issue #89).
+
+    See https://blog.readthedocs.com/securing-subdomains/ for the reasoning
+    behind this change.
+
+    Fix contributed by Adam Chainz.
+
+.. _version-2.0.0:
+
+2.0.0
+=====
+:release-date: 2016-05-26 1:44 P.M PDT
+:release-by: Ask Solem
+
+- No longer supports Python 2.6
+
+- You must now call Connection.connect() to establish the connection.
+
+    The Connection constructor no longer has side effects, so you have
+    to explicitly call connect first.
+
+- Library rewritten to anticipate async changes.
+
+- Connection now exposes underlying socket options.
+
+    This change allows to set arbitrary TCP socket options during the creation of
+    the transport.
+
+    Those values can be set passing a dictionray where the key is the name of
+    the parameter we want to set.
+    The names of the keys are the ones reported above.
+
+    Contributed by Andrea Rosa, Dallas Marlow and Rongze Zhu.
+
+- Additional logging for heartbeats.
+
+    Contributed by Davanum Srinivas, and Dmitry Mescheryakov.
+
+- SSL: Fixes issue with remote connection hanging
+
+    Fix contributed by Adrien Guinet.
+
+- SSL: ``ssl`` dict argument now supports the ``check_hostname`` key
+    (Issue #63).
+
+    Contributed by Vic Kumar.
+
+- Contributions by:
+
+    Adrien Guinet
+    Andrea Rosa
+    Artyom Koval
+    Corey Farwell
+    Craig Jellick
+    Dallas Marlow
+    Davanum Srinivas
+    Federico Ficarelli
+    Jared Lewis
+    Rémy Greinhofer
+    Rongze Zhu
+    Yury Selivanov
+    Vic Kumar
+    Vladimir Bolshakov
+    :github_user:`lezeroq`
+
 .. _version-1.4.9:
 
 1.4.9
 =====
-:release-date: 2016-01-08 5:50 PM PST
+:release-date: 2016-01-08 5:50 P.M PST
+:release-by: Ask Solem
 
-- Fixes compatibility with Linux/OS X instances where the ``ctypes`` module
+- Fixes compatibility with Linux/macOS instances where the ``ctypes`` module
   does not exist.
 
     Fix contributed by Jared Lewis.
@@ -20,7 +301,7 @@ http://code.google.com/p/py-amqplib/source/browse/CHANGES
 
 1.4.8
 =====
-:release-date: 2015-12-07 12:25 AM
+:release-date: 2015-12-07 12:25 A.M
 :release-by: Ask Solem
 
 - ``abstract_channel.wait`` now accepts a float `timeout` parameter expressed
@@ -35,7 +316,7 @@ http://code.google.com/p/py-amqplib/source/browse/CHANGES
 :release-date: 2015-10-02 05:30 P.M PDT
 :release-by: Ask Solem
 
-- Fixed libSystem error on OS X 10.11 (El Capitan)
+- Fixed libSystem error on macOS 10.11 (El Capitan)
 
     Fix contributed by Eric Wang.
 
diff --git a/LICENSE b/LICENSE
index 3b473db..46087c2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,458 +1,47 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-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 this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-

-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-

-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-

-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-

-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-

-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-

-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-

-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser 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 Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-

-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
+Copyright (c) 2015-2016 Ask Solem & contributors.  All rights reserved.
+Copyright (c) 2012-2014 GoPivotal, Inc.  All rights reserved.
+Copyright (c) 2009, 2010, 2011, 2012 Ask Solem, and individual contributors.  All rights reserved.
+Copyright (C) 2007-2008 Barry Pederson <bp at barryp.org>. All rights reserved.
+
+py-amqp is licensed under The BSD License (3 Clause, also known as
+the new BSD license).  The license is an OSI approved Open Source
+license and is GPL-compatible(1).
+
+The license text can also be found here:
+http://www.opensource.org/licenses/BSD-3-Clause
+
+License
+=======
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Ask Solem, nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Ask Solem OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+
+Footnotes
+=========
+(1) A GPL-compatible license makes it possible to
+    combine Celery with other software that is released
+    under the GPL, it does not mean that we're distributing
+    Celery under the GPL license.  The BSD license, unlike the GPL,
+    let you distribute a modified version without making your
+    changes open source.
diff --git a/MANIFEST.in b/MANIFEST.in
index d17e9d2..43c5570 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,5 +2,10 @@ include README.rst Changelog LICENSE
 recursive-include docs *
 recursive-include demo *.py
 recursive-include extra README *.py
-recursive-include funtests *.py
 recursive-include requirements *.txt
+recursive-include t *.py
+
+recursive-exclude docs/_build *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+recursive-exclude * .*.sw*
diff --git a/PKG-INFO b/PKG-INFO
index 53452ee..a33b36a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,17 +1,19 @@
 Metadata-Version: 1.1
 Name: amqp
-Version: 1.4.9
-Summary: Low-level AMQP client for Python (fork of amqplib)
+Version: 2.1.4
+Summary: Low-level AMQP client for Python (fork of amqplib).
 Home-page: http://github.com/celery/py-amqp
 Author: Ask Solem
 Author-email: pyamqp at celeryproject.org
-License: LGPL
+License: BSD
 Description: =====================================================================
          Python AMQP 0.9.1 client library
         =====================================================================
         
-        :Version: 1.4.9
-        :Web: http://amqp.readthedocs.org/
+        |build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
+        
+        :Version: 2.1.4
+        :Web: https://amqp.readthedocs.io/
         :Download: http://pypi.python.org/pypi/amqp/
         :Source: http://github.com/celery/py-amqp/
         :Keywords: amqp, rabbitmq
@@ -27,7 +29,7 @@ Description: ===================================================================
         
         .. _amqplib: http://pypi.python.org/pypi/amqplib
         .. _Celery: http://celeryproject.org/
-        .. _kombu: http://kombu.readthedocs.org/
+        .. _kombu: https://kombu.readthedocs.io/
         .. _librabbitmq: http://pypi.python.org/pypi/librabbitmq
         
         Differences from `amqplib`_
@@ -56,6 +58,10 @@ Description: ===================================================================
                 - ``Channel.events['basic_ack'].append(my_callback)`` adds a callback
                   to be called when a message is confirmed. This callback is then
                   called with the signature ``(delivery_tag, multiple)``.
+            - Authentication Failure Notifications
+                Instead of just closing the connection abruptly on invalid
+                credentials, py-amqp will raise an ``AccessRefused`` error
+                when connected to rabbitmq-server 3.2.0 or greater.
         - Support for ``basic_return``
         - Uses AMQP 0-9-1 instead of 0-8.
             - ``Channel.access_request`` and ``ticket`` arguments to methods
@@ -107,22 +113,40 @@ Description: ===================================================================
         
             http://www.rabbitmq.com/devtools.html#python-dev
         
-        .. image:: https://d2weczhvl823v0.cloudfront.net/celery/celery/trend.png
-            :alt: Bitdeli badge
-            :target: https://bitdeli.com/free
... 12775 lines suppressed ...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-amqp.git



More information about the Python-modules-commits mailing list