Merge remote-tracking branch 'origin/master'

2014-03-03 12:05:59 +01:00 · 2014-03-03 12:05:59 +01:00 · dcdfd1c711
parent 409a16cb72 2c39b0c695
commit dcdfd1c711
2 changed files with 2 additions and 2 deletions
--- 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):
--- 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):