release 2013.06.27

devscripts/release.sh

@@ -14,10 +14,12 @@
 
 set -e
 
-skip_test=false
-if [ "$2" == '--skip-test' ]; then
-    skip_test=true
+skip_tests=false
+if [ "$1" = '--skip-test' ]; then
+    skip_tests=true
+    shift
 fi
+
 if [ -z "$1" ]; then echo "ERROR: specify version number like this: $0 1994.09.06"; exit 1; fi
 version="$1"
 if [ ! -z "`git tag | grep "$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi
@@ -26,7 +28,7 @@ if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit
 
 /bin/echo -e "\n### First of all, testing..."
 make cleanall
-if $skip_tests; then
+if $skip_tests ; then
     echo 'SKIPPING TESTS'
 else
     nosetests --verbose --with-coverage --cover-package=youtube_dl --cover-html test --stop || exit 1

setup.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
+
 import pkg_resources
 import sys
 
@@ -23,7 +24,7 @@ py2exe_options = {
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',
-    "dll_excludes": ['w9xpopen.exe']
+    "dll_excludes": ['w9xpopen.exe'],
 }
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
@@ -57,7 +58,7 @@ setup(
     author = 'Ricardo Garcia',
     maintainer = 'Philipp Hagemeister',
     maintainer_email = 'phihag@phihag.de',
-    packages = ['youtube_dl'],
+    packages = ['youtube_dl', 'youtube_dl.extractor'],
 
     # Provokes warning on most systems (why?!)
     #test_suite = 'nose.collector',

youtube_dl/extractor/youtube.py

@@ -58,7 +58,7 @@ class YoutubeIE(InfoExtractor):
         '18': 'mp4',
         '22': 'mp4',
         '37': 'mp4',
-        '38': 'video', # You actually don't know if this will be MOV, AVI or whatever
+        '38': 'mp4',
         '43': 'webm',
         '44': 'webm',
         '45': 'webm',
@@ -486,7 +486,7 @@ class YoutubeIE(InfoExtractor):
             mobj = re.search(r';ytplayer.config = ({.*?});', video_webpage)
             info = json.loads(mobj.group(1))
             args = info['args']
-            if args.get('ptk','') == 'vevo' or 'dashmpd':
+            if args.get('ptk','') == 'vevo' or 'dashmpd' in args:
                 # Vevo videos with encrypted signatures
                 self.to_screen(u'%s: Vevo video detected.' % video_id)
                 video_info['url_encoded_fmt_stream_map'] = [args['url_encoded_fmt_stream_map']]

youtube_dl/version.py

@@ -1,2 +1,2 @@
 
-__version__ = '2013.06.23'
+__version__ = '2013.06.27'