X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fcollectd_network.py;h=cb328f2b23a69166036793a6e40a12b96ac74e2e;hb=3bca49fd7fab14c19eb91d3b465a554361c1bf7f;hp=dc6cdac4f997fecbaf2d68d5548195aa302dcfed;hpb=f23f80cf88cbb97a088dfdcb0e70c668d7e5c7ff;p=collectd.git diff --git a/contrib/collectd_network.py b/contrib/collectd_network.py index dc6cdac4..cb328f2b 100644 --- a/contrib/collectd_network.py +++ b/contrib/collectd_network.py @@ -16,11 +16,16 @@ Collectd network protocol implementation. """ -import socket,struct,sys -try: - from io import StringIO -except ImportError: - from cStringIO import StringIO +import socket,struct +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