Merge pull request #55 from Worvast/master

Fixing Sender and under version requirements

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.0] - 2019-02-23
+#### Changed
+ * Inits args for Sender(), and from_config(), to make it more flexible to config objects and flags
+
 ## [2.1.3] - 2019-02-22
 #### Added
  * Requirements file

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.1.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/)
+[![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.0-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.1.3"
+__version__ = "2.2.0"
 __author__ = 'Devo'
 __author_email__ = 'support@devo.com'
 __license__ = 'MIT'

devo/sender/data.py

@@ -115,19 +115,30 @@ class Sender(logging.Handler):
 
     """
     def __init__(self, config=None, **kwargs):
-        if not config:
-            config = SenderConfigTCP(**kwargs) if kwargs.get('type') == "TCP" \
-                else SenderConfigSSL(**kwargs) if kwargs.get('type') == "SSL" \
-                else None
-
-        if not config:
-            raise DevoSenderException("Problems with args passed to Sender")
+        if not isinstance(config, (SenderConfigSSL, SenderConfigTCP)):
+            if not config:
+                config = kwargs
+            else:
+                config.update(kwargs)
+
+            if "type" not in config.keys():
+                config["type"] = "SSL"
+                config = SenderConfigSSL(**config)
+            elif config["type"] not in ["TCP", "SSL"]:
+                raise DevoSenderException(
+                        "Devo-Sender|Type must be 'SSL' or 'TCP'")
+            elif config.get("type") == "TCP":
+                config = SenderConfigTCP(**config)
+            elif config.get("type") == "SSL":
+                config = SenderConfigSSL(**config)
+            else:
+                raise DevoSenderException("Problems with args passed to Sender")
 
         logger = kwargs.get('logger', None)
 
         logging.Handler.__init__(self)
-        self.logger = self.__set_logger(kwargs.get('verbose_level', "INFO")) \
-            if logger is None else logger
+        self.logger = logger if logger \
+            else self.__set_logger(kwargs.get('verbose_level', "INFO"))
 
         self.socket = None
         self._sender_config = config
@@ -452,7 +463,7 @@ def for_logging(config, con_type="SSL", tag=None, level=10):
         if "verbose_level" not in config.keys():
             config["verbose_level"] = level
 
-        con = Sender.from_config(config, con_type)
+        con = Sender.from_config(config, con_type=con_type)
         if tag:
             con.set_logger_tag(tag)
         elif "tag" in config.keys():
@@ -470,44 +481,13 @@ def from_config(config, con_type=None, logger=None):
         :param logger: logger handler, default None
         :return: Sender object
         """
-        con_type = config['type'].upper() if "type" in config and con_type \
-                                             is not None else "SSL"
-        cert_reqs = config['cert_reqs'] if "cert_reqs" in config else True
+        if "cert_reqs" not in config.keys():
+            config['cert_reqs'] = True
 
-        if con_type == "SSL":
-            if cert_reqs:
-                return Sender(
-                    SenderConfigSSL(
-                        address=config['address'],
-                        port=int(config['port']),
-                        cert_reqs=True,
-                        key=config['key'],
-                        cert=config['cert'],
-                        chain=config['chain']
-                    ),
-                    logger=logger,
-                    verbose_level=config.get('verbose_level', "INFO")
-                )
-            return Sender(
-                SenderConfigSSL(
-                    address=config['address'],
-                    port=int(config['port']),
-                    cert_reqs=False
-                ),
-                logger=logger,
-                verbose_level=config.get('verbose_level', "INFO")
-            )
-
-        if con_type == "TCP":
-            return Sender(
-                SenderConfigTCP(
-                    address=config['address'],
-                    port=int(config['port'])
-                ),
-                logger=logger,
-                verbose_level=config.get('verbose_level', "INFO")
-            )
-        raise DevoSenderException("Devo-Sender|Type must be 'SSL' or 'TCP'")
+        if "type" not in config.keys():
+            config['type'] = con_type if con_type else "SSL"
+
+        return Sender(logger=logger, **config)
 
     def emit(self, record):
         """
@@ -525,7 +505,7 @@ def emit(self, record):
         try:
             msg = self.format(record)
             msg += '\000'
-            self.send(self._logger_tag, msg, facility=self._logger_facility,
+            self.send(tag=self._logger_tag, msg=msg, facility=self._logger_facility,
                       severity=priority_map.get(record.levelname, "info"))
         except Exception:
             self.handleError(record)

requirements.txt

@@ -1,3 +1,3 @@
 Click==7.0
-PyYAML==3.13
+pyyaml>=git+git://github.com/yaml/pyyaml@releases/tag/5.1b3
 requests==2.21.0

setup.py

@@ -28,7 +28,7 @@
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 INSTALL_REQUIRES = ['requests>=2.17,<3', 'click>=7']
-EXTRA_REQUIRES = {'pyyaml': ['pyyaml']}
+EXTRA_REQUIRES = {'pyyaml': ['pyyaml>=5.1b3']}
 CLI = ['devo-sender=devo.sender.scripts.sender_cli:cli',
        'devo-api=devo.api.scripts.client_cli:cli']