Comment 1 for bug 1247643

Here's a patch which works for me and passes all the tests.
Essentially, the issue is that _parse returns None in a number of instances, but the interface has changed and a 2-tuple is now expected. It's essentially saying:

a, b = None

which fails miserably. Instead we return (None, None).