monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-18 08:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into dev

Browse source
This commit is contained in:
JackDandy 2023-09-22 23:09:45 +01:00
commit d0a5e1d60b
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.github/issue_template.md vendored
View file

@ -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) #### Branch version commit hash: (See the About page)
Expectation | Result 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:** **Steps to reproduce:**
*1)* Step to take *1)* Step to take
*2)* 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: Additional notes:
For example, any relevant config settings that may be help us replicate the reported issue 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

6
CHANGES.md
View file

@ -24,6 +24,12 @@
* Update urllib3 1.26.15 (25cca389) to 2.0.4 (af7c78f) * Update urllib3 1.26.15 (25cca389) to 2.0.4 (af7c78f)
### 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) ### 3.29.10 (2023-09-19 12:55:00 UTC)
* Fix Metacritic cards * Fix Metacritic cards

8
lib/pytvmaze/tvmaze.py
View file

@ -620,17 +620,17 @@ class NetworkBase(object):
self.timezone = None self.timezone = None
self.code = None self.code = None
def _get_coutnry(self): def _get_country(self):
c = '' c = ''
if self.country: if self.country:
c = ' (%s)' % self.country.name c = ' (%s)' % self.country
return c return c
def __unicode__(self): def __unicode__(self):
return '%s%s' % (self.name, self._get_coutnry()) return '%s%s' % (self.name, self._get_country())
def __str__(self): 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): class Network(NetworkBase):