summaryrefslogtreecommitdiffstats
path: root/Lib/site.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-06-27 21:45:24 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-06-27 21:45:24 (GMT)
commit3e5cd1d04e8a39130752a1e888707a68a2943274 (patch)
tree8108e5e2b0bc0059f4d7ae3ec11e59df69e5015f /Lib/site.py
parent63eebe5318e2da467d6a57eae12083dbc14f31e4 (diff)
downloadcpython-3e5cd1d04e8a39130752a1e888707a68a2943274.zip
cpython-3e5cd1d04e8a39130752a1e888707a68a2943274.tar.gz
cpython-3e5cd1d04e8a39130752a1e888707a68a2943274.tar.bz2
Merged revisions 81465-81466,81468,81679,81735,81760,81868,82183 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81465 | georg.brandl | 2010-05-22 06:29:19 -0500 (Sat, 22 May 2010) | 2 lines Issue #3924: Ignore cookies with invalid "version" field in cookielib. ........ r81466 | georg.brandl | 2010-05-22 06:31:16 -0500 (Sat, 22 May 2010) | 1 line Underscore the name of an internal utility function. ........ r81468 | georg.brandl | 2010-05-22 06:43:25 -0500 (Sat, 22 May 2010) | 1 line #8635: document enumerate() start parameter in docstring. ........ r81679 | benjamin.peterson | 2010-06-03 16:21:03 -0500 (Thu, 03 Jun 2010) | 1 line use a set for membership testing ........ r81735 | michael.foord | 2010-06-05 06:46:59 -0500 (Sat, 05 Jun 2010) | 1 line Extract error message truncating into a method (unittest.TestCase._truncateMessage). ........ r81760 | michael.foord | 2010-06-05 14:38:42 -0500 (Sat, 05 Jun 2010) | 1 line Issue 8302. SkipTest exception is setUpClass or setUpModule is now reported as a skip rather than an error. ........ r81868 | benjamin.peterson | 2010-06-09 14:45:04 -0500 (Wed, 09 Jun 2010) | 1 line fix code formatting ........ r82183 | benjamin.peterson | 2010-06-23 15:29:26 -0500 (Wed, 23 Jun 2010) | 1 line cpython only gc tests ........
Diffstat (limited to 'Lib/site.py')
-rw-r--r--Lib/site.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/site.py b/Lib/site.py
index 8563df2..4624bf3 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -273,12 +273,12 @@ def getsitepackages():
environment, and will return a list of full paths.
"""
sitepackages = []
- seen = []
+ seen = set()
for prefix in PREFIXES:
if not prefix or prefix in seen:
continue
- seen.append(prefix)
+ seen.add(prefix)
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))