aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-03-24 02:15:31 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-03-24 02:15:31 +0100
commit83622b6d2fcc265be8427580412581fe64390bb0 (patch)
tree6a883d0d9a9989781a1e8e51ffe697c14122b399 /youtube_dl/extractor
parent3d87426c2de02d7b3ac1153338066cdf6d1ffcad (diff)
[soundcloud] Simplify string literals
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/soundcloud.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dl/extractor/soundcloud.py
index 2f254f023..36655b51e 100644
--- a/youtube_dl/extractor/soundcloud.py
+++ b/youtube_dl/extractor/soundcloud.py
@@ -100,7 +100,7 @@ class SoundcloudIE(InfoExtractor):
def report_resolve(self, video_id):
"""Report information extraction."""
- self.to_screen(u'%s: Resolving id' % video_id)
+ self.to_screen('%s: Resolving id' % video_id)
@classmethod
def _resolv_url(cls, url):
@@ -146,14 +146,14 @@ class SoundcloudIE(InfoExtractor):
formats = []
format_dict = json.loads(stream_json)
for key, stream_url in format_dict.items():
- if key.startswith(u'http'):
+ if key.startswith('http'):
formats.append({
'format_id': key,
'ext': ext,
'url': stream_url,
'vcodec': 'none',
})
- elif key.startswith(u'rtmp'):
+ elif key.startswith('rtmp'):
# The url doesn't have an rtmp app, we have to extract the playpath
url, path = stream_url.split('mp3:', 1)
formats.append({
@@ -188,7 +188,7 @@ class SoundcloudIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url, flags=re.VERBOSE)
if mobj is None:
- raise ExtractorError(u'Invalid URL: %s' % url)
+ raise ExtractorError('Invalid URL: %s' % url)
track_id = mobj.group('track_id')
token = None
@@ -226,7 +226,7 @@ class SoundcloudSetIE(SoundcloudIE):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
if mobj is None:
- raise ExtractorError(u'Invalid URL: %s' % url)
+ raise ExtractorError('Invalid URL: %s' % url)
# extract uploader (which is in the url)
uploader = mobj.group(1)
@@ -243,7 +243,7 @@ class SoundcloudSetIE(SoundcloudIE):
info = json.loads(info_json)
if 'errors' in info:
for err in info['errors']:
- self._downloader.report_error(u'unable to download video webpage: %s' % compat_str(err['error_message']))
+ self._downloader.report_error('unable to download video webpage: %s' % compat_str(err['error_message']))
return
self.report_extraction(full_title)