From 8c320601b92482472f3e5fe366221fa276c49004 Mon Sep 17 00:00:00 2001
From: Erik Olof Gunnar Andersson <me@eandersson.net>
Date: Tue, 7 Nov 2017 23:54:59 -0800
Subject: [PATCH] Releasing 2.3.0

- Removed 2.6 compatible NullHandler for logger.
- Updated README and CHANGELOG.
---
 CHANGELOG.rst         |  7 +++++--
 README.rst            |  6 ++++--
 amqpstorm/__init__.py | 12 ++----------
 amqpstorm/io.py       |  9 +++++----
 setup.py              |  2 +-
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ffa25491..7a2742eb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,10 +1,13 @@
 Changelog
 =========
 
-Version 2.3.0 Beta 1
---------------------
+Version 2.3.0
+-------------
+- Added delivery_tag property to message.
 - Added redelivered property to message [#41] - Thanks tkram01.
 - Added support for Management Api Healthchecks [#39] - Thanks Julien Carpentier.
+- Fixed incompatibility with Sun Solaris 10 [#46] - Thanks Giuliox.
+- Fixed delivery_tag being set to None by default [#47] - tkram01.
 - Exposed requests verify and certs flags to Management Api [#40] - Thanks Julien Carpentier.
 
 Version 2.2.2
diff --git a/README.rst b/README.rst
index 37f51985..272f6f26 100644
--- a/README.rst
+++ b/README.rst
@@ -21,11 +21,13 @@ Additional documentation is available on `amqpstorm.io <https://www.amqpstorm.io
 Changelog
 =========
 
-Version 2.3.0 Beta 2
---------------------
+Version 2.3.0
+-------------
+- Added delivery_tag property to message.
 - Added redelivered property to message [#41] - Thanks tkram01.
 - Added support for Management Api Healthchecks [#39] - Thanks Julien Carpentier.
 - Fixed incompatibility with Sun Solaris 10 [#46] - Thanks Giuliox.
+- Fixed delivery_tag being set to None by default [#47] - tkram01.
 - Exposed requests verify and certs flags to Management Api [#40] - Thanks Julien Carpentier.
 
 Version 2.2.2
diff --git a/amqpstorm/__init__.py b/amqpstorm/__init__.py
index 2a8dcb40..015aefb7 100644
--- a/amqpstorm/__init__.py
+++ b/amqpstorm/__init__.py
@@ -1,18 +1,10 @@
 """AMQPStorm."""
-__version__ = '2.3.0b2'  # noqa
+__version__ = '2.3.0'  # noqa
 __author__ = 'eandersson'  # noqa
 
 import logging
 
-
-class NullHandler(logging.Handler):
-    """Logging Null Handler."""
-
-    def emit(self, record):
-        pass
-
-
-logging.getLogger('amqpstorm').addHandler(NullHandler())
+logging.getLogger('amqpstorm').addHandler(logging.NullHandler())
 
 from amqpstorm.channel import Channel  # noqa
 from amqpstorm.connection import Connection  # noqa
diff --git a/amqpstorm/io.py b/amqpstorm/io.py
index e42fd5c2..f0f4bd39 100644
--- a/amqpstorm/io.py
+++ b/amqpstorm/io.py
@@ -169,8 +169,7 @@ def _find_address_and_connect(self, addresses):
             return sock
         raise AMQPConnectionError(
             'Could not connect to %s:%d' % (
-                self._parameters['hostname'],
-                self._parameters['port']
+                self._parameters['hostname'], self._parameters['port']
             )
         )
 
@@ -200,8 +199,10 @@ def _ssl_wrap_socket(self, sock):
             self._parameters['ssl_options']['ssl_version'] = (
                 compatibility.DEFAULT_SSL_VERSION
             )
-        return ssl.wrap_socket(sock, do_handshake_on_connect=True,
-                               **self._parameters['ssl_options'])
+        return ssl.wrap_socket(
+            sock, do_handshake_on_connect=True,
+            **self._parameters['ssl_options']
+        )
 
     def _create_inbound_thread(self):
         """Internal Thread that handles all incoming traffic.
diff --git a/setup.py b/setup.py
index fe3ff0f0..7c2615b2 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='AMQPStorm',
-    version='2.3.0b2',
+    version='2.3.0',
     description='Thread-safe Python RabbitMQ Client & Management library.',
     long_description=open('README.rst').read(),
     author='Erik Olof Gunnar Andersson',