[pypy-svn] r66083 - pypy/branch/pyjitpl5/pypy/annotation

arigo at codespeak.net arigo at codespeak.net
Tue Jun 30 16:44:52 CEST 2009

Previous message: [pypy-svn] r66082 - in pypy/branch/pyjitpl5: . ctypes_configure demo dotviewer lib-python lib-python/2.5.2 lib-python/modified-2.5.2 pypy pypy/annotation pypy/annotation/test pypy/bin pypy/config pypy/config/test pypy/doc pypy/doc/config pypy/doc/jit pypy/doc/js pypy/doc/tool pypy/interpreter pypy/interpreter/astcompiler pypy/interpreter/pyparser pypy/interpreter/stablecompiler pypy/interpreter/test pypy/lang pypy/lib pypy/module/__builtin__ pypy/module/_codecs pypy/module/_file pypy/module/_locale pypy/module/_lsprof pypy/module/_minimal_curses pypy/module/_pickle_support pypy/module/_random pypy/module/_rawffi pypy/module/_socket pypy/module/_sre pypy/module/_ssl pypy/module/_stackless pypy/module/_weakref pypy/module/_winreg pypy/module/bz2 pypy/module/clr pypy/module/fcntl pypy/module/gc pypy/module/marshal pypy/module/md5 pypy/module/mmap pypy/module/operator pypy/module/posix pypy/module/pyexpat pypy/module/rctime pypy/module/sha pypy/module/sys pypy/module/termios pypy/module/thread pypy/module/unicodedata pypy/module/zipimport pypy/module/zlib pypy/objspace pypy/objspace/fake pypy/objspace/flow pypy/objspace/flow/test pypy/objspace/std pypy/objspace/std/test pypy/objspace/test pypy/rlib pypy/rlib/rsdl pypy/rlib/rsre pypy/rlib/test pypy/rpython pypy/rpython/lltypesystem pypy/rpython/lltypesystem/test pypy/rpython/memory/gc pypy/rpython/memory/gctransform pypy/rpython/module pypy/rpython/module/test pypy/rpython/numpy pypy/rpython/ootypesystem pypy/rpython/ootypesystem/test pypy/rpython/test pypy/rpython/tool pypy/tool pypy/tool/algo pypy/tool/pytest pypy/tool/test pypy/translator pypy/translator/backendopt pypy/translator/backendopt/test pypy/translator/benchmark pypy/translator/c pypy/translator/c/gcc pypy/translator/c/gcc/test pypy/translator/c/src pypy/translator/c/test pypy/translator/cli pypy/translator/cli/src pypy/translator/cli/test pypy/translator/goal pypy/translator/goal/win32 pypy/translator/jvm pypy/translator/jvm/src pypy/translator/jvm/test pypy/translator/microbench pypy/translator/oosupport pypy/translator/oosupport/test_template pypy/translator/platform pypy/translator/sandbox pypy/translator/stackless pypy/translator/test pypy/translator/tool
Next message: [pypy-svn] r66084 - in pypy/branch/pyjitpl5/pypy/jit/metainterp: . test
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Author: arigo
Date: Tue Jun 30 16:44:52 2009
New Revision: 66083

Modified:
   pypy/branch/pyjitpl5/pypy/annotation/model.py
Log:
Oups, bad hand-merging.


Modified: pypy/branch/pyjitpl5/pypy/annotation/model.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/annotation/model.py	(original)
+++ pypy/branch/pyjitpl5/pypy/annotation/model.py	Tue Jun 30 16:44:52 2009
@@ -620,8 +620,6 @@
             return SomeOOClass(ootype.ROOT)
         elif T == ootype.Object:
             return SomeOOObject()
-        elif isinstance(T, ExternalType):
-            return SomeExternalInstance(T._class_)
         elif isinstance(T, lltype.InteriorPtr):
             return SomeInteriorPtr(T)
         else:

Previous message: [pypy-svn] r66082 - in pypy/branch/pyjitpl5: . ctypes_configure demo dotviewer lib-python lib-python/2.5.2 lib-python/modified-2.5.2 pypy pypy/annotation pypy/annotation/test pypy/bin pypy/config pypy/config/test pypy/doc pypy/doc/config pypy/doc/jit pypy/doc/js pypy/doc/tool pypy/interpreter pypy/interpreter/astcompiler pypy/interpreter/pyparser pypy/interpreter/stablecompiler pypy/interpreter/test pypy/lang pypy/lib pypy/module/__builtin__ pypy/module/_codecs pypy/module/_file pypy/module/_locale pypy/module/_lsprof pypy/module/_minimal_curses pypy/module/_pickle_support pypy/module/_random pypy/module/_rawffi pypy/module/_socket pypy/module/_sre pypy/module/_ssl pypy/module/_stackless pypy/module/_weakref pypy/module/_winreg pypy/module/bz2 pypy/module/clr pypy/module/fcntl pypy/module/gc pypy/module/marshal pypy/module/md5 pypy/module/mmap pypy/module/operator pypy/module/posix pypy/module/pyexpat pypy/module/rctime pypy/module/sha pypy/module/sys pypy/module/termios pypy/module/thread pypy/module/unicodedata pypy/module/zipimport pypy/module/zlib pypy/objspace pypy/objspace/fake pypy/objspace/flow pypy/objspace/flow/test pypy/objspace/std pypy/objspace/std/test pypy/objspace/test pypy/rlib pypy/rlib/rsdl pypy/rlib/rsre pypy/rlib/test pypy/rpython pypy/rpython/lltypesystem pypy/rpython/lltypesystem/test pypy/rpython/memory/gc pypy/rpython/memory/gctransform pypy/rpython/module pypy/rpython/module/test pypy/rpython/numpy pypy/rpython/ootypesystem pypy/rpython/ootypesystem/test pypy/rpython/test pypy/rpython/tool pypy/tool pypy/tool/algo pypy/tool/pytest pypy/tool/test pypy/translator pypy/translator/backendopt pypy/translator/backendopt/test pypy/translator/benchmark pypy/translator/c pypy/translator/c/gcc pypy/translator/c/gcc/test pypy/translator/c/src pypy/translator/c/test pypy/translator/cli pypy/translator/cli/src pypy/translator/cli/test pypy/translator/goal pypy/translator/goal/win32 pypy/translator/jvm pypy/translator/jvm/src pypy/translator/jvm/test pypy/translator/microbench pypy/translator/oosupport pypy/translator/oosupport/test_template pypy/translator/platform pypy/translator/sandbox pypy/translator/stackless pypy/translator/test pypy/translator/tool
Next message: [pypy-svn] r66084 - in pypy/branch/pyjitpl5/pypy/jit/metainterp: . test
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the Pypy-commit mailing list