Refactored classes to be more modular, update to ini file and submodules

deps/qualysapi/qualysapi/config.py

@@ -94,8 +94,8 @@ class QualysConnectConfig:
                 logger.error('Report Template ID Must be set and be an integer')
                 print('Value template ID must be an integer.')
                 exit(1)
-            self._cfgparse.set('qualys', 'template_id', str(self.max_retries))
-        self.max_retries = int(self.max_retries)
+            self._cfgparse.set('qualys', 'template_id', str(self.report_template_id))
+        self.report_template_id = int(self.report_template_id)
 
         # Proxy support
         proxy_config = proxy_url = proxy_protocol = proxy_port = proxy_username = proxy_password = None
@@ -216,3 +216,6 @@ class QualysConnectConfig:
     def get_hostname(self):
         ''' Returns hostname. '''
         return self._cfgparse.get('qualys', 'hostname')
+
+    def get_template_id(self):
+        return self._cfgparse.get('qualys','template_id')

deps/qualysapi/qualysapi/connector.py

@@ -9,7 +9,12 @@ and requesting data from it.
 """
 import logging
 import time
-import urllib.parse
+
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
+
 from collections import defaultdict
 
 import requests
@@ -154,7 +159,7 @@ class QGConnector(api_actions.QGActions):
             if api_call_endpoint in self.api_methods['was get']:
                 return 'get'
             # Post calls with no payload will result in HTTPError: 415 Client Error: Unsupported Media Type.
-            if not data:
+            if data is None:
                 # No post data. Some calls change to GET with no post data.
                 if api_call_endpoint in self.api_methods['was no data get']:
                     return 'get'
@@ -215,7 +220,8 @@ class QGConnector(api_actions.QGActions):
                 data = data.lstrip('?')
                 data = data.rstrip('&')
                 # Convert to dictionary.
-                data = urllib.parse.parse_qs(data)
+                #data = urllib.parse.parse_qs(data)
+                data = urlparse(data)
                 logger.debug('Converted:\n%s' % str(data))
         elif api_version in ('am', 'was', 'am2'):
             if type(data) == etree._Element:

deps/qualysapi/setup.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
-
 from __future__ import absolute_import
 import os
 import setuptools
-import sys
+
 try:
     from setuptools import setup
 except ImportError:
@@ -35,7 +34,8 @@ setup(name=__pkgname__,
       keywords='Qualys QualysGuard API helper network security',
       url='https://github.com/austin-taylor/qualysapi',
       package_dir={'': '.'},
-      packages=setuptools.find_packages(),,
+      #packages=setuptools.find_packages(),
+      packages=['qualysapi',],
       # package_data={'qualysapi':['LICENSE']},
       # scripts=['src/scripts/qhostinfo.py', 'src/scripts/qscanhist.py', 'src/scripts/qreports.py'],
       long_description=read('README.md'),