Merge branch 'master' into development

# Conflicts:
#	bazarr/get_series.py
This commit is contained in:
Louis Vézina 2019-09-18 11:38:21 -04:00
commit f12f5df677
3 changed files with 3 additions and 19 deletions

View File

@ -1,17 +0,0 @@
---
name: Feature request
about: Suggest an idea for this project
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@ -24,7 +24,7 @@ You can reach us for support on [Discord](https://discord.gg/MH2e2eb).
If you find a bug, please open an issue on [Github](https://github.com/morpheus65535/bazarr/issues).
# Feature Requests
If you need something that is not already part of Bazarr, feel free to create a feature request on [Github](https://github.com/morpheus65535/bazarr/issues).
If you need something that is not already part of Bazarr, feel free to create a feature request on [Feature Upvote](http://features.bazarr.media).
## Major Features Include:

View File

@ -5,6 +5,7 @@ import time
import os
import sys
import platform
import re
from bazarr.get_args import args
@ -18,7 +19,7 @@ def check_python_version():
print "Python 3 isn't supported. Please use Python " + minimum_python_version + " or greater."
os._exit(0)
elif int(python_version[1]) < minimum_python_version_tuple[1] or int(python_version[2].rstrip('+')) < minimum_python_version_tuple[2]:
elif int(python_version[1]) < minimum_python_version_tuple[1] or int(re.search(r'\d+', python_version[2]).group()) < minimum_python_version_tuple[2]:
print "Python " + minimum_python_version + " or greater required. Current version is " + platform.python_version() + ". Please upgrade Python."
os._exit(0)