[Python-checkins] r54645 - in python/branches/release25-maint: Lib/distutils/msvccompiler.py Misc/NEWS (original) (raw)
neal.norwitz python-checkins at python.org
Sun Apr 1 20:29:53 CEST 2007
- Previous message: [Python-checkins] r54644 - in python/trunk: Lib/distutils/msvccompiler.py Misc/NEWS
- Next message: [Python-checkins] r54646 - in python/trunk: Lib/_strptime.py Lib/test/test_strptime.py Misc/NEWS
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: neal.norwitz Date: Sun Apr 1 20:29:47 2007 New Revision: 54645
Modified: python/branches/release25-maint/Lib/distutils/msvccompiler.py python/branches/release25-maint/Misc/NEWS Log: Backport 54644: SF #1685563, MSVCCompiler creates redundant and long PATH strings
If MSVCCompiler.initialize() was called multiple times, the path would get duplicated. On Windows, this is a problem because the path is limited to 4k. There's no benefit in adding a path multiple times, so prevent that from occuring. We also normalize the path before checking for duplicates so things like /a and /a/ won't both be stored.
Modified: python/branches/release25-maint/Lib/distutils/msvccompiler.py
--- python/branches/release25-maint/Lib/distutils/msvccompiler.py (original) +++ python/branches/release25-maint/Lib/distutils/msvccompiler.py Sun Apr 1 20:29:47 2007 @@ -187,6 +187,19 @@ j = string.find(sys.version, ")", i) return sys.version[i+len(prefix):j]
+def normalize_and_reduce_paths(paths):
- """Return a list of normalized paths with duplicates removed.
- The current order of paths is maintained.
- """
Paths are normalized so things like: /a and /a/ aren't both preserved.
- reduced_paths = []
- for p in paths:
np = os.path.normpath(p)# XXX(nnorwitz): O(n**2), if reduced_paths gets long perhaps use a set.if np not in reduced_paths:reduced_paths.append(np)- return reduced_paths
class MSVCCompiler (CCompiler) : @@ -270,6 +283,7 @@ self.__paths.append(p) except KeyError: pass
self.__paths = normalize_and_reduce_paths(self.__paths) os.environ['path'] = string.join(self.__paths, ';') self.preprocess_options = None
Modified: python/branches/release25-maint/Misc/NEWS
--- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Sun Apr 1 20:29:47 2007 @@ -219,6 +219,8 @@ Library
+- Patch #1685563: remove (don't add) duplicate paths in distutils.MSVCCompiler. +
Bug #978833: Revert r50844, as it broke _socketobject.dup.
Bug #1675967: re patterns pickled with Python 2.4 and earlier can
- Previous message: [Python-checkins] r54644 - in python/trunk: Lib/distutils/msvccompiler.py Misc/NEWS
- Next message: [Python-checkins] r54646 - in python/trunk: Lib/_strptime.py Lib/test/test_strptime.py Misc/NEWS
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]