merge 3.3

This commit is contained in:
Benjamin Peterson 2012-10-09 11:16:13 -04:00
commit 29e02a2be8
10 changed files with 17 additions and 21 deletions

View file

@ -897,7 +897,7 @@ class SizeofTest(unittest.TestCase):
except TypeError:
tb = sys.exc_info()[2]
# traceback
if tb != None:
if tb is not None:
check(tb, size('2P2i'))
# symtable entry
# XXX