Use Py2.6 compatible syntax, and stay within 79, not 80 chars.