diff --git a/setup.py b/setup.py index 93d6cf0f..8df775c3 100755 --- a/setup.py +++ b/setup.py @@ -1,19 +1,19 @@ #!/usr/bin/python -import sys import os +import sys +from distutils.sysconfig import get_python_lib -if sys.version > '3': - PY3 = True -else: - PY3 = False +PY3 = sys.version_info >= (3, 0) if PY3: - import subprocess as commands + from setuptools import Extension, setup + from subprocess import getstatusoutput + from sysconfig import get_config_var, get_python_version else: - import commands -from distutils.core import setup, Extension -from distutils.sysconfig import get_config_var, get_python_lib, get_python_version + from commands import getstatusoutput + from distutils.core import setup, Extension + from distutils.sysconfig import get_config_var, get_python_version if os.path.isfile("MANIFEST"): os.unlink("MANIFEST") @@ -22,7 +22,7 @@ LUAVERSION = None for version in lua_versions: - presult, poutput = commands.getstatusoutput("pkg-config --exists lua" + str(version)) + presult, poutput = getstatusoutput("pkg-config --exists lua" + str(version)) if presult == 0: LUAVERSION = version break @@ -43,7 +43,7 @@ def pkgconfig(*packages): combined_pcoutput = '' for package in packages: - (pcstatus, pcoutput) = commands.getstatusoutput( + (pcstatus, pcoutput) = getstatusoutput( "pkg-config --libs --cflags %s" % package) if pcstatus == 0: combined_pcoutput += ' ' + pcoutput