Merge pull request #801 from mwhudson/tokenizer-compat

Keep compability with stdlib tokenize.py changes