Fix imports and general cleanup

[youtube-dl] / youtube_dl / extractor / spankwire.py

diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dl/extractor/spankwire.py
index 21491027ab2119a966d3ccca4b127c55c7de4644..b936202f6f3005fe9ae085724566d709c6a484cc 100644 (file)
--- a/youtube_dl/extractor/spankwire.py
+++ b/youtube_dl/extractor/spankwire.py
@@ -3,12 +3,14 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..utils import (
+from ..compat import (
+    compat_urllib_parse,
     compat_urllib_parse_urlparse,
     compat_urllib_request,
-    compat_urllib_parse,
-    unified_strdate,
+)
+from ..utils import (
     str_to_int,
+    unified_strdate,
 )
 from ..aes import aes_decrypt_text
 
@@ -45,7 +47,7 @@ class SpankwireIE(InfoExtractor):
             r'<div\s+id="descriptionContent">([^<]+)<',
             webpage, 'description', fatal=False)
         thumbnail = self._html_search_regex(
-            r'playerData\.screenShot\s*=\s*"([^"]+)"',
+            r'playerData\.screenShot\s*=\s*["\']([^"\']+)["\']',
             webpage, 'thumbnail', fatal=False)
 
         uploader = self._html_search_regex(
@@ -67,7 +69,7 @@ class SpankwireIE(InfoExtractor):
 
         video_urls = list(map(
             compat_urllib_parse.unquote,
-            re.findall(r'playerData\.cdnPath[0-9]{3,}\s*=\s*"([^"]+)', webpage)))
+            re.findall(r'playerData\.cdnPath[0-9]{3,}\s*=\s*["\']([^"\']+)["\']', webpage)))
         if webpage.find('flashvars\.encrypted = "true"') != -1:
             password = self._html_search_regex(
                 r'flashvars\.video_title = "([^"]+)',