Changeset 275

Show
Ignore:
Timestamp:
Wed Dec 21 21:36:21 2005
Author:
limodou
Message:

将扩展模块模块直接导入，不再是使用文件方式。这样应该对于py2exe有好处。

Files:

Legend:

Unmodified
Added
Removed
Modified

  • newedit/trunk/ChangeLog.txt

    r274 r275  
    1 1 $Rev$  
      2 [2005/12/22]  
      3 Template.py ModulesInfo.py  
      4                     œ«À©Õ¹Ä£¿éÄ£¿éÖ±œÓµŒÈ룬²»ÔÙÊÇʹÓÃÎÄŒþ·œÊœ¡£ÕâÑùÓŠžÃ¶ÔÓÚpy2exeÓкΊ¡£  
      5                      
    2 6 [2005/12/21]  
    3 7 FtpClass.py         Fixed gif filename bug  

  • newedit/trunk/mixins/ModulesInfo.py

    r183 r275  
    55 55  
    56 56     template = Template()  
    57       f = os.path.join(win.workpath, 'mixins/T_modulesinfo.py')  
    58       if not os.path.exists(f):  
    59           f = os.path.join(win.workpath, 'mixins/T_modulesinfo.pyc')  
    60       elif not os.path.exists(f):  
    61           f = os.path.join(win.workpath, 'mixins/T_modulesinfo.pyo')  
    62       template.load(f)  
      57 #    f = os.path.join(win.workpath, 'mixins/T_modulesinfo.py')  
      58 #    if not os.path.exists(f):  
      59 #        f = os.path.join(win.workpath, 'mixins/T_modulesinfo.pyc')  
      60 #    elif not os.path.exists(f):  
      61 #        f = os.path.join(win.workpath, 'mixins/T_modulesinfo.pyo')  
      62     import T_modulesinfo  
      63     template.load(T_modulesinfo, 'python')  
    63 64  
    64 65     f = os.path.join(win.app.userpath, 'modulesinfo.html')  

  • newedit/trunk/modules/meteor/Template.py

    r245 r275  
    73 73     def process(self, modulename):  
    74 74         """process a template object and return template elements and relation nodes set"""  
    75           dirname = os.path.dirname(os.path.abspath(modulename))  
    76           filename, ext = os.path.splitext(os.path.basename(modulename))  
    77           if ext.lower() not in ('.py', '.pyc', '.pyo'):  
    78               return {}, {}  
    79           if sys.modules.has_key(filename):  
    80               del sys.modules[filename]  
    81           if dirname:  
    82               sys.path.insert(0, dirname)  
    83           mod = __import__(filename)  
    84           if dirname:  
    85               del sys.path[0]  
      75         if isinstance(modulename, (str, unicode)):  
      76             dirname = os.path.dirname(os.path.abspath(modulename))  
      77             filename, ext = os.path.splitext(os.path.basename(modulename))  
      78             if ext.lower() not in ('.py', '.pyc', '.pyo'):  
      79                 return {}, {}  
      80             if sys.modules.has_key(filename):  
      81                 del sys.modules[filename]  
      82             if dirname:  
      83                 sys.path.insert(0, dirname)  
      84             mod = __import__(filename)  
      85             if dirname:  
      86                 del sys.path[0]  
      87         else:  
      88             mod = modulename  
    86 89  
    87 90         vars = {}