diff options
| -rw-r--r-- | src/distutils2/core.py | 12 | ||||
| -rwxr-xr-x | src/distutils2/mkpkg.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/distutils2/core.py b/src/distutils2/core.py index 40b905c..5f948e5 100644 --- a/src/distutils2/core.py +++ b/src/distutils2/core.py @@ -1,9 +1,9 @@ -"""distutils.core +"""distutils2.core The only module that needs to be imported to use the Distutils; provides the 'setup' function (which is to be called from the setup script). Also indirectly provides the Distribution and Command classes, although they are -really defined in distutils.dist and distutils.cmd. +really defined in distutils2.dist and distutils2.cmd. """ __revision__ = "$Id: core.py 77704 2010-01-23 09:23:15Z tarek.ziade $" @@ -15,7 +15,7 @@ from distutils2.errors import (DistutilsSetupError, DistutilsArgError, DistutilsError, CCompilerError) from distutils2.util import grok_environment_error -# Mainly import these so setup scripts can "from distutils.core import" them. +# Mainly import these so setup scripts can "from distutils2.core import" them. from distutils2.dist import Distribution from distutils2.cmd import Command from distutils2.config import PyPIRCCommand @@ -76,9 +76,9 @@ def setup(**attrs): will be turned into a command class, which is in turn instantiated; any class found in 'cmdclass' is used in place of the default, which is (for command 'foo_bar') class 'foo_bar' in module - 'distutils.command.foo_bar'. The command class must provide a + 'distutils2.command.foo_bar'. The command class must provide a 'user_options' attribute which is a list of option specifiers for - 'distutils.fancy_getopt'. Any command-line options between the current + 'distutils2.fancy_getopt'. Any command-line options between the current and the next command are used to set attributes of the current command object. @@ -212,7 +212,7 @@ def run_setup(script_name, script_args=None, stop_after="run"): if _setup_distribution is None: raise RuntimeError, \ - ("'distutils.core.setup()' was never called -- " + ("'distutils2.core.setup()' was never called -- " "perhaps '%s' is not a Distutils setup script?") % \ script_name diff --git a/src/distutils2/mkpkg.py b/src/distutils2/mkpkg.py index 4b50ec3..553cd77 100755 --- a/src/distutils2/mkpkg.py +++ b/src/distutils2/mkpkg.py @@ -873,11 +873,11 @@ Status''', required = False) fp = open('setup.py', 'w') fp.write('#!/usr/bin/env python\n\n') - fp.write('from distutils.core import setup\n\n') + fp.write('from distutils2.core import setup\n\n') fp.write('from sys import version\n') fp.write('if version < \'2.2.3\':\n') - fp.write(' from distutils.dist import DistributionMetadata\n') + fp.write(' from distutils2.dist import DistributionMetadata\n') fp.write(' DistributionMetadata.classifiers = None\n') fp.write(' DistributionMetadata.download_url = None\n') |