Merge branch 'development' into python3

# Conflicts:
#	bazarr.py
#	bazarr/get_subtitle.py

1 files changed, 2 insertions, 1 deletions

diff --git a/bazarr.py b/bazarr.py
index 12a3e382b..04ef801e7 100644
--- a/bazarr.py
+++ b/bazarr.py
@@ -7,6 +7,7 @@ import time
 import os
 import sys
 import platform
+import re
 
 from bazarr.get_args import args
 
@@ -22,7 +23,7 @@ def check_python_version():
         print("Python " + minimum_python3_version + " or greater required. Current version is " + platform.python_version() + ". Please upgrade Python.")
         os._exit(0)
 
-    elif int(python_version[0]) == minimum_python_version_tuple[0] and (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)