Merge tag 'upstream/2015.07.21'

[youtubedl] / youtube_dl / extractor / sharesix.py

diff --git a/youtube_dl/extractor/sharesix.py b/youtube_dl/extractor/sharesix.py
index 7531e8325bf88e3d89958dca1107334c41b78c6c..ac3e3adf22ad194a8af3e833ae4d8acf7484e8b4 100644 (file)
--- a/youtube_dl/extractor/sharesix.py
+++ b/youtube_dl/extractor/sharesix.py
@@ -4,9 +4,11 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_urllib_parse,
     compat_urllib_request,
     compat_urllib_parse,
     compat_urllib_request,

+)
+from ..utils import (

     parse_duration,
 )
 
     parse_duration,
 )