]> git.frykholm.com Git - svtplaydump.git/commitdiff
py3 and distribute
authorMikael Frykholm <mikael@frykholm.com>
Mon, 8 Apr 2013 08:06:32 +0000 (10:06 +0200)
committerMikael Frykholm <mikael@frykholm.com>
Mon, 8 Apr 2013 08:06:32 +0000 (10:06 +0200)
Added support for python 3 in addition to python 2.7.
Added distribute support for easier packaging.

README.md
distribute_setup.py [new file with mode: 0644]
setup.py [new file with mode: 0644]
svtplaydump.py

index e7356484ef39718cd1ed4447971eec7a47f2d1ff..d01413c246c63065b3c33cb01f682fdb2c903edb 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ svtplaydump
 
 svtplaydump downloads svtplay content for offline viewing.
 Use like this:
 
 svtplaydump downloads svtplay content for offline viewing.
 Use like this:
-svtplaydump.py http://www.svtplay.se/video/128812/jakten-pa-bernhard
+svtplaydump.py -u http://www.svtplay.se/video/128812/jakten-pa-bernhard
 
 The script tries to download without any external programs first, and uses rtmpdump and mplayer as fallback. The fallback modes should not be needed any more, but is left for completeness.
 
 
 The script tries to download without any external programs first, and uses rtmpdump and mplayer as fallback. The fallback modes should not be needed any more, but is left for completeness.
 
diff --git a/distribute_setup.py b/distribute_setup.py
new file mode 100644 (file)
index 0000000..f630bca
--- /dev/null
@@ -0,0 +1,546 @@
+#!python
+"""Bootstrap distribute installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+    from distribute_setup import use_setuptools
+    use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import os
+import shutil
+import sys
+import time
+import fnmatch
+import tempfile
+import tarfile
+import optparse
+
+from distutils import log
+
+try:
+    from site import USER_SITE
+except ImportError:
+    USER_SITE = None
+
+try:
+    import subprocess
+
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        return subprocess.call(args) == 0
+
+except ImportError:
+    # will be used for python 2.3
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        # quoting arguments if windows
+        if sys.platform == 'win32':
+            def quote(arg):
+                if ' ' in arg:
+                    return '"%s"' % arg
+                return arg
+            args = [quote(arg) for arg in args]
+        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
+
+DEFAULT_VERSION = "0.6.36"
+DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
+SETUPTOOLS_FAKED_VERSION = "0.6c11"
+
+SETUPTOOLS_PKG_INFO = """\
+Metadata-Version: 1.0
+Name: setuptools
+Version: %s
+Summary: xxxx
+Home-page: xxx
+Author: xxx
+Author-email: xxx
+License: xxx
+Description: xxx
+""" % SETUPTOOLS_FAKED_VERSION
+
+
+def _install(tarball, install_args=()):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # installing
+        log.warn('Installing Distribute')
+        if not _python_cmd('setup.py', 'install', *install_args):
+            log.warn('Something went wrong during the installation.')
+            log.warn('See the error message above.')
+            # exitcode will be 2
+            return 2
+    finally:
+        os.chdir(old_wd)
+        shutil.rmtree(tmpdir)
+
+
+def _build_egg(egg, tarball, to_dir):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # building an egg
+        log.warn('Building a Distribute egg in %s', to_dir)
+        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+
+    finally:
+        os.chdir(old_wd)
+        shutil.rmtree(tmpdir)
+    # returning the result
+    log.warn(egg)
+    if not os.path.exists(egg):
+        raise IOError('Could not build the egg.')
+
+
+def _do_download(version, download_base, to_dir, download_delay):
+    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
+                       % (version, sys.version_info[0], sys.version_info[1]))
+    if not os.path.exists(egg):
+        tarball = download_setuptools(version, download_base,
+                                      to_dir, download_delay)
+        _build_egg(egg, tarball, to_dir)
+    sys.path.insert(0, egg)
+    import setuptools
+    setuptools.bootstrap_install_from = egg
+
+
+def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                   to_dir=os.curdir, download_delay=15, no_fake=True):
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    was_imported = 'pkg_resources' in sys.modules or \
+        'setuptools' in sys.modules
+    try:
+        try:
+            import pkg_resources
+            if not hasattr(pkg_resources, '_distribute'):
+                if not no_fake:
+                    _fake_setuptools()
+                raise ImportError
+        except ImportError:
+            return _do_download(version, download_base, to_dir, download_delay)
+        try:
+            pkg_resources.require("distribute>=" + version)
+            return
+        except pkg_resources.VersionConflict:
+            e = sys.exc_info()[1]
+            if was_imported:
+                sys.stderr.write(
+                "The required version of distribute (>=%s) is not available,\n"
+                "and can't be installed while this script is running. Please\n"
+                "install a more recent version first, using\n"
+                "'easy_install -U distribute'."
+                "\n\n(Currently using %r)\n" % (version, e.args[0]))
+                sys.exit(2)
+            else:
+                del pkg_resources, sys.modules['pkg_resources']    # reload ok
+                return _do_download(version, download_base, to_dir,
+                                    download_delay)
+        except pkg_resources.DistributionNotFound:
+            return _do_download(version, download_base, to_dir,
+                                download_delay)
+    finally:
+        if not no_fake:
+            _create_fake_setuptools_pkg_info(to_dir)
+
+
+def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                        to_dir=os.curdir, delay=15):
+    """Download distribute from a specified location and return its filename
+
+    `version` should be a valid distribute version number that is available
+    as an egg for download under the `download_base` URL (which should end
+    with a '/'). `to_dir` is the directory where the egg will be downloaded.
+    `delay` is the number of seconds to pause before an actual download
+    attempt.
+    """
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    try:
+        from urllib.request import urlopen
+    except ImportError:
+        from urllib2 import urlopen
+    tgz_name = "distribute-%s.tar.gz" % version
+    url = download_base + tgz_name
+    saveto = os.path.join(to_dir, tgz_name)
+    src = dst = None
+    if not os.path.exists(saveto):  # Avoid repeated downloads
+        try:
+            log.warn("Downloading %s", url)
+            src = urlopen(url)
+            # Read/write all in one block, so we don't create a corrupt file
+            # if the download is interrupted.
+            data = src.read()
+            dst = open(saveto, "wb")
+            dst.write(data)
+        finally:
+            if src:
+                src.close()
+            if dst:
+                dst.close()
+    return os.path.realpath(saveto)
+
+
+def _no_sandbox(function):
+    def __no_sandbox(*args, **kw):
+        try:
+            from setuptools.sandbox import DirectorySandbox
+            if not hasattr(DirectorySandbox, '_old'):
+                def violation(*args):
+                    pass
+                DirectorySandbox._old = DirectorySandbox._violation
+                DirectorySandbox._violation = violation
+                patched = True
+            else:
+                patched = False
+        except ImportError:
+            patched = False
+
+        try:
+            return function(*args, **kw)
+        finally:
+            if patched:
+                DirectorySandbox._violation = DirectorySandbox._old
+                del DirectorySandbox._old
+
+    return __no_sandbox
+
+
+def _patch_file(path, content):
+    """Will backup the file then patch it"""
+    f = open(path)
+    existing_content = f.read()
+    f.close()
+    if existing_content == content:
+        # already patched
+        log.warn('Already patched.')
+        return False
+    log.warn('Patching...')
+    _rename_path(path)
+    f = open(path, 'w')
+    try:
+        f.write(content)
+    finally:
+        f.close()
+    return True
+
+_patch_file = _no_sandbox(_patch_file)
+
+
+def _same_content(path, content):
+    f = open(path)
+    existing_content = f.read()
+    f.close()
+    return existing_content == content
+
+
+def _rename_path(path):
+    new_name = path + '.OLD.%s' % time.time()
+    log.warn('Renaming %s to %s', path, new_name)
+    os.rename(path, new_name)
+    return new_name
+
+
+def _remove_flat_installation(placeholder):
+    if not os.path.isdir(placeholder):
+        log.warn('Unkown installation at %s', placeholder)
+        return False
+    found = False
+    for file in os.listdir(placeholder):
+        if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
+            found = True
+            break
+    if not found:
+        log.warn('Could not locate setuptools*.egg-info')
+        return
+
+    log.warn('Moving elements out of the way...')
+    pkg_info = os.path.join(placeholder, file)
+    if os.path.isdir(pkg_info):
+        patched = _patch_egg_dir(pkg_info)
+    else:
+        patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
+
+    if not patched:
+        log.warn('%s already patched.', pkg_info)
+        return False
+    # now let's move the files out of the way
+    for element in ('setuptools', 'pkg_resources.py', 'site.py'):
+        element = os.path.join(placeholder, element)
+        if os.path.exists(element):
+            _rename_path(element)
+        else:
+            log.warn('Could not find the %s element of the '
+                     'Setuptools distribution', element)
+    return True
+
+_remove_flat_installation = _no_sandbox(_remove_flat_installation)
+
+
+def _after_install(dist):
+    log.warn('After install bootstrap.')
+    placeholder = dist.get_command_obj('install').install_purelib
+    _create_fake_setuptools_pkg_info(placeholder)
+
+
+def _create_fake_setuptools_pkg_info(placeholder):
+    if not placeholder or not os.path.exists(placeholder):
+        log.warn('Could not find the install location')
+        return
+    pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+            (SETUPTOOLS_FAKED_VERSION, pyver)
+    pkg_info = os.path.join(placeholder, setuptools_file)
+    if os.path.exists(pkg_info):
+        log.warn('%s already exists', pkg_info)
+        return
+
+    log.warn('Creating %s', pkg_info)
+    try:
+        f = open(pkg_info, 'w')
+    except EnvironmentError:
+        log.warn("Don't have permissions to write %s, skipping", pkg_info)
+        return
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+
+    pth_file = os.path.join(placeholder, 'setuptools.pth')
+    log.warn('Creating %s', pth_file)
+    f = open(pth_file, 'w')
+    try:
+        f.write(os.path.join(os.curdir, setuptools_file))
+    finally:
+        f.close()
+
+_create_fake_setuptools_pkg_info = _no_sandbox(
+    _create_fake_setuptools_pkg_info
+)
+
+
+def _patch_egg_dir(path):
+    # let's check if it's already patched
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    if os.path.exists(pkg_info):
+        if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
+            log.warn('%s already patched.', pkg_info)
+            return False
+    _rename_path(path)
+    os.mkdir(path)
+    os.mkdir(os.path.join(path, 'EGG-INFO'))
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    f = open(pkg_info, 'w')
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+    return True
+
+_patch_egg_dir = _no_sandbox(_patch_egg_dir)
+
+
+def _before_install():
+    log.warn('Before install bootstrap.')
+    _fake_setuptools()
+
+
+def _under_prefix(location):
+    if 'install' not in sys.argv:
+        return True
+    args = sys.argv[sys.argv.index('install') + 1:]
+    for index, arg in enumerate(args):
+        for option in ('--root', '--prefix'):
+            if arg.startswith('%s=' % option):
+                top_dir = arg.split('root=')[-1]
+                return location.startswith(top_dir)
+            elif arg == option:
+                if len(args) > index:
+                    top_dir = args[index + 1]
+                    return location.startswith(top_dir)
+        if arg == '--user' and USER_SITE is not None:
+            return location.startswith(USER_SITE)
+    return True
+
+
+def _fake_setuptools():
+    log.warn('Scanning installed packages')
+    try:
+        import pkg_resources
+    except ImportError:
+        # we're cool
+        log.warn('Setuptools or Distribute does not seem to be installed.')
+        return
+    ws = pkg_resources.working_set
+    try:
+        setuptools_dist = ws.find(
+            pkg_resources.Requirement.parse('setuptools', replacement=False)
+            )
+    except TypeError:
+        # old distribute API
+        setuptools_dist = ws.find(
+            pkg_resources.Requirement.parse('setuptools')
+        )
+
+    if setuptools_dist is None:
+        log.warn('No setuptools distribution found')
+        return
+    # detecting if it was already faked
+    setuptools_location = setuptools_dist.location
+    log.warn('Setuptools installation detected at %s', setuptools_location)
+
+    # if --root or --preix was provided, and if
+    # setuptools is not located in them, we don't patch it
+    if not _under_prefix(setuptools_location):
+        log.warn('Not patching, --root or --prefix is installing Distribute'
+                 ' in another location')
+        return
+
+    # let's see if its an egg
+    if not setuptools_location.endswith('.egg'):
+        log.warn('Non-egg installation')
+        res = _remove_flat_installation(setuptools_location)
+        if not res:
+            return
+    else:
+        log.warn('Egg installation')
+        pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
+        if (os.path.exists(pkg_info) and
+            _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
+            log.warn('Already patched.')
+            return
+        log.warn('Patching...')
+        # let's create a fake egg replacing setuptools one
+        res = _patch_egg_dir(setuptools_location)
+        if not res:
+            return
+    log.warn('Patching complete.')
+    _relaunch()
+
+
+def _relaunch():
+    log.warn('Relaunching...')
+    # we have to relaunch the process
+    # pip marker to avoid a relaunch bug
+    _cmd1 = ['-c', 'install', '--single-version-externally-managed']
+    _cmd2 = ['-c', 'install', '--record']
+    if sys.argv[:3] == _cmd1 or sys.argv[:3] == _cmd2:
+        sys.argv[0] = 'setup.py'
+    args = [sys.executable] + sys.argv
+    sys.exit(subprocess.call(args))
+
+
+def _extractall(self, path=".", members=None):
+    """Extract all members from the archive to the current working
+       directory and set owner, modification time and permissions on
+       directories afterwards. `path' specifies a different directory
+       to extract to. `members' is optional and must be a subset of the
+       list returned by getmembers().
+    """
+    import copy
+    import operator
+    from tarfile import ExtractError
+    directories = []
+
+    if members is None:
+        members = self
+
+    for tarinfo in members:
+        if tarinfo.isdir():
+            # Extract directories with a safe mode.
+            directories.append(tarinfo)
+            tarinfo = copy.copy(tarinfo)
+            tarinfo.mode = 448  # decimal for oct 0700
+        self.extract(tarinfo, path)
+
+    # Reverse sort directories.
+    if sys.version_info < (2, 4):
+        def sorter(dir1, dir2):
+            return cmp(dir1.name, dir2.name)
+        directories.sort(sorter)
+        directories.reverse()
+    else:
+        directories.sort(key=operator.attrgetter('name'), reverse=True)
+
+    # Set correct owner, mtime and filemode on directories.
+    for tarinfo in directories:
+        dirpath = os.path.join(path, tarinfo.name)
+        try:
+            self.chown(tarinfo, dirpath)
+            self.utime(tarinfo, dirpath)
+            self.chmod(tarinfo, dirpath)
+        except ExtractError:
+            e = sys.exc_info()[1]
+            if self.errorlevel > 1:
+                raise
+            else:
+                self._dbg(1, "tarfile: %s" % e)
+
+
+def _build_install_args(options):
+    """
+    Build the arguments to 'python setup.py install' on the distribute package
+    """
+    install_args = []
+    if options.user_install:
+        if sys.version_info < (2, 6):
+            log.warn("--user requires Python 2.6 or later")
+            raise SystemExit(1)
+        install_args.append('--user')
+    return install_args
+
+def _parse_args():
+    """
+    Parse the command line for options
+    """
+    parser = optparse.OptionParser()
+    parser.add_option(
+        '--user', dest='user_install', action='store_true', default=False,
+        help='install in user site package (requires Python 2.6 or later)')
+    parser.add_option(
+        '--download-base', dest='download_base', metavar="URL",
+        default=DEFAULT_URL,
+        help='alternative URL from where to download the distribute package')
+    options, args = parser.parse_args()
+    # positional arguments are ignored
+    return options
+
+def main(version=DEFAULT_VERSION):
+    """Install or upgrade setuptools and EasyInstall"""
+    options = _parse_args()
+    tarball = download_setuptools(download_base=options.download_base)
+    return _install(tarball, _build_install_args(options))
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/setup.py b/setup.py
new file mode 100644 (file)
index 0000000..b90ac2e
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,28 @@
+from distribute_setup import use_setuptools
+use_setuptools()
+from setuptools import setup
+setup(
+    name = "svtplaydump",
+    version = "0.5",
+    description = "Download from svtplay.se",
+    author = "Mikael Frykholm",
+    author_email = "mikael@frykholm.com",
+    url = "https://github.com/mikaelfrykholm/svtplaydump",
+    keywords = ["svtplay"],
+    install_requires=['beautifulsoup4', 'feedparser', 'requests'],
+    classifiers = [
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Development Status :: 4 - Beta",
+        "Environment :: Other Environment",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: GNU General Public License (GPL)",
+        "Operating System :: OS Independent",
+        ],
+    long_description = """\
+svtplaydump downloads svtplay content for offline viewing.
+
+Use like this:
+svtplaydump.py -u http://www.svtplay.se/video/128812/jakten-pa-bernhard
+"""
+)
index 3fbb16af8a2e870fc3acedc8c78c4fa45ceaabaa..5348f6118f86d6cb57357700bdb0d24ca9866f15 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 #   (C) Copyright 2010 Mikael Frykholm <mikael@frykholm.com>
 # -*- coding: utf-8 -*-
 #
 #   (C) Copyright 2010 Mikael Frykholm <mikael@frykholm.com>
 # 0.2 added python 2.4 urlparse compatibility
 # 0.1 initial release
 
 # 0.2 added python 2.4 urlparse compatibility
 # 0.1 initial release
 
-from BeautifulSoup import BeautifulSoup
+from bs4 import BeautifulSoup
 from subprocess import *
 import re
 from subprocess import *
 import re
-import json
 from Crypto.Cipher import AES
 import struct
 import argparse
 from Crypto.Cipher import AES
 import struct
 import argparse
-import feedparser 
-try:
-    import urlparse
-except ImportError:
-    pass
-import urllib2
-try:
-    import urllib2.urlparse as urlparse
-except ImportError:
-    pass
+import requests
 import sys, os
 
 def scrape_player_page(url, title):
 import sys, os
 
 def scrape_player_page(url, title):
@@ -48,25 +38,24 @@ def scrape_player_page(url, title):
     if not url.startswith('http'):
         url = "http://www.svtplay.se" + url
     video = {}
     if not url.startswith('http'):
         url = "http://www.svtplay.se" + url
     video = {}
-    page = urllib2.urlopen(url).read()
-    soup = BeautifulSoup(page,convertEntities=BeautifulSoup.HTML_ENTITIES)
+    soup = BeautifulSoup(requests.get(url).text)
     video_player = soup.body('a',{'data-json-href':True})[0]
     video_player = soup.body('a',{'data-json-href':True})[0]
-    if video_player.attrMap['data-json-href'].startswith("/wd"):
-        flashvars = json.loads(urllib2.urlopen("http://www.svt.se/%s"%video_player.attrMap['data-json-href']).read())
+    if video_player.attrs['data-json-href'].startswith("/wd"):
+        flashvars = requests.get("http://www.svt.se/%s"%video_player.attrs['data-json-href']).json()
     else:    
     else:    
-        flashvars = json.loads(urllib2.urlopen("http://www.svtplay.se/%s"%video_player.attrMap['data-json-href']+"?output=json").read())
-    video['duration'] = video_player.attrMap.get('data-length',0)
+        flashvars = requests.get("http://www.svtplay.se/%s"%video_player.attrs['data-json-href']+"?output=json").json()
+    video['duration'] = video_player.attrs.get('data-length',0)
     video['title'] = title
     if not title:
     video['title'] = title
     if not title:
-        video['title'] = soup.find('meta',{'property':'og:title'}).attrMap['content'].replace('|','_').replace('/','_')
+        video['title'] = soup.find('meta',{'property':'og:title'}).attrs['content'].replace('|','_').replace('/','_')
     if 'dynamicStreams' in flashvars:
         video['url'] = flashvars['dynamicStreams'][0].split('url:')[1].split('.mp4,')[0] +'.mp4'
         filename = video['title']+".mp4"
     if 'dynamicStreams' in flashvars:
         video['url'] = flashvars['dynamicStreams'][0].split('url:')[1].split('.mp4,')[0] +'.mp4'
         filename = video['title']+".mp4"
-        print Popen(["rtmpdump",u"-o"+filename,"-r", url], stdout=PIPE).communicate()[0]
+        print(Popen(["rtmpdump","-o"+filename,"-r", url], stdout=PIPE).communicate()[0])
     if 'pathflv' in flashvars:
         rtmp = flashvars['pathflv'][0]
         filename = video['title']+".flv"
     if 'pathflv' in flashvars:
         rtmp = flashvars['pathflv'][0]
         filename = video['title']+".flv"
-        print Popen(["mplayer","-dumpstream","-dumpfile",filename, rtmp], stdout=PIPE).communicate()[0]
+        print(Popen(["mplayer","-dumpstream","-dumpfile",filename, rtmp], stdout=PIPE).communicate()[0])
     if 'video' in flashvars:
         for reference in flashvars['video']['videoReferences']:
             if reference['url'].endswith("m3u8"):
     if 'video' in flashvars:
         for reference in flashvars['video']['videoReferences']:
             if reference['url'].endswith("m3u8"):
@@ -76,44 +65,44 @@ def scrape_player_page(url, title):
                     video['category'] = flashvars['statistics']['category']
         download_from_playlist(video)
     else:
                     video['category'] = flashvars['statistics']['category']
         download_from_playlist(video)
     else:
-        print "Could not find any streams"
+        print("Could not find any streams")
         return
     return video
 
 def download_from_playlist(video):
         return
     return video
 
 def download_from_playlist(video):
-    playlist = parse_playlist(urllib2.urlopen(video['url']).read())
+    playlist = parse_playlist(requests.get(video['url']).text)
+    if not playlist:
+        return
     videourl = sorted(playlist, key=lambda k: int(k['BANDWIDTH']))[-1]['url']
     videourl = sorted(playlist, key=lambda k: int(k['BANDWIDTH']))[-1]['url']
-    segments, metadata = parse_segment_playlist(urllib2.urlopen(videourl).read())
+    segments, metadata = parse_segment_playlist(requests.get(videourl).text)
     if "EXT-X-KEY" in metadata:
     if "EXT-X-KEY" in metadata:
-        key = urllib2.urlopen(metadata["EXT-X-KEY"]['URI'].strip('"')).read()
+        key = requests.get(metadata["EXT-X-KEY"]['URI'].strip('"')).text
         decrypt=True
     else:
         decrypt=False
         decrypt=True
     else:
         decrypt=False
-    with open("%s"%video['filename'],"w") as ofile:
+    with open("%s"%video['filename'],"wb") as ofile:
         segment=0
         size = 0
         for url in segments:
         segment=0
         size = 0
         for url in segments:
-            ufile = urllib2.urlopen(url)
-            print "\r{} MB".format(size/1024/1024),
+            ufile = requests.get(url, stream=True).raw
+            print("\r{} MB".format(size/1024/1024))
             sys.stdout.flush()
             if decrypt:
                 iv=struct.pack("IIII",segment,0,0,0)
                 decryptor = AES.new(key, AES.MODE_CBC, iv)
             while(True):
             sys.stdout.flush()
             if decrypt:
                 iv=struct.pack("IIII",segment,0,0,0)
                 decryptor = AES.new(key, AES.MODE_CBC, iv)
             while(True):
-                buf = ufile.read(1024)
-                if buf:
-                    if decrypt:
-                        buf = decryptor.decrypt(buf)
-                    ofile.write(buf)
-                    size += len(buf)
-                else:
-                    ufile.close()
+                buf = ufile.read(4096)
+                if not buf:
                     break
                     break
+                if decrypt:
+                    buf = decryptor.decrypt(buf)
+                ofile.write(buf)
+                size += len(buf)
             segment += 1
 
 def parse_playlist(playlist):
     if not playlist.startswith("#EXTM3U"):
             segment += 1
 
 def parse_playlist(playlist):
     if not playlist.startswith("#EXTM3U"):
-        print playlist
+        print(playlist)
         return False
     playlist = playlist.splitlines()[1:]
     items=[]
         return False
     playlist = playlist.splitlines()[1:]
     items=[]
@@ -144,18 +133,17 @@ def parse_segment_playlist(playlist):
              row = row.split(':',1)[1] #skip first part
              parts = PATTERN.split(row)[1:-1] #do magic re split and keep quotes
              metadata["EXT-X-KEY"] = dict([part.split('=',1) for part in parts if '=' in part]) #throw away the commas and make dict of the pairs
              row = row.split(':',1)[1] #skip first part
              parts = PATTERN.split(row)[1:-1] #do magic re split and keep quotes
              metadata["EXT-X-KEY"] = dict([part.split('=',1) for part in parts if '=' in part]) #throw away the commas and make dict of the pairs
-    return(segments, metadata)   
+    return(segments, metadata)
+
 def parse_videolist():
     page_num = 1
 def parse_videolist():
     page_num = 1
-    page = urllib2.urlopen("http://www.svtplay.se/ajax/videospager").read() #this call does not work for getting the pages, we use it for the page totals only
-    soup = BeautifulSoup(page,convertEntities=BeautifulSoup.HTML_ENTITIES)
-    page_tot = int(soup.find('a',{'data-currentpage':True}).attrMap['data-lastpage'])
+    soup = BeautifulSoup(requests.get("http://www.svtplay.se/ajax/videospager").text)#this call does not work for getting the pages, we use it for the page totals only
+    page_tot = int(soup.find('a',{'data-currentpage':True}).attrs['data-lastpage'])
     videos_per_page = 8
     video_num = 0
     while(page_num <= page_tot):
         base_url = "http://www.svtplay.se/ajax/videos?sida={}".format(page_num)
     videos_per_page = 8
     video_num = 0
     while(page_num <= page_tot):
         base_url = "http://www.svtplay.se/ajax/videos?sida={}".format(page_num)
-        page = urllib2.urlopen(base_url).read()
-        soup = BeautifulSoup(page,convertEntities=BeautifulSoup.HTML_ENTITIES)
+        soup = BeautifulSoup(requests.get(base_url).text)
         for article in soup.findAll('article'):
             meta = dict(article.attrs)
             video = {}
         for article in soup.findAll('article'):
             meta = dict(article.attrs)
             video = {}
@@ -179,28 +167,29 @@ if __name__ == "__main__":
     parser.add_argument("-n", "--no_act", help="Just print what would be done, don't do any downloading.", action="store_true")
     args = parser.parse_args()
     if args.rss: 
     parser.add_argument("-n", "--no_act", help="Just print what would be done, don't do any downloading.", action="store_true")
     args = parser.parse_args()
     if args.rss: 
+        import feedparser
         d = feedparser.parse(args.rss)
         for e in d.entries:
         d = feedparser.parse(args.rss)
         for e in d.entries:
-            print("Downloading: %s"%e.title)
+            print(("Downloading: %s"%e.title))
             if args.no_act:
                 continue
             filename = scrape_player_page(e.link, e.title)
             if args.no_act:
                 continue
             filename = scrape_player_page(e.link, e.title)
-            print Popen(["avconv","-i",filename,"-vcodec","copy","-acodec","copy", filename+'.mkv'], stdout=PIPE).communicate()[0]
+            print(Popen(["avconv","-i",filename,"-vcodec","copy","-acodec","copy", filename+'.mkv'], stdout=PIPE).communicate()[0])
         #print(e.description)
     if args.mirror:
         for video in parse_videolist():
             video['title'] = video['title'].replace('/','_')
         #print(e.description)
     if args.mirror:
         for video in parse_videolist():
             video['title'] = video['title'].replace('/','_')
-            print video['title']+'.mkv',
-            print u"{} of {}".format(video['num'], video['total'])
+            print(video['title']+'.mkv')
+            print("{} of {}".format(video['num'], video['total']))
             if os.path.exists(video['title']+'.mkv'):
             if os.path.exists(video['title']+'.mkv'):
-                print "Skipping" 
+                print("Skipping") 
                 continue
             print("Downloading...")
             if args.no_act:
                 continue
             ret = scrape_player_page(video['url'], video['title'])
                 continue
             print("Downloading...")
             if args.no_act:
                 continue
             ret = scrape_player_page(video['url'], video['title'])
-            print ret
-            print Popen(["avconv","-i",video['title']+'.ts',"-vcodec","copy","-acodec","copy", video['title']+'.mkv'], stdout=PIPE).communicate()[0]
+            print(ret)
+            print(Popen(["avconv","-i",video['title']+'.ts',"-vcodec","copy","-acodec","copy", video['title']+'.mkv'], stdout=PIPE).communicate()[0])
             try:
                 os.unlink(video['title']+'.ts')
             except:
             try:
                 os.unlink(video['title']+'.ts')
             except:
@@ -208,4 +197,4 @@ if __name__ == "__main__":
     else:
         if not args.no_act:
             video = scrape_player_page(args.url, None)
     else:
         if not args.no_act:
             video = scrape_player_page(args.url, None)
-        print(u"Downloaded {}".format(args.url))   
\ No newline at end of file
+        print(("Downloaded {}".format(args.url)))