youtube-dl

commit dcdfd1c711562380cea87a263de9e9e35ffbf20e
parent 409a16cb7220380b0f62efca4a61546e6a6bcfe2
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Mon,  3 Mar 2014 12:05:59 +0100

Merge remote-tracking branch 'origin/master'

Diffstat:
M
youtube_dl/extractor/fourtube.py
 | 
2
+-
M
youtube_dl/extractor/tinypic.py
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/fourtube.py b/youtube_dl/extractor/fourtube.py
@@ -8,8 +8,8 @@ from ..utils import (
     unified_strdate,
     str_to_int,
     parse_duration,
+    clean_html,
 )
-from youtube_dl.utils import clean_html
 
 
 class FourTubeIE(InfoExtractor):
diff --git 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):