Brian Kearns  committed b9b453e Merge

merge heads

  • Participants
  • Parent commits 8d6f0f4, cf85856
  • Branches py3k

Comments (0)

Files changed (2)

File lib-python/3/test/

         self.checkequal('abc', 'abc', '__mul__', 1)
         self.checkequal('abcabcabc', 'abc', '__mul__', 3)
         self.checkraises(TypeError, 'abc', '__mul__')
-        self.checkraises(TypeError, operator.mul, 'abc', '')
+        self.assertRaises(TypeError, operator.mul, 'abc', '')
         # XXX: on a 64-bit system, this doesn't raise an overflow error,
         # but either raises a MemoryError, or succeeds (if you have 54TiB)
         #self.checkraises(OverflowError, 10000*'abc', '__mul__', 2000000000)

File pypy/interpreter/

 def exec_(src, dic):
     exec(src, dic)
 def run_command_line(interactive,
     # This is important for py3k
     sys.executable = executable
 def entry_point(executable, argv):
     # note that before calling setup_bootstrap_path, we are limited because we
     # cannot import stdlib modules. In particular, we cannot use unicode