More compatability changes

Update several compat changes that were missed or added since origional commits
- StringIO
- urllib
- print function

Author: shortdudey123

src/collectors/etcdstat/etcdstat.py

@@ -13,8 +13,8 @@
 """
 
 import diamond.collector
+import diamond.pycompat
 import json
-import urllib2
 
 METRICS_KEYS = ['sendPkgRate',
                 'recvPkgRate',
@@ -100,8 +100,8 @@ def get_metrics(self, category):
             url = "%s://%s:%s/v2/stats/%s" % (protocol, self.config['host'],
                                               self.config['port'], category)
 
-            return json.load(urllib2.urlopen(url, **opts))
-        except (urllib2.HTTPError, ValueError), err:
+            return json.load(diamond.pycompat.urlopen(url, **opts))
+        except (HTTPError, ValueError) as err:
             self.log.error('Unable to read JSON response: %s' % err)
             return {}
 

src/collectors/eventstoreprojections/eventstoreprojections.py

@@ -17,10 +17,9 @@
 
 """
 
-import urllib2
 import json
 import diamond.collector
-
+import diamond.pycompat
 
 class EventstoreProjectionsCollector(diamond.collector.Collector):
 
@@ -64,7 +63,7 @@ def _json_to_flat_metrics(self, prefix, data):
                 for k, v in self._json_to_flat_metrics(
                         "%s.%s" % (prefix, key), value):
                     yield k, v
-            elif isinstance(value, basestring):
+            elif isinstance(value, str):
                 if value == "Running":
                     value = 1
                     yield ("%s.%s" % (prefix, key), value)
@@ -91,12 +90,12 @@ def collect(self):
             self.config['route']
         )
 
-        req = urllib2.Request(eventstore_host, headers=self.config['headers'])
+        req = diamond.pycompat.Request(eventstore_host, headers=self.config['headers'])
         req.add_header('Content-type', 'application/json')
 
         try:
-            resp = urllib2.urlopen(req)
-        except urllib2.URLError as e:
+            resp = diamond.pycompat.urlopen(req)
+        except URLError as e:
             self.log.error("Can't open url %s. %s", eventstore_host, e)
         else:
             content = resp.read()

src/collectors/fluentd/fluentd.py

@@ -20,7 +20,7 @@
 """
 
 import diamond.collector
-import urllib2
+import diamond.pycompat
 import json
 
 

src/collectors/jolokia/jolokia.py

@@ -139,7 +139,7 @@ def __init__(self, *args, **kwargs):
 
         self.domains = []
         if 'domains' in self.config:
-            if isinstance(self.config['domains'], basestring):
+            if isinstance(self.config['domains'], str):
                 for domain in self.config['domains'].split('|'):
                     self.domains.append(domain.strip())
             elif isinstance(self.config['domains'], list):

src/collectors/mesos_cgroup/mesos_cgroup.py

@@ -23,8 +23,8 @@
 """
 
 import diamond.collector
+import diamond.pycompat
 import json
-import urllib2
 import os
 
 
@@ -125,8 +125,8 @@ def get_mesos_state(self):
                                        self.config['port'],
                                        self.config['mesos_state_path'])
 
-            return json.load(urllib2.urlopen(url))
-        except (urllib2.HTTPError, ValueError), err:
+            return json.load(diamond.pycompat.urlopen(url))
+        except (HTTPError, ValueError) as err:
             self.log.error('Unable to read JSON response: %s' % err)
             return {}
 

src/collectors/mesos_cgroup/test/testmesos_cgroup.py

@@ -35,7 +35,7 @@ def urlopen_se(url):
             if url == 'http://localhost:5051/state.json':
                 return self.getFixture('state.json')
             else:
-                print url
+                print(url)
                 raise NotImplementedError()
 
         def listdir_se(directory):
@@ -48,7 +48,7 @@ def listdir_se(directory):
             if directory in cgroup_directories:
                 return ["b0d5971e-915c-414b-aa25-0da46e64ff4e"]
             else:
-                print directory
+                print(directory)
                 raise NotImplementedError()
 
         def isdir_se(directory):
@@ -61,7 +61,7 @@ def isdir_se(directory):
             if directory in task_directories:
                 return True
             else:
-                print directory
+                print(directory)
                 raise NotImplementedError()
 
         def open_se(path, mode='r', create=True):

src/collectors/xfs/test/testxfs.py

@@ -8,10 +8,7 @@
 from test import Mock
 from test import patch
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from test import StringIO
 
 from diamond.collector import Collector
 from xfs import XFSCollector

src/diamond/handler/tsdb.py

@@ -77,7 +77,7 @@ def __init__(self, config=None):
         self.timeout = int(self.config['timeout'])
         self.metric_format = str(self.config['format'])
         self.tags = ""
-        if isinstance(self.config['tags'], basestring):
+        if isinstance(self.config['tags'], str):
             self.tags = self.config['tags']
         elif isinstance(self.config['tags'], list):
             for tag in self.config['tags']: