Author: Brian Kearns <[email protected]>
Branch: py3k
Changeset: r62062:b9b453ec29c9
Date: 2013-03-05 01:59 -0500
http://bitbucket.org/pypy/pypy/changeset/b9b453ec29c9/
Log: merge heads
diff --git a/lib-python/3/test/string_tests.py
b/lib-python/3/test/string_tests.py
--- a/lib-python/3/test/string_tests.py
+++ b/lib-python/3/test/string_tests.py
@@ -1060,7 +1060,7 @@
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)
diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpreter/app_main.py
@@ -485,6 +485,7 @@
def exec_(src, dic):
exec(src, dic)
+@hidden_applevel
def run_command_line(interactive,
inspect,
run_command,
@@ -713,6 +714,7 @@
# This is important for py3k
sys.executable = executable
+@hidden_applevel
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
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
