OpenLayers OpenLayers

Changeset 3008

Show
Ignore:
Timestamp:
04/04/07 23:51:32 (1 year ago)
Author:
crschmidt
Message:

make mergejs parsing more resilient to various line ending formats. this
makes building work on windows again.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/tools/mergejs.py

    r2978 r3008  
    118118        Parses the content of the named file and stores the values. 
    119119        """ 
    120         lines = [line[:-1] # Assumes end-of-line character is present 
     120        lines = [line.strip() # Assumes end-of-line character is present 
    121121                 for line in open(filename) 
    122                  if line != "\n"] # Skip blank lines 
     122                 if line.strip()] # Skip blank lines 
    123123 
    124124        self.forceFirst = lines[lines.index("[first]") + 1:lines.index("[last]")]