From: Philipp Hagemeister Date: Fri, 1 Feb 2013 17:05:42 +0000 (+0100) Subject: Merge remote-tracking branch 'dcoppa/master' X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=c7a725cfad52dd82ed4695eb526c053c7d48944d;hp=450a30cae8bb1689dea8cd3548b8f48f94f5a663 Merge remote-tracking branch 'dcoppa/master' --- diff --git a/setup.py b/setup.py index 6d019dcbb..eb7b1a212 100644 --- a/setup.py +++ b/setup.py @@ -2,10 +2,14 @@ # -*- coding: utf-8 -*- from __future__ import print_function -from distutils.core import setup import pkg_resources import sys +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + try: import py2exe """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""