summaryrefslogtreecommitdiffstats
path: root/Lib/packaging/compiler
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-06-16 21:34:55 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-06-16 21:34:55 (GMT)
commitb6be20ca337348b7cf2b356f9354a4121627add0 (patch)
tree23cea276dc7e0b5193ebe0951e1d6cde8779af25 /Lib/packaging/compiler
parent434812d569eef54dd79936e581fc20df57671158 (diff)
downloadcpython-b6be20ca337348b7cf2b356f9354a4121627add0.zip
cpython-b6be20ca337348b7cf2b356f9354a4121627add0.tar.gz
cpython-b6be20ca337348b7cf2b356f9354a4121627add0.tar.bz2
Packaging: remove last mentions and uses of setup.py in the code.
Now only the compatibility layer (in create, util and install) talk about setup.py.
Diffstat (limited to 'Lib/packaging/compiler')
-rw-r--r--Lib/packaging/compiler/msvc9compiler.py8
-rw-r--r--Lib/packaging/compiler/msvccompiler.py3
-rw-r--r--Lib/packaging/compiler/unixccompiler.py2
3 files changed, 6 insertions, 7 deletions
diff --git a/Lib/packaging/compiler/msvc9compiler.py b/Lib/packaging/compiler/msvc9compiler.py
index 43fc5fa..6ca49c2 100644
--- a/Lib/packaging/compiler/msvc9compiler.py
+++ b/Lib/packaging/compiler/msvc9compiler.py
@@ -130,10 +130,10 @@ class MacroExpander:
raise KeyError("sdkinstallrootv2.0")
except KeyError:
raise PackagingPlatformError(
- """Python was built with Visual Studio 2008;
-extensions must be built with a compiler than can generate compatible binaries.
-Visual Studio 2008 was not found on this system. If you have Cygwin installed,
-you can try compiling with MingW32, by passing "-c mingw32" to setup.py.""")
+"""Python was built with Visual Studio 2008; extensions must be built with a
+compiler than can generate compatible binaries. Visual Studio 2008 was not
+found on this system. If you have Cygwin installed, you can try compiling
+with MingW32, by passing "-c mingw32" to pysetup.""")
if version >= 9.0:
self.set_macro("FrameworkVersion", self.vsbase, "clr version")
diff --git a/Lib/packaging/compiler/msvccompiler.py b/Lib/packaging/compiler/msvccompiler.py
index 97f76bb..3d4ac3c 100644
--- a/Lib/packaging/compiler/msvccompiler.py
+++ b/Lib/packaging/compiler/msvccompiler.py
@@ -134,8 +134,7 @@ class MacroExpander:
"""Python was built with Visual Studio 2003; extensions must be built with
a compiler than can generate compatible binaries. Visual Studio 2003 was
not found on this system. If you have Cygwin installed, you can try
-compiling with MingW32, by passing "-c mingw32" to setup.py.""")
-# XXX update this comment for setup.cfg
+compiling with MingW32, by passing "-c mingw32" to pysetup.""")
p = r"Software\Microsoft\NET Framework Setup\Product"
for base in HKEYS:
diff --git a/Lib/packaging/compiler/unixccompiler.py b/Lib/packaging/compiler/unixccompiler.py
index 8c24c0f..c857d03 100644
--- a/Lib/packaging/compiler/unixccompiler.py
+++ b/Lib/packaging/compiler/unixccompiler.py
@@ -33,7 +33,7 @@ import sysconfig
# we need some way for outsiders to feed preprocessor/compiler/linker
# flags in to us -- eg. a sysadmin might want to mandate certain flags
# via a site config file, or a user might want to set something for
-# compiling this module distribution only via the setup.py command
+# compiling this module distribution only via the pysetup command
# line, whatever. As long as these options come from something on the
# current system, they can be as system-dependent as they like, and we
# should just happily stuff them into the preprocessor/compiler/linker