dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Philipp Hagemeister 2014-03-03 12:05:59 +01:00
parent 409a16cb72 2c39b0c695
commit dcdfd1c711
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/fourtube.py
View File

@ -8,8 +8,8 @@ from ..utils import (
unified_strdate, unified_strdate,
str_to_int, str_to_int,
parse_duration, parse_duration,
clean_html,
) )
from youtube_dl.utils import clean_html
class FourTubeIE(InfoExtractor): class FourTubeIE(InfoExtractor):

2
youtube_dl/extractor/tinypic.py
View File

@ -3,7 +3,7 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from youtube_dl.utils import ExtractorError from ..utils import ExtractorError
class TinyPicIE(InfoExtractor): class TinyPicIE(InfoExtractor):