avoids circular import
Merge branch 'master' of github.com:nesaro/pydsl