Changeset 482

Show
Ignore:
Timestamp:
02/06/08 22:50:47 (10 months ago)
Author:
asc
Message:

fix a bunch of leftover typos and mistakes to get OSM/BM tiles working; made provider regexp more liberal

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/py/wscompose/validate.py

    r478 r482  
    2020            'adjust' : re.compile(r"^(\d+(?:\.\d*)?|\d*?\.\d+)$"), 
    2121            'num' : re.compile(r"^\d+$"), 
    22             'provider' : re.compile(r"^(GOOGLE|YAHOO|MICROSOFT)_(ROAD|HYBRID|AERIAL)$"), 
     22            'provider' : re.compile(r"^([A-Z_]+)$"), 
    2323            'label' : re.compile(r"^(?:[a-z0-9-_]+)$") 
    2424            } 
    …… 
    101101 
    102102        if not self.regexp('provider', input) : 
    103             raise Exception, "Not a valid provider : %s" % p 
     103            raise Exception, "Not a valid provider : %s" % input 
    104104 
    105105        return input