Mac client fails to build

[bewst]

creating build/bdist.macosx-10.5-i386/python2.5-standalone/app/lib-dynload
creating build/bdist.macosx-10.5-i386/python2.5-standalone/app/Frameworks
Traceback (most recent call last):
  File "/opt/local/lib/python2.5/site-packages/py2app/build_app.py", line 588, in _run
    self.run_normal()
  File "/opt/local/lib/python2.5/site-packages/py2app/build_app.py", line 640, in run_normal
    mf = self.get_modulefinder()
  File "/opt/local/lib/python2.5/site-packages/py2app/build_app.py", line 548, in get_modulefinder
    debug=debug,
  File "/opt/local/lib/python2.5/site-packages/modulegraph/find_modules.py", line 255, in find_modules
    find_needed_modules(mf, scripts, includes, packages)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/find_modules.py", line 176, in find_needed_modules
    mf.run_script(path)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py", line 369, in run_script
    self.scan_code(co, m)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py", line 638, in scan_code
    self.scan_code(c, m)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py", line 610, in scan_code
    self._safe_import_hook(name, m, fromlist)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py", line 540, in _safe_import_hook
    mods = self.import_hook(name, caller)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py", line 380, in import_hook
    q, tail = self.find_head_package(parent, name)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py", line 419, in find_head_package
    q = self.import_module(head, qname, parent)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py", line 493, in import_module
    parent and parent.packagepath, parent)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py", line 680, in find_module
    fp, buf, stuff = find_module(name, path)
  File "/opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py", line 114, in find_module
    if isinstance(importer, pkg_resources.ImpWrapper):
AttributeError: 'module' object has no attribute 'ImpWrapper'
> /opt/local/lib/python2.5/site-packages/modulegraph/modulegraph.py(114)find_module()
-> if isinstance(importer, pkg_resources.ImpWrapper):

[zooko]

I'll accept this ticket. I'm pretty sure I know why it is doing this -- I pulled a patch from setuptools trunk into zetuptoolz that replaces the implementation of pkgutil. Next chance I get (tomorrow?) I'll undo that patch, build a new zetuptoolz, and see if that fixes it.

[zooko]

P.S. Thank you, bewst, for all the good bug reports. If this keeps up the v1.5 release in June will be much improved. ;-)

[zooko]

Duplicate of #668.