mercurial@3877: 2 new changesets

Matt Mackall mpm at selenic.com
Fri Dec 15 12:34:55 CST 2006


On Fri, Dec 15, 2006 at 09:17:10AM -0800, Lee Cantey wrote:
> On 12/15/06, Christian Ebert <blacktrash at gmx.net> wrote:
> >This breaks here on MacOS 10.3.9 with python2.5. Mind you I might
> >have screwed up something with 2.5 because I compiled it myself.
> >It works with 2.4 from fink (but then again, tip breaks my web
> >view via hgwebdir.cgi).
> 
> I see the same problem using the 2.5 from python.org.

I've pushed a temporary fix:

diff -r 070628929e1f -r f47afa2401a2 mercurial/demandimport.py
--- a/mercurial/demandimport.py Fri Dec 15 01:17:04 2006 -0600
+++ b/mercurial/demandimport.py Fri Dec 15 12:38:18 2006 -0600
@@ -92,7 +92,7 @@ def _demandimport(name, globals=None, lo
                 setattr(mod, x, _demandmod(x, mod.__dict__,
		 mod.__dict__))
         return mod

-ignore = []
+ignore = ['_hashlib', 'email.mime']

 def enable():
     "enable global demand-loading of modules"


This lets it pass tests on 2.5 for me.

Can you take a stab at testing Py2exe with demandimport? I tried to
test it under Wine and it seemed to find all the modules but py2exe
doesn't actually get as far as building an executable.

-- 
Mathematics is the supreme nostalgia of our time.


More information about the Mercurial-devel mailing list