Python3.2 fixes

aviau · aviau · commit b9430f9ad636 · 2015-04-08T22:17:05.000-04:00
diff --git a/influxdb/resultset.py b/influxdb/resultset.py
@@ -30,8 +30,10 @@ def __getitem__(self, key):
         else:
             name = key
             tags = None
-        if not isinstance(name, (str, type(None), type(u''))):
-            raise TypeError('serie_name must be an str or None')
+        # TODO(aviau): Fix for python 3.2
+        # if not isinstance(name, (str, bytes, type(None))) \
+        #        and not isinstance(name, type("".decode("utf-8"))):
+        #    raise TypeError('serie_name must be an str or None')
 
         for serie in self._get_series():
             serie_name = serie.get('name', 'results')
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -269,7 +269,7 @@ def test_query(self):
 
             self.assertListEqual(
                 list(rs['cpu_load_short']),
-                [{'value': 0.64, 'time': u'2009-11-10T23:00:00Z'}]
+                [{'value': 0.64, 'time': '2009-11-10T23:00:00Z'}]
             )
 
     @unittest.skip('Not implemented for 0.9')
@@ -386,7 +386,7 @@ def test_get_list_series(self):
                 self.cli.get_list_series(),
                 [{'name': 'cpu_load_short',
                   'tags': [
-                      {'host': 'server01', '_id': 1, 'region': u'us-west'}
+                      {'host': 'server01', '_id': 1, 'region': 'us-west'}
                   ]}]
             )
 
diff --git a/tests/influxdb/client_test_with_server.py b/tests/influxdb/client_test_with_server.py
@@ -523,8 +523,8 @@ def test_get_list_series_non_empty(self):
         self.assertEqual(
             [
                 {'name': 'cpu_load_short',
-                 'tags': [{u'host': u'server01', u'_id': 1,
-                           u'region': u'us-west'}]}
+                 'tags': [{'host': 'server01', '_id': 1,
+                           'region': 'us-west'}]}
             ],
             rsp
         )
diff --git a/tests/influxdb/resultset_test.py b/tests/influxdb/resultset_test.py
@@ -111,13 +111,13 @@ def test_point_from_cols_vals(self):
 
     def test_system_query(self):
         rs = ResultSet(
-            {u'results': [
-                {u'series': [
-                    {u'values': [[u'another', u'48h0m0s', 3, False],
-                                 [u'default', u'0', 1, False],
-                                 [u'somename', u'24h0m0s', 4, True]],
-                     u'columns': [u'name', u'duration',
-                                  u'replicaN', u'default']}]}
+            {'results': [
+                {'series': [
+                    {'values': [['another', '48h0m0s', 3, False],
+                                ['default', '0', 1, False],
+                                ['somename', '24h0m0s', 4, True]],
+                     'columns': ['name', 'duration',
+                                 'replicaN', 'default']}]}
             ]
             }
         )
@@ -130,11 +130,11 @@ def test_system_query(self):
         self.assertEqual(
             list(rs['results']),
             [
-                {'duration': u'48h0m0s', u'default': False, u'replicaN': 3,
-                 u'name': u'another'},
-                {u'duration': u'0', u'default': False, u'replicaN': 1,
-                 u'name': u'default'},
-                {u'duration': u'24h0m0s', u'default': True, u'replicaN': 4,
-                 u'name': u'somename'}
+                {'duration': '48h0m0s', 'default': False, 'replicaN': 3,
+                 'name': 'another'},
+                {'duration': '0', 'default': False, 'replicaN': 1,
+                 'name': 'default'},
+                {'duration': '24h0m0s', 'default': True, 'replicaN': 4,
+                 'name': 'somename'}
             ]
         )

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ def test_query(self):`
`269`	`269`
`270`	`270`	`self.assertListEqual(`
`271`	`271`	`list(rs['cpu_load_short']),`
`272`		`- [{'value': 0.64, 'time': u'2009-11-10T23:00:00Z'}]`
	`272`	`+ [{'value': 0.64, 'time': '2009-11-10T23:00:00Z'}]`
`273`	`273`	`)`
`274`	`274`
`275`	`275`	`@unittest.skip('Not implemented for 0.9')`
`@@ -386,7 +386,7 @@ def test_get_list_series(self):`
`386`	`386`	`self.cli.get_list_series(),`
`387`	`387`	`[{'name': 'cpu_load_short',`
`388`	`388`	`'tags': [`
`389`		`- {'host': 'server01', '_id': 1, 'region': u'us-west'}`
	`389`	`+ {'host': 'server01', '_id': 1, 'region': 'us-west'}`
`390`	`390`	`]}]`
`391`	`391`	`)`
`392`	`392`
Original file line number	Diff line number	Diff line change
`@@ -523,8 +523,8 @@ def test_get_list_series_non_empty(self):`
`523`	`523`	`self.assertEqual(`
`524`	`524`	`[`
`525`	`525`	`{'name': 'cpu_load_short',`
`526`		`- 'tags': [{u'host': u'server01', u'_id': 1,`
`527`		`- u'region': u'us-west'}]}`
	`526`	`+ 'tags': [{'host': 'server01', '_id': 1,`
	`527`	`+ 'region': 'us-west'}]}`
`528`	`528`	`],`
`529`	`529`	`rsp`
`530`	`530`	`)`