[pypy-svn] r64166 - in pypy/trunk/pypy: interpreter interpreter/astcompiler interpreter/pyparser interpreter/test module/__builtin__ module/_codecs module/_pickle_support module/_stackless/test module/_weakref objspace translator

[arigo at codespeak.net]

Author: arigo
Date: Thu Apr 16 15:26:16 2009
New Revision: 64166

Added:
   pypy/trunk/pypy/interpreter/astcompiler/
      - copied from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/interpreter/astcompiler/
   pypy/trunk/pypy/interpreter/buffer.py
      - copied unchanged from r64165, pypy/trunk/pypy/interpreter/buffer.py.merge.tmp
   pypy/trunk/pypy/interpreter/function.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/interpreter/function.py
   pypy/trunk/pypy/interpreter/gateway.py
      - copied unchanged from r64165, pypy/trunk/pypy/interpreter/gateway.py.merge.tmp
   pypy/trunk/pypy/interpreter/pyparser/parsestring.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/interpreter/pyparser/parsestring.py
   pypy/trunk/pypy/interpreter/test/test_gateway.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/interpreter/test/test_gateway.py
   pypy/trunk/pypy/interpreter/typedef.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/interpreter/typedef.py
   pypy/trunk/pypy/interpreter/unicodehelper.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/interpreter/unicodehelper.py
   pypy/trunk/pypy/module/__builtin__/__init__.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/module/__builtin__/__init__.py
   pypy/trunk/pypy/module/__builtin__/app_misc.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/module/__builtin__/app_misc.py
   pypy/trunk/pypy/module/__builtin__/importing.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/module/__builtin__/importing.py
   pypy/trunk/pypy/module/__builtin__/interp_classobj.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/module/__builtin__/interp_classobj.py
   pypy/trunk/pypy/module/_codecs/
      - copied from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/module/_codecs/
   pypy/trunk/pypy/module/_pickle_support/
      - copied from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/module/_pickle_support/
   pypy/trunk/pypy/module/_stackless/test/test_pickle_infrastructure.py
      - copied unchanged from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/module/_stackless/test/test_pickle_infrastructure.py
   pypy/trunk/pypy/module/_weakref/
      - copied from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/module/_weakref/
   pypy/trunk/pypy/objspace/
      - copied from r64165, pypy/branch/wip-fix-stackless-O2-pickling/pypy/objspace/
   pypy/trunk/pypy/translator/geninterplevel.py
      - copied unchanged from r64165, pypy/trunk/pypy/translator/geninterplevel.py.merge.tmp
Removed:
   pypy/trunk/pypy/interpreter/buffer.py.merge.tmp
   pypy/trunk/pypy/interpreter/gateway.py.merge.tmp
   pypy/trunk/pypy/translator/geninterplevel.py.merge.tmp
Log:
(cfbolz, pedronis)  Merge the branch.