Merged requested to merge bitbucket/merged-pr-261 into branch/py3.3
Created originally on Bitbucket by kvas (Vasily Kuznetsov)
Was already merged in Bitbucket before import, marked as merged by the import user
- Additional tests for dir and __dir__ that I wrote when I was fixing test_dir in test_builtins.py (which was mostly fixed by Martin's pull request),
- Customized __dir__ implementation for tracebacks that returns only ['tb_frame', 'tb_lasti', 'tb_lineno', 'tb_next'] (which fixes the part related to tracebacks),
- Fix for test_open_default_encoding (the missing part of http://hg.python.org/cpython/rev/2587328c7c9c ported to pypy),
- Converted PendingDeprecationWarning issued on format(object(), 'something') to DeprecationWarning (this is cpython3.3 behavior).