projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6a5af6a
)
[golem] Don't omit positional argument specifiers
author
Mats
<d912e3@gmail.com>
Sat, 27 Sep 2014 17:35:55 +0000
(19:35 +0200)
committer
Mats
<d912e3@gmail.com>
Sat, 27 Sep 2014 17:35:55 +0000
(19:35 +0200)
Required by Python 2.6.
youtube_dl/extractor/golem.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/golem.py
b/youtube_dl/extractor/golem.py
index afb620b1cc6daa25456a2ead60c5bc564341b79d..6a64b5d95f203409aa980d657d81b5c64633ba47 100644
(file)
--- a/
youtube_dl/extractor/golem.py
+++ b/
youtube_dl/extractor/golem.py
@@
-22,7
+22,7
@@
class GolemIE(InfoExtractor):
}
}
}
}
- _CONFIG = 'https://video.golem.de/xml/{}.xml'
+ _CONFIG = 'https://video.golem.de/xml/{
0
}.xml'
_PREFIX = 'http://video.golem.de'
def _warn(self, fmt, *args):
_PREFIX = 'http://video.golem.de'
def _warn(self, fmt, *args):
@@
-33,7
+33,7
@@
class GolemIE(InfoExtractor):
url = elem.findtext('./url')
if url == '':
url = elem.findtext('./url')
if url == '':
- self._warn("{}: url: empty, skipping", format_id)
+ self._warn("{
0
}: url: empty, skipping", format_id)
return None
fmt = {
return None
fmt = {
@@
-44,7
+44,7
@@
class GolemIE(InfoExtractor):
try:
_, ext = elem.findtext('./filename', '').rsplit('.', 1)
except ValueError:
try:
_, ext = elem.findtext('./filename', '').rsplit('.', 1)
except ValueError:
- self._warn('{}: ext: missing extension', format_id)
+ self._warn('{
0
}: ext: missing extension', format_id)
else:
fmt['ext'] = ext
else:
fmt['ext'] = ext
@@
-53,21
+53,21
@@
class GolemIE(InfoExtractor):
try:
fmt['filesize'] = int(filesize)
except ValueError as e:
try:
fmt['filesize'] = int(filesize)
except ValueError as e:
- self._warn('{
}: filesize: {
}', format_id, e)
+ self._warn('{
0}: filesize: {1
}', format_id, e)
width = elem.get('width')
if width is not None:
try:
fmt['width'] = int(width)
except ValueError as e:
width = elem.get('width')
if width is not None:
try:
fmt['width'] = int(width)
except ValueError as e:
- self._warn('{
}: width: {
}', format_id, e)
+ self._warn('{
0}: width: {1
}', format_id, e)
height = elem.get('height')
if height is not None:
try:
fmt['height'] = int(height)
except ValueError as e:
height = elem.get('height')
if height is not None:
try:
fmt['height'] = int(height)
except ValueError as e:
- self._warn('{
}: height: {
}', format_id, e)
+ self._warn('{
0}: height: {1
}', format_id, e)
return fmt
return fmt
@@
-84,14
+84,14
@@
class GolemIE(InfoExtractor):
try:
thumb['width'] = int(width)
except ValueError as e:
try:
thumb['width'] = int(width)
except ValueError as e:
- self._warn('thumbnail: width: {}', e)
+ self._warn('thumbnail: width: {
0
}', e)
height = elem.get('height')
if height is not None:
try:
thumb['height'] = int(height)
except ValueError as e:
height = elem.get('height')
if height is not None:
try:
thumb['height'] = int(height)
except ValueError as e:
- self._warn('thumbnail: height: {}', e)
+ self._warn('thumbnail: height: {
0
}', e)
return thumb
return thumb
@@
-126,6
+126,6
@@
class GolemIE(InfoExtractor):
try:
info['duration'] = round(float(playtime))
except ValueError as e:
try:
info['duration'] = round(float(playtime))
except ValueError as e:
- self._warn('duration: {}', e)
+ self._warn('duration: {
0
}', e)
return info
return info