Correctly check that the given serie name has the correct type

Grégory Starck · Grégory Starck · commit bd38f28059a6 · 2015-04-09T13:39:56.000-04:00
type(b''.decode()) should give unicode or str depending if on python&lt;3 or python&gt;=3.
diff --git a/influxdb/resultset.py b/influxdb/resultset.py
@@ -11,10 +11,13 @@ def __init__(self, series):
 
     def __getitem__(self, key):
         """
-        :param key: Either a serie name or a 2-tuple(serie_name, tags_dict)
-                    If the given serie name is None then any serie (matching
-                    the eventual given tags) will be given its points one
+        :param key: Either a serie name, or a tags_dict, or
+                    a 2-tuple(serie_name, tags_dict).
+                    If the serie name is None (or not given) then any serie
+                    matching the eventual given tags will be given its points one
                     after the other.
+                    To get the points of every serie in this resultset then
+                    you have to provide None as key.
         :return: A generator yielding `Point`s matching the given key.
         NB:
         The order in which the points are yielded is actually undefined but
@@ -25,7 +28,7 @@ def __getitem__(self, key):
                 raise TypeError('only 2-tuples allowed')
             name = key[0]
             tags = key[1]
-            if not isinstance(tags, dict) and tags is not None:
+            if not isinstance(tags, dict):
                 raise TypeError('tags should be a dict')
         elif isinstance(key, dict):
             name = None
@@ -34,10 +37,8 @@ def __getitem__(self, key):
             name = key
             tags = 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')
+        if not isinstance(name, (bytes, type(b''.decode()), type(None))):
+            raise TypeError('serie_name must be an str or None')
 
         for serie in self._get_series():
             serie_name = serie.get('name', 'results')
