Changeset 306

Show
Ignore:
Timestamp:
Mon Feb 5 17:47:12 2007
Author:
giovannibajo
Message:

Fix support for CRLF under Linux

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/mf.py

    r279 r306  
    69 69             if pyc is None or py and pyc[1][8] < py[1][8]:  
    70 70                 try:  
    71                       co = compile(open(py[0], 'r').read()+'\n', py[0], 'exec')  
      71                     stuff = open(py[0], 'r').read()+'\n'  
      72                     co = compile(string.replace(stuff, "\r\n", "\n"), py[0], 'exec')  
    72 73                     if __debug__:  
    73 74                         pth = py[0] + 'c'  
    …… 
    180 181             elif typ == imp.PY_SOURCE:  
    181 182                 try:  
    182                       co = compile(open(fnm, 'r').read()+'\n', fnm, 'exec')  
      183                     stuff = open(fnm, 'r').read()+'\n'  
      184                     co = compile(string.replace(stuff, "\r\n", "\n"), fnm, 'exec')  
    183 185                 except SyntaxError, e:  
    184 186                     print "Invalid syntax in %s" % py[0]  
    …… 
    370 372     def analyze_script(self, fnm):  
    371 373         try:  
    372               co = compile(open(fnm, 'r').read()+'\n', fnm, 'exec')  
      374             stuff = open(fnm, 'r').read()+'\n'  
      375             co = compile(string.replace(stuff, "\r\n", "\n"), fnm, 'exec')  
    373 376         except SyntaxError, e:  
    374 377             print "Invalid syntax in %s" % fnm  

  • trunk/doc/CHANGES.txt

    r305 r306  
    9 9  * Removed C++-style comments from the bootloader for compatibility  
    10 10    with the AIX compiler.  
      11  + Fix support for .py files with DOS line endings under Linux (fixes  
      12    PyOpenGL).  
    11 13  
    12 14