Merge pull request #59 from Worvast/master

Fixed bug in  Sender CLI introduced in version 2.2.2

Author: Worvast

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.2.3] - 2019-04-22
+#### Fixed
+ * Fixed bug in Sender CLI introduced in version 2.2.2
+ 
 ## [2.2.2] - 2019-04-03
 #### Fixed
  * Sender for logging (Handler) get Severity correctly when use custom Level info

README.md

@@ -1,7 +1,7 @@
 
 [![master Build Status](https://travis-ci.com/DevoInc/python-sdk.svg?branch=master)](https://travis-ci.com/DevoInc/python-sdk) [![LICENSE](https://img.shields.io/dub/l/vibe-d.svg)](https://github.com/DevoInc/python-sdk/blob/master/LICENSE)
 
-[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-2.2.2-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-2.7%20%7C%203.3%20%7C%203.4%20%7C%203.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
+[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-2.2.3-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-2.7%20%7C%203.3%20%7C%203.4%20%7C%203.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
 
 
 # Devo Python SDK

devo/__version__.py

@@ -1,6 +1,6 @@
 __description__ = 'Devo Python Library.'
 __url__ = 'http://www.devo.com'
-__version__ = "2.2.1"
+__version__ = "2.2.3"
 __author__ = 'Devo'
 __author_email__ = 'support@devo.com'
 __license__ = 'MIT'

devo/sender/data.py

@@ -12,6 +12,8 @@
     FACILITY_USER, SEVERITY_INFO, COMPOSE, \
     COMPOSE_BYTES, priority_map
 
+from devo.common import Configuration
+
 PY3 = sys.version_info[0] > 2
 PY33 = sys.version_info[0] == 3 and sys.version_info[1] == 3
 PY34 = sys.version_info[0] == 3 and sys.version_info[1] == 4
@@ -119,7 +121,10 @@ def __init__(self, config=None, **kwargs):
             if not config:
                 config = kwargs
             else:
-                config.update(kwargs)
+                if isinstance(config, Configuration):
+                    config.cfg.update(kwargs)
+                else:
+                    config.update(kwargs)
 
             if "type" not in config.keys():
                 config["type"] = "SSL"
@@ -488,7 +493,7 @@ def from_config(config, con_type=None, logger=None):
         if "type" not in config.keys():
             config['type'] = con_type if con_type else "SSL"
 
-        return Sender(logger=logger, **config)
+        return Sender(logger=logger, config=config)
 
     def emit(self, record):
         """