Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r69297:510c3afd0ff0
Date: 2014-02-23 15:46 -0500
http://bitbucket.org/pypy/pypy/changeset/510c3afd0ff0/
Log: merge heads
diff --git a/pypy/module/micronumpy/interp_boxes.py
b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -16,7 +16,8 @@
from pypy.interpreter.mixedmodule import MixedModule
from rpython.rtyper.lltypesystem import lltype
from rpython.rlib.rstring import StringBuilder
-from pypy.module.micronumpy.constants import *
+from rpython.rlib import jit
+from pypy.module.micronumpy.constants import NPY_LONGDOUBLELTR,
NPY_CLONGDOUBLELTR
MIXIN_32 = (W_IntObject.typedef,) if LONG_BIT == 32 else ()
@@ -33,6 +34,7 @@
def new_dtype_getter(name):
+ @jit.elidable
def _get_dtype(space):
from pypy.module.micronumpy.interp_dtype import get_dtype_cache
return get_dtype_cache(space).dtypes_by_name[name]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
