diff options
| -rwxr-xr-x | EasyInstall.txt | 8 | ||||
| -rw-r--r-- | setuptools/command/bdist_egg.py | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 84044f1d..f2682dda 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -545,9 +545,7 @@ The current analysis approach is fairly conservative; it currenly looks for: * Possible use of ``inspect`` functions that expect to manipulate source files (e.g. ``inspect.getsource()``) - * Any data files or C extensions (this restriction will be removed in a future - release, once the ``pkg_resources`` runtime has been hardened for multi-user - environments) + * Top-level modules that might be scripts used with ``python -m`` (Python 2.4) If any of the above are found in the package being installed, EasyInstall will assume that the package cannot be safely run from a zipfile, and unzip it to @@ -782,7 +780,7 @@ Command-Line Options EasyInstall will not actually build or install the requested projects or their dependencies; it will just find and extract them for you. See `Editing and Viewing Source Packages`_ above for more details. - + ``--build-directory=DIR, -b DIR`` (UPDATED in 0.6a1) Set the directory used to build source packages. If a package is built from a source distribution or checkout, it will be extracted to a @@ -1081,7 +1079,7 @@ already have them:: [install] install_lib = ~/py-lib install_scripts = ~/bin - + Be sure to do this *before* you try to run the ``ez_setup.py`` installation script. Then, follow the standard `installation instructions`_, but make sure that ``~/py-lib`` is listed in your ``PYTHONPATH`` environment variable. diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index ae94a869..7f32c369 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -393,7 +393,7 @@ def scan_module(egg_dir, base, name, stubs): log.warn("%s: module MAY be using inspect.%s", module, bad) safe = False if '__name__' in symbols and '__main__' in symbols and '.' not in module: - if get_python_version()>="2.4": + if sys.version[:3]=="2.4": # -m works w/zipfiles in 2.5 log.warn("%s: top-level module may be 'python -m' script", module) safe = False return safe |