From a461961c84ccb9724f979019647653463ba7a031 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Wed, 21 Jan 2015 16:07:24 +0000 Subject: [PATCH] Add handling of exceptional case with missing network name (NoneType) in Episode View. A show should always have an original broadcaster (network), however, user input errors mean that a show can get added without this fundamental detail. --- CHANGES.md | 1 + sickbeard/webapi.py | 4 +++- sickbeard/webserve.py | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 31f443ec..20bc2878 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,7 @@ * Change anime release groups to in memory storage for lowered latency * Change adjust menu delay and hover styling * Fix provider list color +* Add handling of exceptional case with missing network name (NoneType) in Episode View [develop changelog] diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py index 3999fbc2..518cb30c 100644 --- a/sickbeard/webapi.py +++ b/sickbeard/webapi.py @@ -768,7 +768,9 @@ class CMD_ComingEpisodes(ApiCall): (b['data_show_name'], b['parsed_datetime'], b['season'], b['episode']))) } - def value_maybe_article(value=''): + def value_maybe_article(value=None): + if None is value: + return '' return (remove_article(value.lower()), value.lower())[sickbeard.SORT_ARTICLE] # add parsed_datetime to the dict diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 7a53119c..1dad92af 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -415,7 +415,9 @@ class MainHandler(RequestHandler): (b['localtime'], b['data_show_name'], b['season'], b['episode']))) } - def value_maybe_article(value=''): + def value_maybe_article(value=None): + if None is value: + return '' return (remove_article(value.lower()), value.lower())[sickbeard.SORT_ARTICLE] # add localtime to the dict