X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fcollectd_network.py;h=9c1e9fb1ba7aad1877ba90bb3cb5bf86315d1d06;hb=0bdc3011ce40cbbd23dd62aff56a150d5b921fb9;hp=9af0fb008a72790e48562e7e6440c3bec8c6dd2a;hpb=5347744b510e0a94639905e0263689bf46d90de2;p=collectd.git diff --git a/contrib/collectd_network.py b/contrib/collectd_network.py index 9af0fb00..9c1e9fb1 100644 --- a/contrib/collectd_network.py +++ b/contrib/collectd_network.py @@ -17,10 +17,15 @@ Collectd network protocol implementation. """ import socket,struct,sys -try: - from io import StringIO -except ImportError: - from cStringIO import StringIO +import platform +if platform.python_version() < '2.8.0': + # Python 2.7 and below io.StringIO does not like unicode + from StringIO import StringIO +else: + try: + from io import StringIO + except ImportError: + from cStringIO import StringIO from datetime import datetime from copy import deepcopy