← Back to branch summary

~gary/zc.buildout/python-support-4

« back to all changes in this revision

Viewing changes to src/zc/buildout/easy_install.txt

  • Committer: gary
  • Date: 2010-02-12 16:35:25 UTC
  • Revision ID: svn-v4:62d5b8a3-27da-0310-9561-8e5933582275:zc.buildout/branches/gary-4:108956
revert attempt to skip some of the pkg_resources dance: it caused me trouble.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/zc/buildout/easy_install.txt
1287
1287
            if not sitedircase in known_paths and os.path.exists(sitedir):
1288
1288
                sys.path.append(sitedir)
1289
1289
                known_paths.add(sitedircase)
1290
 
                for dist in pkg_resources.find_distributions(sitedir, True):
1291
 
                    pkg_resources.fixup_namespace_packages(dist.location)
1292
 
                    if dist.has_metadata('namespace_packages.txt'):
1293
 
                        for namespace in dist.get_metadata_lines(
1294
 
                            'namespace_packages.txt'):
1295
 
                            pkg_resources.declare_namespace(namespace)
 
1290
                pkg_resources.working_set.add_entry(sitedir)
1296
1291
        original_paths = [
1297
1292
            ...
1298
1293
            ]
1354
1349
            if not sitedircase in known_paths and os.path.exists(sitedir):
1355
1350
                sys.path.append(sitedir)
1356
1351
                known_paths.add(sitedircase)
1357
 
                for dist in pkg_resources.find_distributions(sitedir, True):
1358
 
                    pkg_resources.fixup_namespace_packages(dist.location)
1359
 
                    if dist.has_metadata('namespace_packages.txt'):
1360
 
                        for namespace in dist.get_metadata_lines(
1361
 
                            'namespace_packages.txt'):
1362
 
                            pkg_resources.declare_namespace(namespace)
 
1352
                pkg_resources.working_set.add_entry(sitedir)
1363
1353
        original_paths = [
1364
1354
            ...
1365
1355
            ]