Merge branch 'fix-stringio-python2.7' of git://github.com/aelse/collectd

diff --git a/contrib/collectd_network.py b/contrib/collectd_network.py
index dc6cdac4f997fecbaf2d68d5548195aa302dcfed..809f19dee65d2ec89a030a762bacb5e98041d8aa 100644 (file)
--- 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