From cc61d0188f33d33121b95564d9b55d486d5d4544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20V=C3=A9zina?=
 <5130500+morpheus65535@users.noreply.github.com>
Date: Sun, 16 Feb 2020 10:37:55 -0500
Subject: [PATCH] Fix for Python 2.7 compatibility regression.

---
 bazarr.py                                  | 5 ++++-
 libs/subliminal_patch/providers/subdivx.py | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bazarr.py b/bazarr.py
index be643ec23..8f1b7da03 100644
--- a/bazarr.py
+++ b/bazarr.py
@@ -117,7 +117,10 @@ def start_bazarr(process_registry=ProcessRegistry()):
     script = [sys.executable, "-u", os.path.normcase(os.path.join(dir_name, 'bazarr', 'main.py'))] + sys.argv[1:]
 
     print("Bazarr starting...")
-    ep = subprocess.Popen(script, stdout=None, stderr=None, stdin=subprocess.DEVNULL)
+    if PY3:
+        ep = subprocess.Popen(script, stdout=None, stderr=None, stdin=subprocess.DEVNULL)
+    else:
+        ep = subprocess.Popen(script, stdout=None, stderr=None, stdin=None)
     process_registry.register(ep)
     try:
         ep.wait()
diff --git a/libs/subliminal_patch/providers/subdivx.py b/libs/subliminal_patch/providers/subdivx.py
index d9339e9ae..69202ec88 100644
--- a/libs/subliminal_patch/providers/subdivx.py
+++ b/libs/subliminal_patch/providers/subdivx.py
@@ -9,7 +9,11 @@ import zipfile
 import rarfile
 from subzero.language import Language
 from requests import Session
-from urllib.parse import urlparse
+from six import PY2
+if PY2:
+    from urlparse import urlparse
+else:
+    from urllib.parse import urlparse
 
 from subliminal import __short_version__
 from subliminal.exceptions import ServiceUnavailable