@mdboom - so is the Python 2.6 fix I added ok? (moving the regular expression compilation outside the function)