diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-03-03 12:05:59 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-03-03 12:05:59 +0100 |
| commit | dcdfd1c711562380cea87a263de9e9e35ffbf20e (patch) | |
| tree | 2dc2a4abf17c4badcf15bcb1d7a1d2ae0d0d602b | |
| parent | 409a16cb7220380b0f62efca4a61546e6a6bcfe2 (diff) | |
| parent | 2c39b0c695f4bd2a7f45c4818827fad4aaa6f0dc (diff) | |
| download | youtube-dl-dcdfd1c711562380cea87a263de9e9e35ffbf20e.tar.gz youtube-dl-dcdfd1c711562380cea87a263de9e9e35ffbf20e.tar.xz youtube-dl-dcdfd1c711562380cea87a263de9e9e35ffbf20e.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | youtube_dl/extractor/fourtube.py | 2 | ||||
| -rw-r--r-- | 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 index 8db7fc6cb..7d56b9be9 100644 --- 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 index 2246d27b2..a4aa25f66 100644 --- 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): |