Merge tag 'upstream/2014.11.21'

[youtubedl] / youtube_dl / extractor / tinypic.py

diff --git a/youtube_dl/extractor/tinypic.py b/youtube_dl/extractor/tinypic.py
index 2246d27b2f741047eb6b53ad0e4f54e79293294b..a4aa25f661223301b9d16c7ac87b6c502aa0e0ff 100644 (file)
--- a/youtube_dl/extractor/tinypic.py
+++ b/youtube_dl/extractor/tinypic.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from youtube_dl.utils import ExtractorError
+from ..utils import ExtractorError
 
 
 class TinyPicIE(InfoExtractor):