Removed unused variables and expressions

devscripts/gh-pages/update-sites.py

@@ -21,7 +21,7 @@ def main():
             continue
         elif ie_desc is not None:
             ie_html += ': {}'.format(ie.IE_DESC)
-        if ie.working() == False:
+        if not ie.working():
             ie_html += ' (Currently broken)'
         ie_htmls.append('<li>{}</li>'.format(ie_html))
 

youtube_dl/extractor/appletrailers.py

@@ -119,7 +119,6 @@ class AppleTrailersIE(InfoExtractor):
             playlist.append({
                 '_type': 'video',
                 'id': video_id,
-                'title': title,
                 'formats': formats,
                 'title': title,
                 'duration': duration,

youtube_dl/extractor/crunchyroll.py

@@ -76,12 +76,6 @@ class CrunchyrollIE(InfoExtractor):
             return shaHash + [0] * 12
 
         key = obfuscate_key(id)
-        class Counter:
-            __value = iv
-            def next_value(self):
-                temp = self.__value
-                self.__value = inc(self.__value)
-                return temp
         decrypted_data = intlist_to_bytes(aes_cbc_decrypt(data, key, iv))
         return zlib.decompress(decrypted_data)
 
@@ -159,7 +153,7 @@ class CrunchyrollIE(InfoExtractor):
 
         subtitles = {}
         for sub_id, sub_name in re.findall(r'\?ssid=([0-9]+)" title="([^"]+)', webpage):
-            sub_page = self._download_webpage('http://www.crunchyroll.com/xml/?req=RpcApiSubtitle_GetXml&subtitle_script_id='+sub_id,\
+            sub_page = self._download_webpage('http://www.crunchyroll.com/xml/?req=RpcApiSubtitle_GetXml&subtitle_script_id='+sub_id,
                                               video_id, note='Downloading subtitles for '+sub_name)
             id = self._search_regex(r'id=\'([0-9]+)', sub_page, 'subtitle_id', fatal=False)
             iv = self._search_regex(r'<iv>([^<]+)', sub_page, 'subtitle_iv', fatal=False)

youtube_dl/extractor/mixcloud.py

@@ -41,7 +41,7 @@ class MixcloudIE(InfoExtractor):
                 self._request_webpage(url, None, False)
                 return url
             except ExtractorError:
-                url = None
+                pass
 
         return None
 

youtube_dl/extractor/mtv.py

@@ -204,7 +204,7 @@ class MTVIE(MTVServicesInfoExtractor):
             m_vevo = re.search(r'isVevoVideo = true;.*?vevoVideoId = "(.*?)";',
                                webpage, re.DOTALL)
             if m_vevo:
-                vevo_id = m_vevo.group(1);
+                vevo_id = m_vevo.group(1)
                 self.to_screen('Vevo video detected: %s' % vevo_id)
                 return self.url_result('vevo:%s' % vevo_id, ie='Vevo')
     

youtube_dl/extractor/ndtv.py

@@ -31,7 +31,7 @@ class NDTVIE(InfoExtractor):
         video_url = (u'http://bitcast-b.bitgravity.com/ndtvod/23372/ndtv/%s' %
                      filename)
 
-        duration_str = filename = self._search_regex(
+        duration_str = self._search_regex(
             r"__duration='([^']+)'", webpage, u'duration', fatal=False)
         duration = None if duration_str is None else int(duration_str)