[Python-modules-commits] [python-amqp] 01/08: Import python-amqp_1.4.9.orig.tar.gz

[Brian May]

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

bam pushed a commit to branch master
in repository python-amqp.

commit cffa3b54a58deb0770a73c48c03d1c81fbd6fab3
Author: Brian May <bam at debian.org>
Date:   Mon Jan 18 18:38:25 2016 +1100

    Import python-amqp_1.4.9.orig.tar.gz
---
 Changelog              | 11 +++++++++++
 PKG-INFO               |  4 ++--
 README.rst             |  2 +-
 amqp.egg-info/PKG-INFO |  4 ++--
 amqp/__init__.py       |  2 +-
 amqp/five.py           |  9 ++++++---
 docs/changelog.rst     | 11 +++++++++++
 7 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/Changelog b/Changelog
index b4caae6..0612fff 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,17 @@ 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-1.4.9:
+
+1.4.9
+=====
+:release-date: 2016-01-08 5:50 PM PST
+
+- Fixes compatibility with Linux/OS X instances where the ``ctypes`` module
+  does not exist.
+
+    Fix contributed by Jared Lewis.
+
 .. _version-1.4.8:
 
 1.4.8
diff --git a/PKG-INFO b/PKG-INFO
index 6d27649..53452ee 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: amqp
-Version: 1.4.8
+Version: 1.4.9
 Summary: Low-level AMQP client for Python (fork of amqplib)
 Home-page: http://github.com/celery/py-amqp
 Author: Ask Solem
@@ -10,7 +10,7 @@ Description: ===================================================================
          Python AMQP 0.9.1 client library
         =====================================================================
         
-        :Version: 1.4.8
+        :Version: 1.4.9
         :Web: http://amqp.readthedocs.org/
         :Download: http://pypi.python.org/pypi/amqp/
         :Source: http://github.com/celery/py-amqp/
diff --git a/README.rst b/README.rst
index 1562d1e..653c4ce 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
  Python AMQP 0.9.1 client library
 =====================================================================
 
-:Version: 1.4.8
+:Version: 1.4.9
 :Web: http://amqp.readthedocs.org/
 :Download: http://pypi.python.org/pypi/amqp/
 :Source: http://github.com/celery/py-amqp/
diff --git a/amqp.egg-info/PKG-INFO b/amqp.egg-info/PKG-INFO
index 6d27649..53452ee 100644
--- a/amqp.egg-info/PKG-INFO
+++ b/amqp.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: amqp
-Version: 1.4.8
+Version: 1.4.9
 Summary: Low-level AMQP client for Python (fork of amqplib)
 Home-page: http://github.com/celery/py-amqp
 Author: Ask Solem
@@ -10,7 +10,7 @@ Description: ===================================================================
          Python AMQP 0.9.1 client library
         =====================================================================
         
-        :Version: 1.4.8
+        :Version: 1.4.9
         :Web: http://amqp.readthedocs.org/
         :Download: http://pypi.python.org/pypi/amqp/
         :Source: http://github.com/celery/py-amqp/
diff --git a/amqp/__init__.py b/amqp/__init__.py
index 20cc4f5..9c39c43 100644
--- a/amqp/__init__.py
+++ b/amqp/__init__.py
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 from __future__ import absolute_import
 
-VERSION = (1, 4, 8)
+VERSION = (1, 4, 9)
 __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
 __author__ = 'Barry Pederson'
 __maintainer__ = 'Ask Solem'
diff --git a/amqp/five.py b/amqp/five.py
index 506a08b..8b281db 100644
--- a/amqp/five.py
+++ b/amqp/five.py
@@ -139,8 +139,12 @@ if sys.version_info < (3, 3):
     import platform
     SYSTEM = platform.system()
 
-    if SYSTEM == 'Darwin':
+    try:
         import ctypes
+    except ImportError:  # pragma: no cover
+        ctypes = None  # noqa
+
+    if SYSTEM == 'Darwin' and ctypes is not None:
         from ctypes.util import find_library
         libSystem = ctypes.CDLL(find_library('libSystem.dylib'))
         CoreServices = ctypes.CDLL(find_library('CoreServices'),
@@ -154,10 +158,9 @@ if sys.version_info < (3, 3):
         def _monotonic():
             return absolute_to_nanoseconds(mach_absolute_time()) * 1e-9
 
-    elif SYSTEM == 'Linux':
+    elif SYSTEM == 'Linux' and ctypes is not None:
         # from stackoverflow:
         # questions/1205722/how-do-i-get-monotonic-time-durations-in-python
-        import ctypes
         import os
 
         CLOCK_MONOTONIC = 1  # see <linux/time.h>
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b4caae6..0612fff 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,17 @@ 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-1.4.9:
+
+1.4.9
+=====
+:release-date: 2016-01-08 5:50 PM PST
+
+- Fixes compatibility with Linux/OS X instances where the ``ctypes`` module
+  does not exist.
+
+    Fix contributed by Jared Lewis.
+
 .. _version-1.4.8:
 
 1.4.8

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