diff options
author | Tomaszewski, PawelX <pawelx.tomaszewski@intel.com> | 2019-11-13 04:35:06 -0800 |
---|---|---|
committer | Emma Foley <efoley@redhat.com> | 2019-12-18 12:07:44 +0000 |
commit | 5c5859e105511480e0e920a59c6fcfa2295400ea (patch) | |
tree | 1b3f8cfa9afdf98bfdf21ac14a76ec37be017a6f /3rd_party/collectd-ves-app/ves_app/ves_app.py | |
parent | 32d15ec5f1f2f0277fb7a6d03603498f169ed19d (diff) |
Python 2 to 3 migration fixes
Change-Id: I487632435ae575c2507e58ee5682aa03934391b8
Signed-off-by: Pawel Tomaszewski <pawelx.tomaszewski@intel.com>
Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
(cherry picked from commit 96015a4a509dc7feb622f97325e8eb39896cc5e3)
Diffstat (limited to '3rd_party/collectd-ves-app/ves_app/ves_app.py')
-rw-r--r-- | 3rd_party/collectd-ves-app/ves_app/ves_app.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/3rd_party/collectd-ves-app/ves_app/ves_app.py b/3rd_party/collectd-ves-app/ves_app/ves_app.py index fa4e9349..a8551239 100644 --- a/3rd_party/collectd-ves-app/ves_app/ves_app.py +++ b/3rd_party/collectd-ves-app/ves_app/ves_app.py @@ -15,17 +15,26 @@ import json import sys import base64 -import configparser import logging import argparse +try: + import configparser +except ImportError: + import ConfigParser as configparser + from distutils.util import strtobool from kafka import KafkaConsumer from .normalizer import Normalizer from .normalizer import CollectdValue -import urllib.request as url +try: + # For Python 3.0 and later + import urllib.request as url +except ImportError: + # Fall back to Python 2's urllib2 + import urllib2 as url class VESApp(Normalizer): """VES Application""" |