1
=== modified file 'buildout-templates/_pythonpath.py.in'
2
--- buildout-templates/_pythonpath.py.in	2009-10-19 19:33:01 +0000
3
+++ buildout-templates/_pythonpath.py.in	2009-11-05 20:20:37 +0000
4
@@ -6,6 +6,7 @@
5
6
6
6
7
__metaclass__ = type
7
__metaclass__ = type
7
8
8
8
9
import new
9
9
import os
10
import os
10
10
import site
11
import site
11
11
import sys
12
import sys
12
@@ -19,22 +20,58 @@
13
19
site_dirs = [
20
site_dirs = [
14
20
    ${indented-dir-paths}
21
    ${indented-dir-paths}
15
21
    ]
22
    ]
16
22
clean_modules = [
17
23
    'os',
18
24
    '_pythonpath',
19
25
    'site',
20
26
    'sitecustomize',
21
27
    'sys',
22
28
    ${clean-sys-modules}
23
29
    ]
24
30
23
25
31
def set_path():
24
def set_path():
32
32
    previously_imported = {}
25
    # We need to remove any modules installed using the setuptools
33
33
    # We get a copy of the keys rather than simply iterating because we will
26
    # namespace package approach that generates .pth files that mutate
34
34
    # be mutating the dictionary.
27
    # sys.modules.  They can mask the namespace modules we actually
35
35
    for k in sys.modules.keys():
28
    # want. We will try to recognize these sorts of namespace modules by
36
36
        if k not in clean_modules:
29
    # looking for modules that do not have a __file__, like the ones
37
37
            previously_imported[k] = sys.modules.pop(k)
30
    # generated by these .pth files.  However, that's not good enough: some
38
31
    # C modules look like this.  We then look for any names in the
39
32
    # module that are not special Python names (__*__) that are also not
40
33
    # in sys.modules.  If any one of these exist, this is not a
41
34
    # namespace module.  Otherwise, it is a namespace module.  Moreover,
42
35
    # if there were any sys.modules names from the namespace module,
43
36
    # this _pythonpath module was imported too late: we should complain.
44
37
    #
45
38
    # If you have not seen the code in these .pth files, here's an
46
39
    # example.  It is all in one line in the .pth files, because of the
47
40
    # .pth syntax for this feature.
48
41
    #
49
42
    # import sys,new,os;
50
43
    # p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('lazr',));
51
44
    # ie = os.path.exists(os.path.join(p,'__init__.py'));
52
45
    # m = not ie and sys.modules.setdefault('lazr',new.module('lazr'));
53
46
    # mp = (m or []) and m.__dict__.setdefault('__path__',[]);
54
47
    # (p not in mp) and mp.append(p)
55
48
    #
56
49
    # Note that we will be mutating sys.modules, so we want to make sure to be
57
50
    # getting a copy, not an iterable.
58
51
    marker = object()
59
52
    for k, v in sys.modules.items():
60
53
        if k == '__main__' or not isinstance(v, new.module):
61
54
            # These are some special cases that we'll pass by.
62
55
            continue
63
56
        if getattr(v, '__file__', marker) is marker:
64
57
            # This is a .pth-generated namespace or C module.
65
58
            for name in dir(v):
66
59
                if not name.startswith('__') and not name.endswith('__'):
67
60
                    full_name = '.'.join((k, name))
68
61
                    if full_name in sys.modules:
69
62
                        # This is a .pth-generated namespace module that
70
63
                        # has had one of its sub-packages imported.
71
64
                        raise RuntimeError(
72
65
                            'Found unexpected module %s.  '
73
66
                            'Import _pythonpath earlier!' % (full_name,))
74
67
                    else:
75
68
                        # This is a C module or something like that.  Nothing
76
69
                        # to see here: move along.
77
70
                        break
78
71
            else:
79
72
                # It is a .pth-generated namespace module.  Remove it
80
73
                # so we can let our eggs make their own.
81
74
                del sys.modules[k]
82
38
75
83
39
    # We keep the very first path because that is typically the directory
76
    # We keep the very first path because that is typically the directory
84
40
    # of the file that imported us, which should continue to have precedence.
77
    # of the file that imported us, which should continue to have precedence.
85
@@ -53,15 +90,6 @@
86
53
    for p in site_dirs:
90
    for p in site_dirs:
87
54
        site.addsitedir(p)
91
        site.addsitedir(p)
88
55
92
89
56
    # We don't want to have dropped any packages that weren't already added
90
57
    # back by what we just did.  If we did, there's a good chance that the
91
58
    # world will now be insane.  Quit now, and let's fix it.
92
59
    unexpected = set(previously_imported).difference(sys.modules)
93
60
    if unexpected:
94
61
        raise RuntimeError(
95
62
            'Found unexpected module(s): %s\n\nImport _pythonpath earlier!' %
96
63
            (', '.join(sorted(unexpected)),))
97
64
98
65
    # Make subprocesses have the same environment.
93
    # Make subprocesses have the same environment.
99
66
    os.environ['PYTHONPATH'] = os.pathsep.join(sys.path)
94
    os.environ['PYTHONPATH'] = os.pathsep.join(sys.path)
100
67
95
Reviewer	Review Type	Date Requested	Status
Francis J. Lacoste (community)	release-critical	2009-11-05	Approve on 2009-11-05
Barry Warsaw (community)	code	2009-11-05	Approve on 2009-11-05
Review via email: mp+14490@code.launchpad.net