Use "except as", let exceptions descend from Exception, use one-argument 'raise'
Use new-style classes

Also make sure that all __init__ calls are multiple-inheritance friendly
Merge branch 'upstream'
ignore logfile
* Fix Cookie handling