Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r53828:f3948fdac195
Date: 2012-03-19 18:23 -0700
http://bitbucket.org/pypy/pypy/changeset/f3948fdac195/
Log: fix default's latest merge
diff --git a/pypy/module/micronumpy/interp_dtype.py
b/pypy/module/micronumpy/interp_dtype.py
--- a/pypy/module/micronumpy/interp_dtype.py
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -394,7 +394,7 @@
name='int64',
char='q',
w_box_type = space.gettypefor(interp_boxes.W_LongLongBox),
- alternate_constructors=[space.w_long],
+ alternate_constructors=[space.w_int],
)
self.w_ulonglongdtype = W_Dtype(
types.UInt64(),
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
