[pypy-svn] r68439 - in pypy/trunk: lib-python pypy/annotation pypy/config pypy/interpreter pypy/interpreter/test pypy/jit/metainterp pypy/jit/metainterp/test pypy/jit/tl pypy/module/__builtin__ pypy/module/_weakref pypy/module/pypyjit pypy/module/thread pypy/objspace pypy/rpython pypy/rpython/lltypesystem pypy/rpython/ootypesystem pypy/translator

cfbolz at codespeak.net cfbolz at codespeak.net
Wed Oct 14 14:56:55 CEST 2009


Author: cfbolz
Date: Wed Oct 14 14:56:55 2009
New Revision: 68439

Added:
   pypy/trunk/lib-python/
      - copied from r68438, pypy/branch/improve-kwd-args/lib-python/
   pypy/trunk/pypy/annotation/
      - copied from r68438, pypy/branch/improve-kwd-args/pypy/annotation/
   pypy/trunk/pypy/config/pypyoption.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/config/pypyoption.py
   pypy/trunk/pypy/interpreter/argument.py
      - copied unchanged from r68438, pypy/trunk/pypy/interpreter/argument.py.merge.tmp
   pypy/trunk/pypy/interpreter/eval.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/interpreter/eval.py
   pypy/trunk/pypy/interpreter/function.py
      - copied unchanged from r68438, pypy/trunk/pypy/interpreter/function.py.merge.tmp
   pypy/trunk/pypy/interpreter/gateway.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/interpreter/gateway.py
   pypy/trunk/pypy/interpreter/pycode.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/interpreter/pycode.py
   pypy/trunk/pypy/interpreter/pyframe.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/interpreter/pyframe.py
   pypy/trunk/pypy/interpreter/pyopcode.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/interpreter/pyopcode.py
   pypy/trunk/pypy/interpreter/test/
      - copied from r68438, pypy/branch/improve-kwd-args/pypy/interpreter/test/
   pypy/trunk/pypy/interpreter/typedef.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/interpreter/typedef.py
   pypy/trunk/pypy/jit/metainterp/optimizeopt.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/jit/metainterp/optimizeopt.py
   pypy/trunk/pypy/jit/metainterp/test/test_optimizeopt.py
      - copied unchanged from r68438, pypy/trunk/pypy/jit/metainterp/test/test_optimizeopt.py.merge.tmp
   pypy/trunk/pypy/jit/metainterp/test/test_string.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/jit/metainterp/test/test_string.py
   pypy/trunk/pypy/jit/metainterp/test/test_vlist.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/jit/metainterp/test/test_vlist.py
   pypy/trunk/pypy/jit/tl/
      - copied from r68438, pypy/branch/improve-kwd-args/pypy/jit/tl/
   pypy/trunk/pypy/module/__builtin__/
      - copied from r68438, pypy/branch/improve-kwd-args/pypy/module/__builtin__/
   pypy/trunk/pypy/module/_weakref/
      - copied from r68438, pypy/branch/improve-kwd-args/pypy/module/_weakref/
   pypy/trunk/pypy/module/pypyjit/
      - copied from r68438, pypy/branch/improve-kwd-args/pypy/module/pypyjit/
   pypy/trunk/pypy/module/thread/
      - copied from r68438, pypy/branch/improve-kwd-args/pypy/module/thread/
   pypy/trunk/pypy/objspace/
      - copied from r68438, pypy/branch/improve-kwd-args/pypy/objspace/
   pypy/trunk/pypy/rpython/callparse.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/rpython/callparse.py
   pypy/trunk/pypy/rpython/lltypesystem/rstr.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/rpython/lltypesystem/rstr.py
   pypy/trunk/pypy/rpython/ootypesystem/ootype.py
      - copied unchanged from r68438, pypy/trunk/pypy/rpython/ootypesystem/ootype.py.merge.tmp
   pypy/trunk/pypy/rpython/rbuiltin.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/rpython/rbuiltin.py
   pypy/trunk/pypy/translator/geninterplevel.py
      - copied unchanged from r68438, pypy/branch/improve-kwd-args/pypy/translator/geninterplevel.py
Removed:
   pypy/trunk/pypy/interpreter/argument.py.merge.tmp
   pypy/trunk/pypy/interpreter/function.py.merge.tmp
   pypy/trunk/pypy/jit/metainterp/test/test_optimizeopt.py.merge.tmp
   pypy/trunk/pypy/rpython/ootypesystem/ootype.py.merge.tmp
Log:
merge improve-kwd-args




More information about the Pypy-commit mailing list