Annotation of /trunk/python/patches/python-2.7.0-r79310.patch
Parent Directory | Revision Log
Revision 1097 -
(hide annotations)
(download)
Thu Aug 19 16:31:49 2010 UTC (14 years, 1 month ago) by niro
File size: 894 byte(s)
Thu Aug 19 16:31:49 2010 UTC (14 years, 1 month ago) by niro
File size: 894 byte(s)
-upstream patch to fix module loading issues
1 | niro | 1097 | Index: Misc/NEWS |
2 | =================================================================== | ||
3 | --- Misc/NEWS (revision 79309) | ||
4 | +++ Misc/NEWS (revision 79310) | ||
5 | @@ -29,6 +29,9 @@ | ||
6 | Library | ||
7 | ------- | ||
8 | |||
9 | +- Issue #8205: Remove the "Modules" directory from sys.path when Python is | ||
10 | + running from the build directory (POSIX only). | ||
11 | + | ||
12 | - Issue #7667: Fix doctest failures with non-ASCII paths. | ||
13 | |||
14 | - Issue #7512: shutil.copystat() could raise an OSError when the filesystem | ||
15 | Index: Lib/site.py | ||
16 | =================================================================== | ||
17 | --- Lib/site.py (revision 79309) | ||
18 | +++ Lib/site.py (revision 79310) | ||
19 | @@ -118,7 +118,7 @@ | ||
20 | s = "build/lib.%s-%.3s" % (get_platform(), sys.version) | ||
21 | if hasattr(sys, 'gettotalrefcount'): | ||
22 | s += '-pydebug' | ||
23 | - s = os.path.join(os.path.dirname(sys.path[-1]), s) | ||
24 | + s = os.path.join(os.path.dirname(sys.path.pop()), s) | ||
25 | sys.path.append(s) | ||
26 | |||
27 |