[Python-checkins] r71515 - in python/branches/py3k: Lib/distutils/command/config.py
tarek.ziade
python-checkins at python.org
Sun Apr 12 17:07:31 CEST 2009
Author: tarek.ziade
Date: Sun Apr 12 17:07:31 2009
New Revision: 71515
Log:
Merged revisions 71513 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71513 | tarek.ziade | 2009-04-12 17:03:50 +0200 (Sun, 12 Apr 2009) | 1 line
pep8-fied the module before adding tests
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/command/config.py
Modified: python/branches/py3k/Lib/distutils/command/config.py
==============================================================================
--- python/branches/py3k/Lib/distutils/command/config.py (original)
+++ python/branches/py3k/Lib/distutils/command/config.py Sun Apr 12 17:07:31 2009
@@ -53,8 +53,6 @@
self.compiler = None
self.cc = None
self.include_dirs = None
- #self.define = None
- #self.undef = None
self.libraries = None
self.library_dirs = None
@@ -136,8 +134,8 @@
self.compiler.compile([src], include_dirs=include_dirs)
return (src, obj)
- def _link(self, body, headers, include_dirs, libraries,
- library_dirs, lang):
+ def _link(self, body, headers, include_dirs, libraries, library_dirs,
+ lang):
(src, obj) = self._compile(body, headers, include_dirs, lang)
prog = os.path.splitext(os.path.basename(src))[0]
self.compiler.link_executable([obj], prog,
@@ -191,8 +189,8 @@
self._clean()
return ok
- def search_cpp(self, pattern, body=None, headers=None,
- include_dirs=None, lang="c"):
+ def search_cpp(self, pattern, body=None, headers=None, include_dirs=None,
+ lang="c"):
"""Construct a source file (just like 'try_cpp()'), run it through
the preprocessor, and return true if any line of the output matches
'pattern'. 'pattern' should either be a compiled regex object or a
@@ -237,8 +235,8 @@
self._clean()
return ok
- def try_link(self, body, headers=None, include_dirs=None,
- libraries=None, library_dirs=None, lang="c"):
+ def try_link(self, body, headers=None, include_dirs=None, libraries=None,
+ library_dirs=None, lang="c"):
"""Try to compile and link a source file, built from 'body' and
'headers', to executable form. Return true on success, false
otherwise.
@@ -256,8 +254,8 @@
self._clean()
return ok
- def try_run(self, body, headers=None, include_dirs=None,
- libraries=None, library_dirs=None, lang="c"):
+ def try_run(self, body, headers=None, include_dirs=None, libraries=None,
+ library_dirs=None, lang="c"):
"""Try to compile, link to an executable, and run a program
built from 'body' and 'headers'. Return true on success, false
otherwise.
More information about the Python-checkins
mailing list