Commit 9fc8f75b authored by agronholm's avatar agronholm

Fix py3k compatibility issue and two typos

--HG--
branch : distribute
extra : rebase_source : d53588531098e31e910e64063c0d1b927fa33b11
parent f6cad3a2
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
from distutils.util import convert_path from distutils.util import convert_path
d = {} d = {}
execfile(convert_path('setuptools/command/__init__.py'), d) init_path = convert_path('setuptools/command/__init__.py')
exec(open(init_path).read(), d)
SETUP_COMMANDS = d['__all__'] SETUP_COMMANDS = d['__all__']
VERSION = "0.6" VERSION = "0.6"
...@@ -16,7 +17,7 @@ scripts = [] ...@@ -16,7 +17,7 @@ scripts = []
# if we are installing Distribute using "python setup.py install" # if we are installing Distribute using "python setup.py install"
# we need to get setuptools out of the way # we need to get setuptools out of the way
if 'install' in sys.argv[1:]: if 'install' in sys.argv[1:]:
from bootstraping import before_install from bootstrapping import before_install
before_install() before_install()
dist = setup( dist = setup(
...@@ -100,7 +101,7 @@ dist = setup( ...@@ -100,7 +101,7 @@ dist = setup(
scripts = scripts, scripts = scripts,
) )
if 'install' in sys.argv[1:]: if 'install' in sys.argv[1:]:
from bootstraping import after_install from bootstrapping import after_install
after_install(dist) after_install(dist)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment