From b95da07dc9a7507c90b0fecc3ecac2d400c69ff9 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Thu, 21 Sep 2023 11:28:16 +0100 Subject: [PATCH 1/3] Update issue template --- .github/issue_template.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/issue_template.md b/.github/issue_template.md index 7f2945fa..c417e2e9 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,22 +1,25 @@ -#### Branch: The name of the branch (e.g. master or develop) +#### Branch: Insert the name of the branch (e.g. main or dev) #### Branch version commit hash: (See the About page) Expectation | Result ------------ | ------------- -Your expectation paragraph(s) text here. Before the bar >> | then, your result paragraph(s) text here. +Insert your expectation text here (one line) before the bar -> | <- after the bar, your result text here **Steps to reproduce:** *1)* Step to take *2)* Step to take -... +... etc. -Either a link to gist (best as they are easily deleted) or log text wrapped in "pre" tags +``` +paste log text here or even better, a link to a Github Gist (using menu `[+]`) (best as easily removed) +``` Additional notes: + For example, any relevant config settings that may be help us replicate the reported issue -Targeting your info so that the issue can be reproduced is the single fastest way to get it resolved +Good info helps replicate the issue and is the fastest way to get it resolved From 150a7c99190ba9784f422146e8c6ace942cb08f2 Mon Sep 17 00:00:00 2001 From: Prinz23 Date: Fri, 22 Sep 2023 17:23:02 +0200 Subject: [PATCH 2/3] fix bug in pytvmaze NetworkBase --- lib/pytvmaze/tvmaze.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pytvmaze/tvmaze.py b/lib/pytvmaze/tvmaze.py index 23931de5..1dd7a966 100644 --- a/lib/pytvmaze/tvmaze.py +++ b/lib/pytvmaze/tvmaze.py @@ -623,7 +623,7 @@ class NetworkBase(object): def _get_coutnry(self): c = '' if self.country: - c = ' (%s)' % self.country.name + c = ' (%s)' % self.country return c def __unicode__(self): From b7d5f4587c4b7a43177e853b2e60975c37bba234 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Fri, 22 Sep 2023 23:04:40 +0100 Subject: [PATCH 3/3] Tweak --- CHANGES.md | 8 +++++++- lib/pytvmaze/tvmaze.py | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 66d07e9d..ec0a33c9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,10 @@ -### 3.29.10 (2023-09-19 12:55:00 UTC) +### 3.29.11 (2023-09-22 23:00:00 UTC) + +* Fix pytvmaze country handling in NetworkBase +* Update issue template + + +### 3.29.10 (2023-09-19 12:55:00 UTC) * Fix Metacritic cards * Fix Linux CI tests diff --git a/lib/pytvmaze/tvmaze.py b/lib/pytvmaze/tvmaze.py index 1dd7a966..24b4f8ed 100644 --- a/lib/pytvmaze/tvmaze.py +++ b/lib/pytvmaze/tvmaze.py @@ -620,17 +620,17 @@ class NetworkBase(object): self.timezone = None self.code = None - def _get_coutnry(self): + def _get_country(self): c = '' if self.country: c = ' (%s)' % self.country return c def __unicode__(self): - return '%s%s' % (self.name, self._get_coutnry()) + return '%s%s' % (self.name, self._get_country()) def __str__(self): - return _valid_encoding('%s%s' % (self.name, self._get_coutnry())) + return _valid_encoding('%s%s' % (self.name, self._get_country())) class Network(NetworkBase):