Fix imports and general cleanup

· Import from compat what comes from compat. Yes, some names are available in utils too, but that's an implementation detail.
· Use _match_id consistently whenever possible
· Fix some outdated tests
· Use consistent valid URL (always match the whole protocol, no ^ at start required)
· Use modern test definitions
This commit is contained in:
Philipp Hagemeister 2014-12-13 12:24:42 +01:00
parent 20e35880bf
commit 1cc79574fc
120 changed files with 443 additions and 384 deletions

View file

@ -1,13 +1,16 @@
# coding: utf-8
from __future__ import unicode_literals
from ..utils import (
ExtractorError,
import re
from ..compat import (
compat_urllib_parse,
compat_urllib_request,
determine_ext,
)
import re
from ..utils import (
determine_ext,
ExtractorError,
)
from .common import InfoExtractor
@ -27,9 +30,7 @@ class SockshareIE(InfoExtractor):
}
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
video_id = self._match_id(url)
url = 'http://sockshare.com/file/%s' % video_id
webpage = self._download_webpage(url, video_id)