Commit 9dc9fea4 authored by Lennart Regebro's avatar Lennart Regebro

Issue #306: Even if 2to3 is used, we build in-place under Python 2.

--HG--
branch : distribute
extra : rebase_source : db4a1a3059533ad0c894f12c31e3fe1c238f4292
parent e19d5777
......@@ -11,6 +11,7 @@ CHANGES
as the egg link would go to the Python 2 source. Linking to the 2to3'd code
in build/lib makes it work, although you will have to rebuild the module
before testing it.
* Issue #306: Even if 2to3 is used, we build in-place under Python 2.
------
0.6.28
......
......@@ -3,7 +3,7 @@ from distutils.util import convert_path, subst_vars
from pkg_resources import Distribution, PathMetadata, normalize_path
from distutils import log
from distutils.errors import DistutilsError, DistutilsOptionError
import os, setuptools, glob
import os, sys, setuptools, glob
class develop(easy_install):
"""Set up package for development"""
......@@ -84,7 +84,7 @@ class develop(easy_install):
" installation directory", p, normalize_path(os.curdir))
def install_for_development(self):
if getattr(self.distribution, 'use_2to3', False):
if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
# If we run 2to3 we can not do this inplace:
# Ensure metadata is up-to-date
......
......@@ -81,7 +81,7 @@ class test(Command):
def with_project_on_sys_path(self, func):
if getattr(self.distribution, 'use_2to3', False):
if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
# If we run 2to3 we can not do this inplace:
# Ensure metadata is up-to-date
......
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