Merge branch 'develop'

.gitignore

@@ -9,4 +9,5 @@ dev/
 .test
 *.pyc
 .pypi
+vi.py
 __pycache__

CHANGELOG

@@ -1,3 +1,9 @@
+27 August 2014
+Version 0.3.62
+
+[Feature] - Added url_https property to return https url
+
+-------------------------------------------------------------------------------
 15 August 2014
 Version 0.3.60
 

docs-sphinx/conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.60'
+version = '0.3.62'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.60'
+release = '0.3.62'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs-sphinx/index.rst

@@ -257,8 +257,12 @@ Stream Attributes
 
     The direct access URL of the stream.  This can be used to stream the media
     in mplayer or vlc, or for downloading with wget or curl.  To download
-    directly, use the :func:`Stream.download` method
+    directly, use the :func:`Stream.download` method.
 
+.. attribute:: Stream.url_https
+
+    The direct access HTTPS URL of the stream.
+
 .. attribute:: Stream.bitrate
 
     The bitrate of the stream - if it is an audio stream, otherwise None,

pafy/pafy.py

@@ -27,7 +27,7 @@
 
 from __future__ import unicode_literals
 
-__version__ = "0.3.60"
+__version__ = "0.3.62"
 __author__ = "nagev"
 __license__ = "GPLv3"
 
@@ -182,18 +182,16 @@ class g(object):
                     'video_id=%s&asv=3&el=detailpage&hl=en_US'),
         'playlist': ('http://www.youtube.com/list_ajax?'
                      'style=json&action_get_list=1&list=%s'),
-        'age_vidinfo': ('https://www.youtube.com/get_video_info?video_id=%s&'
-                        'el=player_embedded&gl=US&hl=en&eurl=https://youtube.'
-                        'googleapis.com/v/%s&asv=3&sts=1588')
+        'age_vidinfo': ('http://www.youtube.com/get_video_info?video_id=%s&'
+                        'eurl=https://youtube.googleapis.com/v/%s&sts=1588')
     }
-    ua = ("Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64;"
-          " Trident/5.0)")
+    user_agent = "pafy " + __version__
     UEFSM = 'url_encoded_fmt_stream_map'
     AF = 'adaptive_fmts'
     jsplayer = r';\s*ytplayer\.config\s*=\s*(\s*{.*?}\s*)\s*;'
     lifespan = 60 * 60 * 5  # 5 hours
     opener = build_opener()
-    opener.addheaders = [('User-Agent', ua)]
+    opener.addheaders = [('User-Agent', user_agent)]
     itags = {
         '5': ('320x240', 'flv', "normal", ''),
         '17': ('176x144', '3gp', "normal", ''),
@@ -608,8 +606,8 @@ def __init__(self, sm, parent):
         self._threed = 'stereo3d' in sm and sm['stereo3d'] == '1'
         self._resolution = g.itags[self.itag][0]
         self._dimensions = tuple(self.resolution.split("-")[0].split("x"))
-        self._dimensions = tuple(map(lambda x: int(x) if x.isdigit() else x,
-            self.dimensions))
+        self._dimensions = tuple([int(x) if x.isdigit() else x for x in
+                                  self._dimensions])
         self._vidformat = sm['type'].split(';')[0]  # undocumented
         self._quality = self.resolution
         self._extension = g.itags[self.itag][1]
@@ -765,6 +763,11 @@ def url(self):
 
         return self._url
 
+    @property
+    def url_https(self):
+        """ Return https url. """
+        return self.url.replace("http://", "https://")
+
     def __repr__(self):
         """ Return string representation. """
         out = "%s:%s@%s" % (self.mediatype, self.extension, self.quality)
@@ -838,7 +841,7 @@ def download(self, filepath="", quiet=False, callback=lambda *x: None,
         if offset:
             # partial file exists, resume download
             resuming_opener = build_opener()
-            resuming_opener.addheaders = [('User-Agent', g.ua),
+            resuming_opener.addheaders = [('User-Agent', g.user_agent),
                                           ("Range", "bytes=%s-" % offset)]
             response = resuming_opener.open(self.url)
             bytesdone = offset

setup.py

@@ -19,7 +19,7 @@
     name='Pafy',
     packages=['pafy'],
     scripts=['scripts/ytdl'],
-    version='0.3.60',
+    version='0.3.62',
     description="Retrieve YouTube content and metadata",
     keywords=["Pafy", "API", "YouTube", "youtube", "download", "video"],
     author="nagev",

tests/test.py

@@ -54,7 +54,7 @@ def runOnce(self):
             # get urls for age restricted vids
             if video['pafy'].videoid == "07FYdnEawAQ":
                 _ = video['pafy'].streams[0].url
-                _ = video['pafy'].streams[1].url
+                _ = video['pafy'].streams[1].url_https
                 del _
 
         for playlist in Test.playlists: