From 93f762887462710fddf18e8c9b7923ff5efb15b6 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Mon, 7 Oct 2019 13:46:38 -0700 Subject: [PATCH] Make helper.itemgetter_with_default function return a tuple to act more like operator.itemgetter --- varken/helpers.py | 4 ++-- varken/tautulli.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/varken/helpers.py b/varken/helpers.py index e80cff9..0dc43bc 100644 --- a/varken/helpers.py +++ b/varken/helpers.py @@ -204,5 +204,5 @@ def boolcheck(var): else: return False -def itemgetter_with_default(defaults): - return lambda obj: {k: obj.get(k, v) for k, v in defaults.items()} +def itemgetter_with_default(**defaults): + return lambda obj: tuple(obj.get(k, v) for k, v in defaults.items()) diff --git a/varken/tautulli.py b/varken/tautulli.py index effbfc7..292ad55 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -40,10 +40,10 @@ class TautulliAPI(object): if session.get('_cache_time'): del session['_cache_time'] - fields = itemgetter_with_default(*TautulliStream._field_defaults) + fields = itemgetter_with_default(**TautulliStream._field_defaults) try: - sessions = [TautulliStream(**fields(session)) for session in get['sessions']] + sessions = [TautulliStream(*fields(session)) for session in get['sessions']] except TypeError as e: self.logger.error('TypeError has occurred : %s while creating TautulliStream structure', e) return