Changeset 471

Show
Ignore:
Timestamp:
Mon Jun 16 11:27:03 2008
Author:
giovannibajo
Message:

Merged revisions 468-470 via svnmerge from
https://svn.pyinstaller.python-hosting.com/trunk[[BR]]
........

r468 | naufraghi | 2008-05-21 19:50:13 +0200 (mer, 21 mag 2008) | 1 line

Remove debug FIXME and simplify code
........
r469 | giovannibajo | 2008-06-06 12:09:28 +0200 (ven, 06 giu 2008) | 4 lines

Improve error reporting in a from-import when the imported name does not exist.
Now that exceptions spawned by invalid tries within PyInstaller? do not propagate,
it is possible to simlpy expose the real underlying exception.
........
r470 | giovannibajo | 2008-06-16 18:22:51 +0200 (lun, 16 giu 2008) | 2 lines

Add import hook for package "email" with Python 2.5
........

Files:

Legend:

Unmodified
Added
Removed
Modified

  • branches/crypt/iu.py

    r461 r471  
    322 322                 if threaded:  
    323 323                     self._acquire()  
    324                   mod = _sys_modules_get(fqname, UNTRIED)  
    325                   if mod is UNTRIED:  
    326                       try:  
      324                 try:  
      325                     mod = _sys_modules_get(fqname, UNTRIED)  
      326                     if mod is UNTRIED:  
    327 327                         mod = _self_doimport(nm, ctx, fqname)  
    328                       except Exception, e:  
    329                           print "FIXME: _self_doimport %r" % e,  
    330                           print " nm='%s' ctx='%s' fqname='%s'" % (nm, ctx, fqname)  
    331                           if threaded:  
    332                               self._release()  
    333                           raise  
    334                   if threaded:  
    335                       self._release()  
      328                 finally:  
      329                     if threaded:  
      330                         self._release()  
    336 331                 if mod:  
    337 332                     ctx = fqname  
    …… 
    372 367                     try:  
    373 368                         mod = self.doimport(nm, ctx, ctx+'.'+nm)  
    374                       except Exception, e:  
    375                           print "FIXME: self.doimport Exception", e  
    376                       if threaded:  
    377                           self._release()  
      369                     finally:  
      370                         if threaded:  
      371                             self._release()  
    378 372         #print "importHook done with %s %s %s (case 3)" % (name, globals['__name__'], fromlist)  
    379 373         return bottommod  

  • branches/crypt/doc/CHANGES.txt

    r463 r471  
    10 10    2.5 version)  
    11 11  + Add import hooks per SQLAlchemy (thanks to Greg Copeland)  
      12  + Add import hooks for email in Python 2.5 (though it does not support  
      13    the old-style Python 2.4 syntax with Python 2.5).  
    12 14  + Add import hook for gadfly.  
    13 15  + Improve import hooks for PyGTK (thanks to Marco Bonifazi and foxx).