소스 검색

[utils] change extract_attributes to work in python 2

remitamine 9 년 전
부모
커밋
9550ca506f
2개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 2
      youtube_dl/extractor/brightcove.py
  2. 2 1
      youtube_dl/utils.py

+ 1 - 2
youtube_dl/extractor/brightcove.py

@@ -383,8 +383,7 @@ class BrightcoveInPageEmbedIE(InfoExtractor):
         return None
         return None
 
 
     def _real_extract(self, url):
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        account_id, player_id, embed, video_id = mobj.groups()
+        account_id, player_id, embed, video_id = re.match(self._VALID_URL, url).groups()
 
 
         webpage = self._download_webpage('http://players.brightcove.net/%s/%s_%s/index.min.js' % (account_id, player_id, embed), video_id)
         webpage = self._download_webpage('http://players.brightcove.net/%s/%s_%s/index.min.js' % (account_id, player_id, embed), video_id)
 
 

+ 2 - 1
youtube_dl/utils.py

@@ -252,7 +252,8 @@ def extract_attributes(attributes_str, attributes_regex=r'(?s)\s*([^\s=]+)\s*=\s
     attributes = re.findall(attributes_regex, attributes_str)
     attributes = re.findall(attributes_regex, attributes_str)
     attributes_dict = {}
     attributes_dict = {}
     if attributes:
     if attributes:
-        attributes_dict = {attribute_name: attribute_value for (attribute_name, attribute_value) in attributes}
+        for (attribute_name, attribute_value) in attributes:
+            attributes_dict[attribute_name] = attribute_value
     return attributes_dict
     return attributes_dict