remove some legacy code
PyPy fix
PyPy fix
merge lxml-3.3 branch into master