[pypy-svn] r43375 - in pypy/dist/pypy: annotation annotation/test interpreter module/__builtin__ module/math objspace/cpy objspace/fake objspace/std objspace/std/test rlib rlib/test rpython rpython/test translator

[arigo at codespeak.net]

Author: arigo
Date: Mon May 14 18:20:01 2007
New Revision: 43375

Added:
   pypy/dist/pypy/annotation/binaryop.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/annotation/binaryop.py
   pypy/dist/pypy/annotation/builtin.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/annotation/builtin.py
   pypy/dist/pypy/annotation/test/test_annrpython.py
      - copied unchanged from r43374, pypy/dist/pypy/annotation/test/test_annrpython.py.merge.tmp
   pypy/dist/pypy/interpreter/
      - copied from r43374, pypy/branch/pypy-string-formatting/interpreter/
   pypy/dist/pypy/module/__builtin__/
      - copied from r43374, pypy/branch/pypy-string-formatting/module/__builtin__/
   pypy/dist/pypy/module/math/
      - copied from r43374, pypy/branch/pypy-string-formatting/module/math/
   pypy/dist/pypy/objspace/cpy/
      - copied from r43374, pypy/branch/pypy-string-formatting/objspace/cpy/
   pypy/dist/pypy/objspace/fake/
      - copied from r43374, pypy/branch/pypy-string-formatting/objspace/fake/
   pypy/dist/pypy/objspace/std/floatobject.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/objspace/std/floatobject.py
   pypy/dist/pypy/objspace/std/formatting.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/objspace/std/formatting.py
   pypy/dist/pypy/objspace/std/longobject.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/objspace/std/longobject.py
   pypy/dist/pypy/objspace/std/marshal_impl.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/objspace/std/marshal_impl.py
   pypy/dist/pypy/objspace/std/stringobject.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/objspace/std/stringobject.py
   pypy/dist/pypy/objspace/std/test/test_stringformat.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/objspace/std/test/test_stringformat.py
   pypy/dist/pypy/objspace/std/unicodeobject.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/objspace/std/unicodeobject.py
   pypy/dist/pypy/rlib/rarithmetic.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/rlib/rarithmetic.py
   pypy/dist/pypy/rlib/rbigint.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/rlib/rbigint.py
   pypy/dist/pypy/rlib/test/
      - copied from r43374, pypy/branch/pypy-string-formatting/rlib/test/
   pypy/dist/pypy/rpython/rlist.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/rpython/rlist.py
   pypy/dist/pypy/rpython/rstr.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/rpython/rstr.py
   pypy/dist/pypy/rpython/rtyper.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/rpython/rtyper.py
   pypy/dist/pypy/rpython/test/
      - copied from r43374, pypy/branch/pypy-string-formatting/rpython/test/
   pypy/dist/pypy/translator/transform.py
      - copied unchanged from r43374, pypy/branch/pypy-string-formatting/translator/transform.py
Removed:
   pypy/dist/pypy/annotation/test/test_annrpython.py.merge.tmp
Log:
Merge the string formatting branch.