Use `except ... as ...:` syntax to improve compatibility with Python3.

We are dropping python 2.5 support in django 1.5, so the old style with commas is no longer needed. This should make the diff with the Py3 guys much smaller.