Merge branch 'develop'

mps-youtube · Jun 22, 2014 · 8680a18 · 8680a18
2 parents 68cbddb + 8435d26
commit 8680a18
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 18 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+22 June 2014
+Version 0.3.52
+
+[Bugfix] - Added unrecognised itags (issue #34)
+
+-------------------------------------------------------------------------------
+
 19 June 2014
 Version 0.3.50
 

diff --git a/docs-sphinx/conf.py b/docs-sphinx/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.46'
+version = '0.3.52'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.46'
+release = '0.3.52'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/pafy/pafy.py b/pafy/pafy.py
@@ -25,7 +25,7 @@
 
 from __future__ import unicode_literals
 
-__version__ = "0.3.50"
+__version__ = "0.3.52"
 __author__ = "nagev"
 __license__ = "GPLv3"
 
@@ -231,6 +231,8 @@ class g(object):
         '170': ('1920x1080', 'webm', 'video', ''),
         '171': ('128k', 'ogg', 'audio', ''),
         '172': ('192k', 'ogg', 'audio', ''),
+        '218': ('854x480', 'webm', 'video', 'VP8'),
+        '219': ('854x480', 'webm', 'video', 'VP8'),
         '242': ('360x240', 'webm', 'video', 'VP9'),
         '243': ('480x360', 'webm', 'video', 'VP9'),
         '244': ('640x480', 'webm', 'video', 'VP9'),
@@ -241,7 +243,8 @@ class g(object):
         '256': ('192k', 'm4a', 'audio', '6-channel'),
         '258': ('320k', 'm4a', 'audio', '6-channel'),
         '264': ('2560x1440', 'm4v', 'video', ''),
-        '271': ('1920x1280', 'webm', 'video', 'VP9')
+        '271': ('1920x1280', 'webm', 'video', 'VP9'),
+        '272': ('3414x1080', 'webm', 'video', 'VP9')
     }
 
 

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
     name='Pafy',
     packages=['pafy'],
     scripts=['scripts/ytdl'],
-    version='0.3.50',
+    version='0.3.52',
     description="Python API for YouTube, query and download YouTube content",
     keywords=["Pafy", "API", "YouTube", "youtube", "download", "video"],
     author="nagev",

diff --git a/tests/test.py b/tests/test.py
@@ -335,21 +335,21 @@ def test_misc_tests(self):
         'm4a streams': 1,
     },
     {
-        'identifier': '9bZkp7q19f0',
-        'videoid': '9bZkp7q19f0',
-        'title': 'PSY - GANGNAM STYLE (강남스타일) M-V',
-        'length': 253,
-        'duration': '00:04:13',
-        'author': 'officialpsy',
-        'username': 'officialpsy',
-        'published': '2012-07-15 07:46:32',
-        'thumb': 'http://i1.ytimg.com/vi/9bZkp7q19f0/default.jpg',
+        'identifier': 'http://youtube.com/watch?v=rYEDA3JcQqw',
+        'videoid': 'rYEDA3JcQqw',
+        'title': 'Adele - Rolling in the Deep',
+        'length': 234,
+        'duration': '00:03:54',
+        'author': 'AdeleVEVO',
+        'username': 'AdeleVEVO',
+        'published': '2010-11-30 23:16:19',
+        'thumb': 'http://i1.ytimg.com/vi/rYEDA3JcQqw/default.jpg',
         'category': 'Music',
-        'description': '18cfe095a82e593691f71591ad2dfe1ecaddee08',
-        'bestsize': 90898244,
-        'all streams': 21,
+        'description': '72bfd9472e59a8f48b83af36197ebcf5d2227609',
+        'bestsize': 41334333,
+        'all streams': 27,
         'normal streams': 6,
-        'video streams': 13,
+        'video streams': 19,
         'audio streams': 2,
         'ogg streams': 1,
         'm4a streams': 1,