Merge tag 'upstream/2015.02.06'

[youtubedl] / youtube_dl / extractor / golem.py

diff --git a/youtube_dl/extractor/golem.py b/youtube_dl/extractor/golem.py
index 53714f47f1a0a8cd1abb8aab0ec09cdbd283d51b..2bfb9904022c6a3830901baa2ee380b6f4f14714 100644 (file)
--- a/youtube_dl/extractor/golem.py
+++ b/youtube_dl/extractor/golem.py
@@ -2,8 +2,10 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from ..utils import (
+from ..compat import (
     compat_urlparse,
+)
+from ..utils import (
     determine_ext,
 )