Author: David Schneider <david.schnei...@picle.org> Branch: Changeset: r66830:9c7efdd6a360 Date: 2013-09-07 16:24 +0200 http://bitbucket.org/pypy/pypy/changeset/9c7efdd6a360/
Log: merge heads diff --git a/pypy/module/_minimal_curses/fficurses.py b/pypy/module/_minimal_curses/fficurses.py --- a/pypy/module/_minimal_curses/fficurses.py +++ b/pypy/module/_minimal_curses/fficurses.py @@ -26,6 +26,9 @@ def try_ldflags(): yield ExternalCompilationInfo(libraries=['curses']) yield ExternalCompilationInfo(libraries=['curses', 'tinfo']) + yield ExternalCompilationInfo(libraries=['ncurses']) + yield ExternalCompilationInfo(libraries=['ncurses'], + library_dirs=['/usr/lib64']) def try_tools(): try: diff --git a/rpython/rtyper/test/test_rclass.py b/rpython/rtyper/test/test_rclass.py --- a/rpython/rtyper/test/test_rclass.py +++ b/rpython/rtyper/test/test_rclass.py @@ -1192,3 +1192,19 @@ assert self.interpret(f, [True]) == f(True) assert self.interpret(f, [False]) == f(False) + + def test_init_with_star_args(self): + class Base(object): + def __init__(self, a, b): + self.a = a + self.b = b + class A(Base): + def __init__(self, *args): + Base.__init__(self, *args) + self.c = -1 + cls = [Base, A] + + def f(k, a, b): + return cls[k](a, b).b + + assert self.interpret(f, [1, 4, 7]) == 7 _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit