merge 3.2

This commit is contained in:
Benjamin Peterson 2012-10-12 12:04:32 -04:00
commit 143d034ecd
14 changed files with 242 additions and 240 deletions

View file

@ -565,10 +565,10 @@ class RunPathTestCase(unittest.TestCase, CodeExecutionMixin):
with open(filename, 'w', encoding='latin1') as f:
f.write("""
#coding:latin1
"non-ASCII: h\xe9"
s = "non-ASCII: h\xe9"
""")
result = run_path(filename)
self.assertEqual(result['__doc__'], "non-ASCII: h\xe9")
self.assertEqual(result['s'], "non-ASCII: h\xe9")
def test_main():