Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Correctly check that the given serie name has the correct type #157

Merged
merged 1 commit into from
Apr 9, 2015
Merged

Correctly check that the given serie name has the correct type #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions influxdb/resultset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
after the other.
: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
Expand All @@ -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')
Expand Down