Merge branch 'takowl-ipy3-preparation' into trunk

This branch cleans up our trunk to make a 2to3 run be as painless as
possible, while keeping our code fully 2.6-compatible.

Closes gh-159 (pull request).
This commit is contained in:
Fernando Perez 2010-10-10 13:09:17 -07:00
commit 3c50c7ece3

2
.gitignore vendored
View File

@ -4,3 +4,5 @@ docs/source/api/generated
*.pyc
build
*.egg-info
*.py~
*.bak