[pypy-commit] pypy release-2.2.x: Updates

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: release-2.2.x
Changeset: r68015:8eb5b5ac4bba
Date: 2013-11-14 09:16 +0100
http://bitbucket.org/pypy/pypy/changeset/8eb5b5ac4bba/

Log:Updates

diff --git a/pypy/doc/release-2.2.0.rst b/pypy/doc/release-2.2.0.rst
--- a/pypy/doc/release-2.2.0.rst
+++ b/pypy/doc/release-2.2.0.rst
@@ -63,22 +63,25 @@
 
 * NumPy has been split: now PyPy only contains the core module, called
   ``_numpypy``.  The ``numpy`` module itself has been moved to
-  ``https://bitbucket.org/pypy/numpy``.  You need to install it
-  separately in a virtualenv with ``pip install
-  git+https://bitbucket.org/pypy/numpy.git``.
+  ``https://bitbucket.org/pypy/numpy`` and ``numpypy`` disappeared.
+  You need to install NumPy separately with a virtualenv:
+  ``pip install git+https://bitbucket.org/pypy/numpy.git``;
+  or by directly doing
+  ``git clone https://bitbucket.org/pypy/numpy.git``,
+  ``cd numpy``, ``python setup.py install``.
 
 * non-inlined calls have less overhead
 
 * Things that use ``sys.set_trace`` are now JITted (like coverage)
 
-* JSON encoding is faster
+* JSON encoding used to be very fast, now decoding is as well
 
 * various buffer copying methods experience speedups (like list-of-ints to
   ``int[]`` buffer from cffi)
 
-* We finally wrote all the missing ``os.xxx()`` functions.  There are
-  a lot of strange ones that nobody ever heard about, except those who
-  really need them.
+* We finally wrote (hopefully) all the missing ``os.xxx()`` functions,
+  including ``os.startfile()`` on Windows and a handful of rare ones
+  on Posix.
 
 * numpy has a rudimentary C API that cooperates with ``cpyext``
 
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy numpy-newbyteorder: move size from types to dtype

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: numpy-newbyteorder
Changeset: r68017:8c6fe040d6c7
Date: 2013-11-14 01:28 -0500
http://bitbucket.org/pypy/pypy/changeset/8c6fe040d6c7/

Log:move size from types to dtype

diff --git a/pypy/module/micronumpy/arrayimpl/concrete.py 
b/pypy/module/micronumpy/arrayimpl/concrete.py
--- a/pypy/module/micronumpy/arrayimpl/concrete.py
+++ b/pypy/module/micronumpy/arrayimpl/concrete.py
@@ -52,7 +52,7 @@
 loop.setslice(space, shape, self, impl)
 
 def get_size(self):
-return self.size // self.dtype.itemtype.get_element_size()
+return self.size // self.dtype.get_size()
 
 def get_storage_size(self):
 return self.size
@@ -399,7 +399,7 @@
 self.storage = parent.storage
 self.order = parent.order
 self.dtype = dtype
-self.size = support.product(shape) * 
self.dtype.itemtype.get_element_size()
+self.size = support.product(shape) * self.dtype.get_size()
 self.start = start
 self.orig_arr = orig_arr
 
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
@@ -38,7 +38,7 @@
 _immutable_fields_ = ["itemtype?", "num", "kind", "name?", "char", 
"w_box_type", "byteorder", "float_type"]
 
 def __init__(self, itemtype, num, kind, name, char, w_box_type, 
byteorder=NPY_NATIVE,
- alternate_constructors=[], aliases=[], float_type=None,
+ size=1, alternate_constructors=[], aliases=[], 
float_type=None,
  fields=None, fieldnames=None, shape=[], subdtype=None):
 self.itemtype = itemtype
 self.num = num
@@ -47,6 +47,7 @@
 self.char = char
 self.w_box_type = w_box_type
 self.byteorder = byteorder
+self.size = size
 self.alternate_constructors = alternate_constructors
 self.aliases = aliases
 self.float_type = float_type
@@ -123,7 +124,7 @@
 return self.byteorder in (NPY_NATIVE, NPY_NATBYTE)
 
 def get_size(self):
-return self.itemtype.get_element_size()
+return self.size * self.itemtype.get_element_size()
 
 def get_name(self):
 if self.char == 'S':
@@ -137,7 +138,7 @@
 return space.wrap("dtype('%s')" % self.get_name())
 
 def descr_get_itemsize(self, space):
-return space.wrap(self.itemtype.get_element_size())
+return space.wrap(self.get_size())
 
 def descr_get_alignment(self, space):
 return space.wrap(self.itemtype.alignment)
@@ -209,10 +210,11 @@
 self.fields[space.str_w(key)] = offset, dtype
 
 ofs_and_items.append((offset, dtype.itemtype))
-size += dtype.itemtype.get_element_size()
+size += dtype.get_size()
 
-self.itemtype = types.RecordType(ofs_and_items, size)
-self.name = "void" + str(8 * self.itemtype.get_element_size())
+self.itemtype = types.RecordType(ofs_and_items)
+self.size = size
+self.name = "void" + str(8 * self.get_size())
 
 def descr_get_names(self, space):
 if self.fieldnames is None:
@@ -264,7 +266,7 @@
 w_class = space.type(self)
 
 kind = self.kind
-elemsize = self.itemtype.get_element_size()
+elemsize = self.get_size()
 builder_args = space.newtuple([space.wrap("%s%d" % (kind, elemsize)), 
space.wrap(0), space.wrap(1)])
 
 version = space.wrap(3)
@@ -319,7 +321,8 @@
 elif newendian != NPY_IGNORE:
 endian = newendian
 itemtype = self.itemtype.__class__(endian in (NPY_NATIVE, NPY_NATBYTE))
-return W_Dtype(itemtype, self.num, self.kind, self.name, self.char, 
self.w_box_type, endian)
+return W_Dtype(itemtype, self.num, self.kind, self.name, self.char,
+   self.w_box_type, endian, size=self.size)
 
 def dtype_from_list(space, w_lst):
 lst_w = space.listview(w_lst)
@@ -343,12 +346,13 @@
 assert isinstance(subdtype, W_Dtype)
 fields[fldname] = (offset, subdtype)
 ofs_and_items.append((offset, subdtype.itemtype))
-offset += subdtype.itemtype.get_element_size() * size
+offset += subdtype.get_size() * size
 fieldnames.append(fldname)
-itemtype = types.RecordType(ofs_and_items, offset)
-return W_Dtype(itemtype, NPY_VOID, NPY_VOIDLTR, "void" + str(8 * 
itemtype.get_element_size()),
-   NPY_VOIDLTR, space.gettypefor(interp_boxes.W_VoidBox), 
fields=fields,
-   fieldnames=fieldnames)
+itemtype = types.RecordType(ofs_and_items)
+return W_Dtype(itemtype, NPY_VOID, NPY_VOIDLTR,
+   "void" + str(8 * offset * itemtype.get_element_size()),
+   NPY_VOIDLTR, space.gettypefor(interp_boxes.W_VoidBox),
+   fields=fields, fieldnames=fieldnames, size=offset)
 
 def dtype_from_dict(s

[pypy-commit] pypy default: merge numpy-newbyteorder

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: 
Changeset: r68021:a80ac0e94c7e
Date: 2013-11-14 03:30 -0500
http://bitbucket.org/pypy/pypy/changeset/a80ac0e94c7e/

Log:merge numpy-newbyteorder

diff --git a/pypy/module/micronumpy/arrayimpl/concrete.py 
b/pypy/module/micronumpy/arrayimpl/concrete.py
--- a/pypy/module/micronumpy/arrayimpl/concrete.py
+++ b/pypy/module/micronumpy/arrayimpl/concrete.py
@@ -52,7 +52,7 @@
 loop.setslice(space, shape, self, impl)
 
 def get_size(self):
-return self.size // self.dtype.itemtype.get_element_size()
+return self.size // self.dtype.get_size()
 
 def get_storage_size(self):
 return self.size
@@ -399,7 +399,7 @@
 self.storage = parent.storage
 self.order = parent.order
 self.dtype = dtype
-self.size = support.product(shape) * 
self.dtype.itemtype.get_element_size()
+self.size = support.product(shape) * self.dtype.get_size()
 self.start = start
 self.orig_arr = orig_arr
 
diff --git a/pypy/module/micronumpy/conversion_utils.py 
b/pypy/module/micronumpy/conversion_utils.py
--- a/pypy/module/micronumpy/conversion_utils.py
+++ b/pypy/module/micronumpy/conversion_utils.py
@@ -1,6 +1,27 @@
 from pypy.interpreter.error import OperationError
 from pypy.module.micronumpy.constants import *
 
+
+def byteorder_converter(space, new_order):
+endian = new_order[0]
+if endian not in (NPY_BIG, NPY_LITTLE, NPY_NATIVE, NPY_IGNORE, NPY_SWAP):
+ch = endian
+if ch in ('b', 'B'):
+endian = NPY_BIG
+elif ch in ('l', 'L'):
+endian = NPY_LITTLE
+elif ch in ('n', 'N'):
+endian = NPY_NATIVE
+elif ch in ('i', 'I'):
+endian = NPY_IGNORE
+elif ch in ('s', 'S'):
+endian = NPY_SWAP
+else:
+raise OperationError(space.w_ValueError, space.wrap(
+"%s is an unrecognized byteorder" % new_order))
+return endian
+
+
 def clipmode_converter(space, w_mode):
 if space.is_none(w_mode):
 return NPY_RAISE
@@ -19,6 +40,7 @@
 raise OperationError(space.w_TypeError,
  space.wrap("clipmode not understood"))
 
+
 def order_converter(space, w_order, default):
 if space.is_none(w_order):
 return default
@@ -41,6 +63,7 @@
 raise OperationError(space.w_TypeError, space.wrap(
 "order not understood"))
 
+
 def multi_axis_converter(space, w_axis, ndim):
 if space.is_none(w_axis):
 return [True] * ndim
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
@@ -9,6 +9,7 @@
 from rpython.rlib.rarithmetic import LONG_BIT, r_longlong, r_ulonglong
 from rpython.rtyper.lltypesystem import rffi
 from rpython.rlib import jit
+from pypy.module.micronumpy.conversion_utils import byteorder_converter
 from pypy.module.micronumpy.constants import *
 
 
@@ -34,10 +35,12 @@
 return out
 
 class W_Dtype(W_Root):
-_immutable_fields_ = ["itemtype?", "num", "kind", "name?", "char", 
"w_box_type", "byteorder", "float_type"]
+_immutable_fields_ = ["itemtype?", "num", "kind", "name?", "char",
+  "w_box_type", "byteorder", "size?", "float_type",
+  "fields?", "fieldnames?", "shape", "subdtype", 
"base"]
 
 def __init__(self, itemtype, num, kind, name, char, w_box_type, 
byteorder=NPY_NATIVE,
- alternate_constructors=[], aliases=[], float_type=None,
+ size=1, alternate_constructors=[], aliases=[], 
float_type=None,
  fields=None, fieldnames=None, shape=[], subdtype=None):
 self.itemtype = itemtype
 self.num = num
@@ -46,6 +49,7 @@
 self.char = char
 self.w_box_type = w_box_type
 self.byteorder = byteorder
+self.size = size
 self.alternate_constructors = alternate_constructors
 self.aliases = aliases
 self.float_type = float_type
@@ -122,7 +126,7 @@
 return self.byteorder in (NPY_NATIVE, NPY_NATBYTE)
 
 def get_size(self):
-return self.itemtype.get_element_size()
+return self.size * self.itemtype.get_element_size()
 
 def get_name(self):
 if self.char == 'S':
@@ -136,7 +140,7 @@
 return space.wrap("dtype('%s')" % self.get_name())
 
 def descr_get_itemsize(self, space):
-return space.wrap(self.itemtype.get_element_size())
+return space.wrap(self.get_size())
 
 def descr_get_alignment(self, space):
 return space.wrap(self.itemtype.alignment)
@@ -196,7 +200,6 @@
 self.fields = None
 else:
 self.fields = {}
-ofs_and_items = []
 size = 0
 for key in space.listview(w_fields):
 value = space.getitem(w_fields, key)
@@ -207,11 +210,11 @@
 offset = space

[pypy-commit] pypy numpy-newbyteorder: update immutable_fields on dtype

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: numpy-newbyteorder
Changeset: r68020:022135968606
Date: 2013-11-14 03:29 -0500
http://bitbucket.org/pypy/pypy/changeset/022135968606/

Log:update immutable_fields on dtype

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
@@ -35,7 +35,9 @@
 return out
 
 class W_Dtype(W_Root):
-_immutable_fields_ = ["itemtype?", "num", "kind", "name?", "char", 
"w_box_type", "byteorder", "float_type"]
+_immutable_fields_ = ["itemtype?", "num", "kind", "name?", "char",
+  "w_box_type", "byteorder", "size?", "float_type",
+  "fields?", "fieldnames?", "shape", "subdtype", 
"base"]
 
 def __init__(self, itemtype, num, kind, name, char, w_box_type, 
byteorder=NPY_NATIVE,
  size=1, alternate_constructors=[], aliases=[], 
float_type=None,
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy numpy-newbyteorder: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: numpy-newbyteorder
Changeset: r68022:cf222adc939f
Date: 2013-11-14 03:32 -0500
http://bitbucket.org/pypy/pypy/changeset/cf222adc939f/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy numpy-newbyteorder: provide ndarray.newbyteorder()

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: numpy-newbyteorder
Changeset: r68019:303889d4a9d6
Date: 2013-11-14 03:23 -0500
http://bitbucket.org/pypy/pypy/changeset/303889d4a9d6/

Log:provide ndarray.newbyteorder()

diff --git a/pypy/module/micronumpy/conversion_utils.py 
b/pypy/module/micronumpy/conversion_utils.py
--- a/pypy/module/micronumpy/conversion_utils.py
+++ b/pypy/module/micronumpy/conversion_utils.py
@@ -63,6 +63,7 @@
 raise OperationError(space.w_TypeError, space.wrap(
 "order not understood"))
 
+
 def multi_axis_converter(space, w_axis, ndim):
 if space.is_none(w_axis):
 return [True] * ndim
diff --git a/pypy/module/micronumpy/interp_numarray.py 
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -625,10 +625,10 @@
 raise OperationError(space.w_NotImplementedError, space.wrap(
 "itemset not implemented yet"))
 
-@unwrap_spec(neworder=str)
-def descr_newbyteorder(self, space, neworder):
-raise OperationError(space.w_NotImplementedError, space.wrap(
-"newbyteorder not implemented yet"))
+@unwrap_spec(new_order=str)
+def descr_newbyteorder(self, space, new_order=NPY_SWAP):
+return self.descr_view(space,
+self.get_dtype().descr_newbyteorder(space, new_order))
 
 @unwrap_spec(w_axis=WrappedDefault(None),
  w_out=WrappedDefault(None))
@@ -1268,6 +1268,7 @@
 diagonal = interp2app(W_NDimArray.descr_diagonal),
 trace = interp2app(W_NDimArray.descr_trace),
 view = interp2app(W_NDimArray.descr_view),
+newbyteorder = interp2app(W_NDimArray.descr_newbyteorder),
 
 ctypes = GetSetProperty(W_NDimArray.descr_get_ctypes), # XXX unimplemented
 __array_interface__ = GetSetProperty(W_NDimArray.descr_array_iface),
diff --git a/pypy/module/micronumpy/test/test_numarray.py 
b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -2928,6 +2928,15 @@
 assert str(a.dtype) == '|S1'
 assert a == 'x'
 
+def test_newbyteorder(self):
+import numpy as np
+a = np.array([1, 2], dtype=np.int16)
+b = a.newbyteorder()
+assert (b == [256, 512]).all()
+c = b.byteswap()
+assert (c == [1, 2]).all()
+assert (a == [1, 2]).all()
+
 def test_pickle(self):
 from numpypy import dtype, array
 from cPickle import loads, dumps
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy numpy-newbyteorder: remove copy of offsets_and_fields on RecordType

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: numpy-newbyteorder
Changeset: r68018:fd7f87a0d522
Date: 2013-11-14 03:00 -0500
http://bitbucket.org/pypy/pypy/changeset/fd7f87a0d522/

Log:remove copy of offsets_and_fields on RecordType

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
@@ -198,7 +198,6 @@
 self.fields = None
 else:
 self.fields = {}
-ofs_and_items = []
 size = 0
 for key in space.listview(w_fields):
 value = space.getitem(w_fields, key)
@@ -209,10 +208,9 @@
 offset = space.int_w(space.getitem(value, space.wrap(1)))
 self.fields[space.str_w(key)] = offset, dtype
 
-ofs_and_items.append((offset, dtype.itemtype))
 size += dtype.get_size()
 
-self.itemtype = types.RecordType(ofs_and_items)
+self.itemtype = types.RecordType()
 self.size = size
 self.name = "void" + str(8 * self.get_size())
 
@@ -328,7 +326,6 @@
 lst_w = space.listview(w_lst)
 fields = {}
 offset = 0
-ofs_and_items = []
 fieldnames = []
 for w_elem in lst_w:
 size = 1
@@ -345,10 +342,9 @@
 raise OperationError(space.w_ValueError, space.wrap("two fields 
with the same name"))
 assert isinstance(subdtype, W_Dtype)
 fields[fldname] = (offset, subdtype)
-ofs_and_items.append((offset, subdtype.itemtype))
 offset += subdtype.get_size() * size
 fieldnames.append(fldname)
-itemtype = types.RecordType(ofs_and_items)
+itemtype = types.RecordType()
 return W_Dtype(itemtype, NPY_VOID, NPY_VOIDLTR,
"void" + str(8 * offset * itemtype.get_element_size()),
NPY_VOIDLTR, space.gettypefor(interp_boxes.W_VoidBox),
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -1784,11 +1784,6 @@
 
 class RecordType(BaseType):
 T = lltype.Char
-_immutable_fields_ = ['offsets_and_fields']
-
-def __init__(self, offsets_and_fields):
-BaseType.__init__(self)
-self.offsets_and_fields = offsets_and_fields
 
 def get_element_size(self):
 return rffi.sizeof(self.T)
@@ -1807,14 +1802,14 @@
 if not space.issequence_w(w_item):
 raise OperationError(space.w_TypeError, space.wrap(
 "expected sequence"))
-if len(self.offsets_and_fields) != space.len_w(w_item):
+if len(dtype.fields) != space.len_w(w_item):
 raise OperationError(space.w_ValueError, space.wrap(
 "wrong length"))
 items_w = space.fixedview(w_item)
 arr = VoidBoxStorage(dtype.get_size(), dtype)
 for i in range(len(items_w)):
-subdtype = dtype.fields[dtype.fieldnames[i]][1]
-ofs, itemtype = self.offsets_and_fields[i]
+ofs, subdtype = dtype.fields[dtype.fieldnames[i]]
+itemtype = subdtype.itemtype
 w_item = items_w[i]
 w_box = itemtype.coerce(space, subdtype, w_item)
 itemtype.store(arr, 0, ofs, w_box)
@@ -1831,7 +1826,9 @@
 assert isinstance(box, interp_boxes.W_VoidBox)
 pieces = ["("]
 first = True
-for ofs, tp in self.offsets_and_fields:
+for name in box.dtype.fieldnames:
+ofs, subdtype = box.dtype.fields[name]
+tp = subdtype.itemtype
 if first:
 first = False
 else:
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy default: hg merge release-2.2.x

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: 
Changeset: r68023:f997b57170d5
Date: 2013-11-14 09:42 +0100
http://bitbucket.org/pypy/pypy/changeset/f997b57170d5/

Log:hg merge release-2.2.x

diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -33,7 +33,7 @@
 $ rpython/bin/rpython -Ojit pypy/goal/targetpypystandalone.py
 
 This ends up with ``pypy-c`` binary in the main pypy directory. We suggest
-to use virtualenv with the resulting pypy-c as the interpreter, you can
+to use virtualenv with the resulting pypy-c as the interpreter; you can
 find more details about various installation schemes here:
 
 http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@@ -347,6 +347,9 @@
 errno = property(_get_errno, _set_errno, None,
  "the value of 'errno' from/to the C calls")
 
+def getwinerror(self, code=-1):
+return self._backend.getwinerror(code)
+
 def _pointer_to(self, ctype):
 from . import model
 with self._lock:
diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py
--- a/pypy/doc/conf.py
+++ b/pypy/doc/conf.py
@@ -45,9 +45,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.1'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.0'
+release = '2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst
--- a/pypy/doc/how-to-release.rst
+++ b/pypy/doc/how-to-release.rst
@@ -48,6 +48,6 @@
 * send announcements to pypy-dev, python-list,
   python-announce, python-dev ...
 
-* add a tag on jitviewer that corresponds to pypy release
-* add a tag on codespeed that corresponds to pypy release
+* add a tag on the pypy/jitviewer repo that corresponds to pypy release
+* add a tag on the codespeed web site that corresponds to pypy release
 
diff --git a/pypy/doc/index.rst b/pypy/doc/index.rst
--- a/pypy/doc/index.rst
+++ b/pypy/doc/index.rst
@@ -40,7 +40,7 @@
 
 * `FAQ`_: some frequently asked questions.
 
-* `Release 2.1.0`_: the latest official release
+* `Release 2.2.0`_: the latest official release
 
 * `PyPy Blog`_: news and status info about PyPy 
 
@@ -110,7 +110,7 @@
 .. _`Getting Started`: getting-started.html
 .. _`Papers`: extradoc.html
 .. _`Videos`: video-index.html
-.. _`Release 2.1.0`: http://pypy.org/download.html
+.. _`Release 2.2.0`: http://pypy.org/download.html
 .. _`speed.pypy.org`: http://speed.pypy.org
 .. _`RPython toolchain`: translation.html
 .. _`potential project ideas`: project-ideas.html
diff --git a/pypy/doc/release-2.2.0.rst b/pypy/doc/release-2.2.0.rst
new file mode 100644
--- /dev/null
+++ b/pypy/doc/release-2.2.0.rst
@@ -0,0 +1,89 @@
+===
+PyPy 2.2 - Incrementalism
+===
+
+We're pleased to announce PyPy 2.2, which targets version 2.7.3 of the Python
+language. This release main highlight is the introduction of the incremental
+garbage collector, sponsored by the `Raspberry Pi Foundation`_.
+
+This release also contains several bugfixes and performance improvements. 
+
+You can download the PyPy 2.2 release here:
+
+http://pypy.org/download.html
+
+We would like to thank our donors for the continued support of the PyPy
+project. We showed quite a bit of progress on all three projects (see below)
+and we're slowly running out of funds.
+Please consider donating more so we can finish those projects!  The three
+projects are:
+
+* Py3k (supporting Python 3.x): the release PyPy3 2.2 is imminent.
+
+* STM (software transactional memory): a preview will be released very soon,
+  as soon as we fix a few bugs
+
+* NumPy: the work done is included in the PyPy 2.2 release. More details below.
+
+.. _`Raspberry Pi Foundation`: http://www.raspberrypi.org
+
+What is PyPy?
+=
+
+PyPy is a very compliant Python interpreter, almost a drop-in replacement for
+CPython 2.7. It's fast (`pypy 2.2 and cpython 2.7.2`_ performance comparison)
+due to its integrated tracing JIT compiler.
+
+This release supports x86 machines running Linux 32/64, Mac OS X 64, Windows
+32, or ARM (ARMv6 or ARMv7, with VFPv3).
+
+Work on the native Windows 64 is still stalling, we would welcome a volunteer
+to handle that.
+
+.. _`pypy 2.2 and cpython 2.7.2`: http://speed.pypy.org
+
+Highlights
+==
+
+* Our Garbage Collector is now "incremental".  It should avoid almost
+  all pauses due to a major collection taking place.  Previously, it
+  would pause the program (rarely) to walk all live objects, which
+  could take arbitrarily long if your process is using a whole lot of
+  RAM.  Now the same work is done in steps.  This should make PyPy
+  more responsive, e.g. in games.  There are still other pauses, from
+  the GC and the JIT, but they should be on the order of 5
+  mi

[pypy-commit] pypy default: update

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: 
Changeset: r68024:f606890f99ed
Date: 2013-11-14 09:43 +0100
http://bitbucket.org/pypy/pypy/changeset/f606890f99ed/

Log:update

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -5,3 +5,4 @@
 .. this is a revision shortly after release-2.2.x
 .. startrev: 4cd1bc8b3111
 
+.. branch: release-2.2.x
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy default: merge heads

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: 
Changeset: r68025:315906031082
Date: 2013-11-14 09:44 +0100
http://bitbucket.org/pypy/pypy/changeset/315906031082/

Log:merge heads

diff --git a/pypy/module/micronumpy/arrayimpl/concrete.py 
b/pypy/module/micronumpy/arrayimpl/concrete.py
--- a/pypy/module/micronumpy/arrayimpl/concrete.py
+++ b/pypy/module/micronumpy/arrayimpl/concrete.py
@@ -52,7 +52,7 @@
 loop.setslice(space, shape, self, impl)
 
 def get_size(self):
-return self.size // self.dtype.itemtype.get_element_size()
+return self.size // self.dtype.get_size()
 
 def get_storage_size(self):
 return self.size
@@ -399,7 +399,7 @@
 self.storage = parent.storage
 self.order = parent.order
 self.dtype = dtype
-self.size = support.product(shape) * 
self.dtype.itemtype.get_element_size()
+self.size = support.product(shape) * self.dtype.get_size()
 self.start = start
 self.orig_arr = orig_arr
 
diff --git a/pypy/module/micronumpy/conversion_utils.py 
b/pypy/module/micronumpy/conversion_utils.py
--- a/pypy/module/micronumpy/conversion_utils.py
+++ b/pypy/module/micronumpy/conversion_utils.py
@@ -1,6 +1,27 @@
 from pypy.interpreter.error import OperationError
 from pypy.module.micronumpy.constants import *
 
+
+def byteorder_converter(space, new_order):
+endian = new_order[0]
+if endian not in (NPY_BIG, NPY_LITTLE, NPY_NATIVE, NPY_IGNORE, NPY_SWAP):
+ch = endian
+if ch in ('b', 'B'):
+endian = NPY_BIG
+elif ch in ('l', 'L'):
+endian = NPY_LITTLE
+elif ch in ('n', 'N'):
+endian = NPY_NATIVE
+elif ch in ('i', 'I'):
+endian = NPY_IGNORE
+elif ch in ('s', 'S'):
+endian = NPY_SWAP
+else:
+raise OperationError(space.w_ValueError, space.wrap(
+"%s is an unrecognized byteorder" % new_order))
+return endian
+
+
 def clipmode_converter(space, w_mode):
 if space.is_none(w_mode):
 return NPY_RAISE
@@ -19,6 +40,7 @@
 raise OperationError(space.w_TypeError,
  space.wrap("clipmode not understood"))
 
+
 def order_converter(space, w_order, default):
 if space.is_none(w_order):
 return default
@@ -41,6 +63,7 @@
 raise OperationError(space.w_TypeError, space.wrap(
 "order not understood"))
 
+
 def multi_axis_converter(space, w_axis, ndim):
 if space.is_none(w_axis):
 return [True] * ndim
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
@@ -9,6 +9,7 @@
 from rpython.rlib.rarithmetic import LONG_BIT, r_longlong, r_ulonglong
 from rpython.rtyper.lltypesystem import rffi
 from rpython.rlib import jit
+from pypy.module.micronumpy.conversion_utils import byteorder_converter
 from pypy.module.micronumpy.constants import *
 
 
@@ -34,10 +35,12 @@
 return out
 
 class W_Dtype(W_Root):
-_immutable_fields_ = ["itemtype?", "num", "kind", "name?", "char", 
"w_box_type", "byteorder", "float_type"]
+_immutable_fields_ = ["itemtype?", "num", "kind", "name?", "char",
+  "w_box_type", "byteorder", "size?", "float_type",
+  "fields?", "fieldnames?", "shape", "subdtype", 
"base"]
 
 def __init__(self, itemtype, num, kind, name, char, w_box_type, 
byteorder=NPY_NATIVE,
- alternate_constructors=[], aliases=[], float_type=None,
+ size=1, alternate_constructors=[], aliases=[], 
float_type=None,
  fields=None, fieldnames=None, shape=[], subdtype=None):
 self.itemtype = itemtype
 self.num = num
@@ -46,6 +49,7 @@
 self.char = char
 self.w_box_type = w_box_type
 self.byteorder = byteorder
+self.size = size
 self.alternate_constructors = alternate_constructors
 self.aliases = aliases
 self.float_type = float_type
@@ -122,7 +126,7 @@
 return self.byteorder in (NPY_NATIVE, NPY_NATBYTE)
 
 def get_size(self):
-return self.itemtype.get_element_size()
+return self.size * self.itemtype.get_element_size()
 
 def get_name(self):
 if self.char == 'S':
@@ -136,7 +140,7 @@
 return space.wrap("dtype('%s')" % self.get_name())
 
 def descr_get_itemsize(self, space):
-return space.wrap(self.itemtype.get_element_size())
+return space.wrap(self.get_size())
 
 def descr_get_alignment(self, space):
 return space.wrap(self.itemtype.alignment)
@@ -196,7 +200,6 @@
 self.fields = None
 else:
 self.fields = {}
-ofs_and_items = []
 size = 0
 for key in space.listview(w_fields):
 value = space.getitem(w_fields, key)
@@ -207,11 +210,11 @@
 offset = space.int_w(space.ge

[pypy-commit] pypy default: document merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: 
Changeset: r68026:c69c2692ce2e
Date: 2013-11-14 03:50 -0500
http://bitbucket.org/pypy/pypy/changeset/c69c2692ce2e/

Log:document merged branch

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -6,3 +6,6 @@
 .. startrev: 4cd1bc8b3111
 
 .. branch: release-2.2.x
+
+.. branch: numpy-newbyteorder
+Clean up numpy types, add newbyteorder functionality
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy cleanup-numpypy-namespace: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: cleanup-numpypy-namespace
Changeset: r68027:9d9386541679
Date: 2013-11-14 03:54 -0500
http://bitbucket.org/pypy/pypy/changeset/9d9386541679/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy numpypy-inplace-op: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: numpypy-inplace-op
Changeset: r68028:3271bde53cb5
Date: 2013-11-14 03:55 -0500
http://bitbucket.org/pypy/pypy/changeset/3271bde53cb5/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy numpypy_count_nonzero: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: numpypy_count_nonzero
Changeset: r68029:3112b0eadb86
Date: 2013-11-14 03:56 -0500
http://bitbucket.org/pypy/pypy/changeset/3112b0eadb86/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy release-2.2.x: Added tag release-2.2.0 for changeset 8eb5b5ac4bba

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: release-2.2.x
Changeset: r68030:6c8420e89b80
Date: 2013-11-14 10:00 +0100
http://bitbucket.org/pypy/pypy/changeset/6c8420e89b80/

Log:Added tag release-2.2.0 for changeset 8eb5b5ac4bba

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -6,3 +6,4 @@
 9b623bc48b5950cf07184462a0e48f2c4df0d720 pypy-2.1-beta1-arm
 9b623bc48b5950cf07184462a0e48f2c4df0d720 pypy-2.1-beta1-arm
 ab0dd631c22015ed88e583d9fdd4c43eebf0be21 pypy-2.1-beta1-arm
+8eb5b5ac4bba366e7c7519c186bdfcf9c28c075d release-2.2.0
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy array_equal: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: array_equal
Changeset: r68033:7630ca70381b
Date: 2013-11-14 04:01 -0500
http://bitbucket.org/pypy/pypy/changeset/7630ca70381b/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy ndmin: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: ndmin
Changeset: r68032:9d2bc73626af
Date: 2013-11-14 04:01 -0500
http://bitbucket.org/pypy/pypy/changeset/9d2bc73626af/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy dtype-isnative: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: dtype-isnative
Changeset: r68031:ebf84dd7f970
Date: 2013-11-14 04:00 -0500
http://bitbucket.org/pypy/pypy/changeset/ebf84dd7f970/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy stdlib-2.7.4-fixed-class: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: stdlib-2.7.4-fixed-class
Changeset: r68039:3cbee0b9425c
Date: 2013-11-14 04:07 -0500
http://bitbucket.org/pypy/pypy/changeset/3cbee0b9425c/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy stdlib-2.7.4-pwd-fix: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: stdlib-2.7.4-pwd-fix
Changeset: r68037:048031fbb4f9
Date: 2013-11-14 04:07 -0500
http://bitbucket.org/pypy/pypy/changeset/048031fbb4f9/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy stdlib-2.7.4-poll-fix: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: stdlib-2.7.4-poll-fix
Changeset: r68036:09e6c7429ebb
Date: 2013-11-14 04:07 -0500
http://bitbucket.org/pypy/pypy/changeset/09e6c7429ebb/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy win32-fixes: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: win32-fixes
Changeset: r68035:45ecc4a42058
Date: 2013-11-14 04:06 -0500
http://bitbucket.org/pypy/pypy/changeset/45ecc4a42058/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy stdlib-2.7.4-fixed-io: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: stdlib-2.7.4-fixed-io
Changeset: r68038:e6b76694838f
Date: 2013-11-14 04:07 -0500
http://bitbucket.org/pypy/pypy/changeset/e6b76694838f/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy pickle-dumps: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: pickle-dumps
Changeset: r68034:3fec18025f0d
Date: 2013-11-14 04:05 -0500
http://bitbucket.org/pypy/pypy/changeset/3fec18025f0d/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy clean-up-remaining-pypy-rlib-refs: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: clean-up-remaining-pypy-rlib-refs
Changeset: r68040:67779c333eea
Date: 2013-11-14 04:10 -0500
http://bitbucket.org/pypy/pypy/changeset/67779c333eea/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] jitviewer default: Added tag pypy-2.2 for changeset 15e03325a227

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: 
Changeset: r253:0d780832a697
Date: 2013-11-14 10:10 +0100
http://bitbucket.org/pypy/jitviewer/changeset/0d780832a697/

Log:Added tag pypy-2.2 for changeset 15e03325a227

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1,2 +1,3 @@
 24adc3403cd8fdcd9e3f76f31a8dc2c145471002 release-0.1
 13e1f8c97ca7c47f807ea93f44392c3f48102675 pypy-1.9
+15e03325a227c4c7145a56e841b6a8a3c59730ed pypy-2.2
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy coding-guide-update-rlib-refs: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: coding-guide-update-rlib-refs
Changeset: r68041:4230db2e2e1e
Date: 2013-11-14 04:10 -0500
http://bitbucket.org/pypy/pypy/changeset/4230db2e2e1e/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy urlparse-unquote-faster: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: urlparse-unquote-faster
Changeset: r68044:06e7251aaed4
Date: 2013-11-14 04:12 -0500
http://bitbucket.org/pypy/pypy/changeset/06e7251aaed4/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy unbreak-freebsd: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: unbreak-freebsd
Changeset: r68042:d28e53d9c806
Date: 2013-11-14 04:11 -0500
http://bitbucket.org/pypy/pypy/changeset/d28e53d9c806/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy unquote-faster: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: unquote-faster
Changeset: r68043:c5943a5c41a9
Date: 2013-11-14 04:11 -0500
http://bitbucket.org/pypy/pypy/changeset/c5943a5c41a9/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy distutils-cppldflags: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: distutils-cppldflags
Changeset: r68047:c28dc4ddd9be
Date: 2013-11-14 04:17 -0500
http://bitbucket.org/pypy/pypy/changeset/c28dc4ddd9be/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy nobold-backtrace: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: nobold-backtrace
Changeset: r68045:be560078e413
Date: 2013-11-14 04:16 -0500
http://bitbucket.org/pypy/pypy/changeset/be560078e413/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy remove-PYPY_NOT_MAIN_FILE: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: remove-PYPY_NOT_MAIN_FILE
Changeset: r68046:0a8ce6278f68
Date: 2013-11-14 04:17 -0500
http://bitbucket.org/pypy/pypy/changeset/0a8ce6278f68/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy improve-errors-again: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: improve-errors-again
Changeset: r68048:5f5e401edccc
Date: 2013-11-14 04:18 -0500
http://bitbucket.org/pypy/pypy/changeset/5f5e401edccc/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy improve-errors-again2: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: improve-errors-again2
Changeset: r68049:fc8664971578
Date: 2013-11-14 04:18 -0500
http://bitbucket.org/pypy/pypy/changeset/fc8664971578/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy popen2-removal: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: popen2-removal
Changeset: r68050:6538f38f63da
Date: 2013-11-14 04:19 -0500
http://bitbucket.org/pypy/pypy/changeset/6538f38f63da/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy package-tk: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: package-tk
Changeset: r68051:ca3a4cf272be
Date: 2013-11-14 04:20 -0500
http://bitbucket.org/pypy/pypy/changeset/ca3a4cf272be/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy enumerate-rstr: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: enumerate-rstr
Changeset: r68052:cd07f4c70232
Date: 2013-11-14 04:21 -0500
http://bitbucket.org/pypy/pypy/changeset/cd07f4c70232/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy ndarray-ptp: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: ndarray-ptp
Changeset: r68053:3a0298093f20
Date: 2013-11-14 04:21 -0500
http://bitbucket.org/pypy/pypy/changeset/3a0298093f20/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy rlib-doc-rpython-refs: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: rlib-doc-rpython-refs
Changeset: r68054:8412492e8e81
Date: 2013-11-14 04:22 -0500
http://bitbucket.org/pypy/pypy/changeset/8412492e8e81/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy pycon2013-doc-fixes: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: pycon2013-doc-fixes
Changeset: r68059:3f776b761e09
Date: 2013-11-14 04:25 -0500
http://bitbucket.org/pypy/pypy/changeset/3f776b761e09/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy ctypes-byref: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: ctypes-byref
Changeset: r68056:dc20838c51f4
Date: 2013-11-14 04:24 -0500
http://bitbucket.org/pypy/pypy/changeset/dc20838c51f4/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy fix-jit-logs: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: fix-jit-logs
Changeset: r68058:ea46bf3cc485
Date: 2013-11-14 04:24 -0500
http://bitbucket.org/pypy/pypy/changeset/ea46bf3cc485/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy curses_fixes: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: curses_fixes
Changeset: r68055:8e4f7f8df8e1
Date: 2013-11-14 04:23 -0500
http://bitbucket.org/pypy/pypy/changeset/8e4f7f8df8e1/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy statvfs_tests: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: statvfs_tests
Changeset: r68057:61ce3b8b16b1
Date: 2013-11-14 04:24 -0500
http://bitbucket.org/pypy/pypy/changeset/61ce3b8b16b1/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy zlib-mem-pressure: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: zlib-mem-pressure
Changeset: r68060:bfcb4d5e68e6
Date: 2013-11-14 04:25 -0500
http://bitbucket.org/pypy/pypy/changeset/bfcb4d5e68e6/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy task-decorator: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: task-decorator
Changeset: r68061:18d6db6fccf8
Date: 2013-11-14 04:26 -0500
http://bitbucket.org/pypy/pypy/changeset/18d6db6fccf8/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy py3k-subprocess-new-session: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: py3k-subprocess-new-session
Changeset: r68063:3b448254587e
Date: 2013-11-14 04:27 -0500
http://bitbucket.org/pypy/pypy/changeset/3b448254587e/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy pythoninspect-fix: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: pythoninspect-fix
Changeset: r68064:56a9bd9b2769
Date: 2013-11-14 04:27 -0500
http://bitbucket.org/pypy/pypy/changeset/56a9bd9b2769/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy py3k-struct: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: py3k-struct
Changeset: r68062:d7746d32bf9d
Date: 2013-11-14 04:27 -0500
http://bitbucket.org/pypy/pypy/changeset/d7746d32bf9d/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy py3k-list-compr-or: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: py3k-list-compr-or
Changeset: r68065:659f78e9b5b6
Date: 2013-11-14 04:31 -0500
http://bitbucket.org/pypy/pypy/changeset/659f78e9b5b6/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy bridge-logging: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: bridge-logging
Changeset: r68066:83f0ba55bc1b
Date: 2013-11-14 04:31 -0500
http://bitbucket.org/pypy/pypy/changeset/83f0ba55bc1b/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy improved_ebnfparse_error: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: improved_ebnfparse_error
Changeset: r68068:a1f52d6ae34e
Date: 2013-11-14 04:32 -0500
http://bitbucket.org/pypy/pypy/changeset/a1f52d6ae34e/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy ssl_moving_write_buffer: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: ssl_moving_write_buffer
Changeset: r68067:800741417787
Date: 2013-11-14 04:32 -0500
http://bitbucket.org/pypy/pypy/changeset/800741417787/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy cpyext-PyThreadState_New: close merged branch

2013-11-14 Thread bdkearns 
Author: Brian Kearns 
Branch: cpyext-PyThreadState_New
Changeset: r68069:87a5f161be81
Date: 2013-11-14 04:33 -0500
http://bitbucket.org/pypy/pypy/changeset/87a5f161be81/

Log:close merged branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy default: Issue #1633

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: 
Changeset: r68070:8d1f6d47d417
Date: 2013-11-14 10:48 +0100
http://bitbucket.org/pypy/pypy/changeset/8d1f6d47d417/

Log:Issue #1633

Give a more sensible error message on int() or long() typeerrors.

diff --git a/pypy/objspace/std/inttype.py b/pypy/objspace/std/inttype.py
--- a/pypy/objspace/std/inttype.py
+++ b/pypy/objspace/std/inttype.py
@@ -119,9 +119,14 @@
 if not ok:
 # otherwise, use the __int__() or the __trunc__() methods
 w_obj = w_value
-if space.lookup(w_obj, '__int__') is None:
+if space.lookup(w_obj, '__int__') is not None:
+w_obj = space.int(w_obj)
+elif space.lookup(w_obj, '__trunc__') is not None:
 w_obj = space.trunc(w_obj)
-w_obj = space.int(w_obj)
+else:
+raise operationerrfmt(space.w_TypeError,
+"int() argument must be a string or a number, not '%T'",
+w_obj)
 # 'int(x)' should return what x.__int__() returned, which should
 # be an int or long or a subclass thereof.
 if space.is_w(w_inttype, space.w_int):
diff --git a/pypy/objspace/std/longtype.py b/pypy/objspace/std/longtype.py
--- a/pypy/objspace/std/longtype.py
+++ b/pypy/objspace/std/longtype.py
@@ -1,4 +1,4 @@
-from pypy.interpreter.error import OperationError
+from pypy.interpreter.error import OperationError, operationerrfmt
 from pypy.interpreter import typedef
 from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault,\
  interpindirect2app
@@ -39,13 +39,17 @@
 if (space.lookup(w_obj, '__long__') is not None or
 space.lookup(w_obj, '__int__') is not None):
 w_obj = space.long(w_obj)
-else:
+elif space.lookup(w_obj, '__trunc__') is not None:
 w_obj = space.trunc(w_obj)
 # :-(  blame CPython 2.7
 if space.lookup(w_obj, '__long__') is not None:
 w_obj = space.long(w_obj)
 else:
 w_obj = space.int(w_obj)
+else:
+raise operationerrfmt(space.w_TypeError,
+"long() argument must be a string or a number, not '%T'",
+w_obj)
 bigint = space.bigint_w(w_obj)
 return newbigint(space, w_longtype, bigint)
 else:
diff --git a/pypy/objspace/std/test/test_intobject.py 
b/pypy/objspace/std/test/test_intobject.py
--- a/pypy/objspace/std/test/test_intobject.py
+++ b/pypy/objspace/std/test/test_intobject.py
@@ -498,6 +498,11 @@
 b = A(5).real
 assert type(b) is int
 
+def test_int_error_msg(self):
+e = raises(TypeError, int, [])
+assert str(e.value) == (
+"int() argument must be a string or a number, not 'list'")
+
 
 class AppTestIntOptimizedAdd(AppTestInt):
 spaceconfig = {"objspace.std.optimized_int_add": True}
diff --git a/pypy/objspace/std/test/test_longobject.py 
b/pypy/objspace/std/test/test_longobject.py
--- a/pypy/objspace/std/test/test_longobject.py
+++ b/pypy/objspace/std/test/test_longobject.py
@@ -341,3 +341,8 @@
 
 assert int(long(3)) == long(3)
 assert int(A(13)) == 42
+
+def test_long_error_msg(self):
+e = raises(TypeError, long, [])
+assert str(e.value) == (
+"long() argument must be a string or a number, not 'list'")
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy default: Thanks Larry

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: 
Changeset: r68071:d13b9ffb9f1a
Date: 2013-11-14 13:23 +0100
http://bitbucket.org/pypy/pypy/changeset/d13b9ffb9f1a/

Log:Thanks Larry

diff --git a/pypy/doc/release-2.2.0.rst b/pypy/doc/release-2.2.0.rst
--- a/pypy/doc/release-2.2.0.rst
+++ b/pypy/doc/release-2.2.0.rst
@@ -74,7 +74,7 @@
 
 * Things that use ``sys.set_trace`` are now JITted (like coverage)
 
-* JSON encoding used to be very fast, now decoding is as well
+* JSON decoding is now very fast (JSON encoding was already very fast)
 
 * various buffer copying methods experience speedups (like list-of-ints to
   ``int[]`` buffer from cffi)
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] cffi release-0.8: Release 0.8

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: release-0.8
Changeset: r1417:2d6172481285
Date: 2013-11-14 13:28 +0100
http://bitbucket.org/cffi/cffi/changeset/2d6172481285/

Log:Release 0.8

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] cffi release-0.8: MD5/SHA1

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: release-0.8
Changeset: r1418:7f64d6952c56
Date: 2013-11-14 13:30 +0100
http://bitbucket.org/cffi/cffi/changeset/7f64d6952c56/

Log:MD5/SHA1

diff --git a/doc/source/index.rst b/doc/source/index.rst
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -92,9 +92,9 @@
 
- Or grab the most current version by following the instructions below.
 
-   - MD5: ...
+   - MD5: e61deb0515311bb42d5d58b9403bc923
 
-   - SHA: ...
+   - SHA: 8332429193cb74d74f3347af180b448425d7d176
 
 * Or get it from the `Bitbucket page`_:
   ``hg clone https://bitbucket.org/cffi/cffi``
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] buildbot default: move NUMPY_64 to allegro64 and add it to the nightly-2-00 scheduler

2013-11-14 Thread bivab 
Author: David Schneider 
Branch: 
Changeset: r890:b7762c17e248
Date: 2013-11-14 13:43 +0100
http://bitbucket.org/pypy/buildbot/changeset/b7762c17e248/

Log:move NUMPY_64 to allegro64 and add it to the nightly-2-00 scheduler

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -225,6 +225,9 @@
 Nightly("nightly-2-00", [
 JITBENCH,  # on tannit32, uses 1 core (in part 
exclusively)
 JITBENCH64,# on tannit64, uses 1 core (in part 
exclusively)
+NUMPY_64,  # on allegro64, uses 1 core
+   # XXX maybe use a trigger instead?
+
 ], branch='default', hour=2, minute=0),
 
 Nightly("nightly-2-00-py3k", [
@@ -235,6 +238,7 @@
 Nightly("nighly-ppc", [
 JITONLYLINUXPPC64, # on gcc1
 ], branch='ppc-jit-backend', hour=1, minute=0),
+
 CustomForceScheduler('Force Scheduler',
 builderNames=[
 PYPYBUILDBOT,
@@ -437,11 +441,10 @@
'category': 'openindiana32',
},
   {'name': NUMPY_64,
-   'slavenames': ["tannit64"],
+   'slavenames': ["allegro64"],
'builddir': NUMPY_64,
'factory': pypyNumpyCompatability,
'category': 'numpy',
-   'locks': [TannitCPU.access('counting')],
},
   {'name': PYPYBUILDBOT,
'slavenames': ['cobra'],
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] buildbot default: move NUMPY_64 back to tannit64

2013-11-14 Thread bivab 
Author: David Schneider 
Branch: 
Changeset: r891:4d6e4e3813f2
Date: 2013-11-14 14:45 +0100
http://bitbucket.org/pypy/buildbot/changeset/4d6e4e3813f2/

Log:move NUMPY_64 back to tannit64

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -223,10 +223,10 @@
 ], branch='default', hour=0, minute=0),
 
 Nightly("nightly-2-00", [
+NUMPY_64,  # on tannit64, uses 1 core, takes about 
15min.
+   # XXX maybe use a trigger instead?
 JITBENCH,  # on tannit32, uses 1 core (in part 
exclusively)
 JITBENCH64,# on tannit64, uses 1 core (in part 
exclusively)
-NUMPY_64,  # on allegro64, uses 1 core
-   # XXX maybe use a trigger instead?
 
 ], branch='default', hour=2, minute=0),
 
@@ -441,10 +441,11 @@
'category': 'openindiana32',
},
   {'name': NUMPY_64,
-   'slavenames': ["allegro64"],
+   'slavenames': ["tannit64"],
'builddir': NUMPY_64,
'factory': pypyNumpyCompatability,
'category': 'numpy',
+   'locks': [TannitCPU.access('counting')],
},
   {'name': PYPYBUILDBOT,
'slavenames': ['cobra'],
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 7f1adb56a558 on branch bigint-with-int

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68073:47504fdf3522
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/47504fdf3522/

Log:Merge closed head 7f1adb56a558 on branch bigint-with-int

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 5f5e401edccc on branch improve-errors-again

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68098:2051fc50063a
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/2051fc50063a/

Log:Merge closed head 5f5e401edccc on branch improve-errors-again

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head ebf84dd7f970 on branch dtype-isnative

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68081:be7a78744f04
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/be7a78744f04/

Log:Merge closed head ebf84dd7f970 on branch dtype-isnative

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head c5943a5c41a9 on branch unquote-faster

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68093:5394ef2bda3d
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/5394ef2bda3d/

Log:Merge closed head c5943a5c41a9 on branch unquote-faster

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 3a0298093f20 on branch ndarray-ptp

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68103:63866b92a1ff
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/63866b92a1ff/

Log:Merge closed head 3a0298093f20 on branch ndarray-ptp

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 3cbee0b9425c on branch stdlib-2.7.4-fixed-class

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68089:8834bb5926f2
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/8834bb5926f2/

Log:Merge closed head 3cbee0b9425c on branch stdlib-2.7.4-fixed-class

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 6538f38f63da on branch popen2-removal

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68100:39ccd08e0b72
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/39ccd08e0b72/

Log:Merge closed head 6538f38f63da on branch popen2-removal

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 048031fbb4f9 on branch stdlib-2.7.4-pwd-fix

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68087:57969d79b842
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/57969d79b842/

Log:Merge closed head 048031fbb4f9 on branch stdlib-2.7.4-pwd-fix

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 9ad0c80d9cff on branch remove-numpypy

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68076:a76ac33d372a
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/a76ac33d372a/

Log:Merge closed head 9ad0c80d9cff on branch remove-numpypy

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head fc8664971578 on branch improve-errors-again2

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68099:4edea7455192
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/4edea7455192/

Log:Merge closed head fc8664971578 on branch improve-errors-again2

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 4230db2e2e1e on branch coding-guide-update-rlib-refs

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68091:140a5b7e9376
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/140a5b7e9376/

Log:Merge closed head 4230db2e2e1e on branch coding-guide-update-rlib-
refs

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 6a5f3429faad on branch optmodel-refactor

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68074:d42e9c73d526
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/d42e9c73d526/

Log:Merge closed head 6a5f3429faad on branch optmodel-refactor

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head cd07f4c70232 on branch enumerate-rstr

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68102:4ed00f76a576
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/4ed00f76a576/

Log:Merge closed head cd07f4c70232 on branch enumerate-rstr

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 06e7251aaed4 on branch urlparse-unquote-faster

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68094:2f23727661fa
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/2f23727661fa/

Log:Merge closed head 06e7251aaed4 on branch urlparse-unquote-faster

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 45ecc4a42058 on branch win32-fixes

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68085:6d4fbb25fa85
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/6d4fbb25fa85/

Log:Merge closed head 45ecc4a42058 on branch win32-fixes

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 3112b0eadb86 on branch numpypy_count_nonzero

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68080:998704dde1e3
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/998704dde1e3/

Log:Merge closed head 3112b0eadb86 on branch numpypy_count_nonzero

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head be560078e413 on branch nobold-backtrace

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68095:98531cd04c3a
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/98531cd04c3a/

Log:Merge closed head be560078e413 on branch nobold-backtrace

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head d28e53d9c806 on branch unbreak-freebsd

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68092:10757ec6ab02
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/10757ec6ab02/

Log:Merge closed head d28e53d9c806 on branch unbreak-freebsd

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 61ce3b8b16b1 on branch statvfs_tests

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68107:2c59a6c70918
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/2c59a6c70918/

Log:Merge closed head 61ce3b8b16b1 on branch statvfs_tests

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head e57b90333d9a on branch default

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68072:87b139c5154a
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/87b139c5154a/

Log:Merge closed head e57b90333d9a on branch default

diff --git a/.hgsubstate b/.hgsubstate
new file mode 100644
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 31b7c9223f79 on branch rdict-experiments-2

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68075:ff0c1dd2927c
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/ff0c1dd2927c/

Log:Merge closed head 31b7c9223f79 on branch rdict-experiments-2

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 8e4f7f8df8e1 on branch curses_fixes

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68105:fb503a734353
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/fb503a734353/

Log:Merge closed head 8e4f7f8df8e1 on branch curses_fixes

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head ca3a4cf272be on branch package-tk

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68101:9ac54ab0dbe0
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/9ac54ab0dbe0/

Log:Merge closed head ca3a4cf272be on branch package-tk

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 9d2bc73626af on branch ndmin

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68082:642ab92e26cf
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/642ab92e26cf/

Log:Merge closed head 9d2bc73626af on branch ndmin

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 3271bde53cb5 on branch numpypy-inplace-op

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68079:2f71dbdd9470
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/2f71dbdd9470/

Log:Merge closed head 3271bde53cb5 on branch numpypy-inplace-op

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 18d6db6fccf8 on branch task-decorator

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68112:aed7cfe91a46
Date: 2013-11-14 19:01 +0100
http://bitbucket.org/pypy/pypy/changeset/aed7cfe91a46/

Log:Merge closed head 18d6db6fccf8 on branch task-decorator

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 9d9386541679 on branch cleanup-numpypy-namespace

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68078:cacf7ddae3aa
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/cacf7ddae3aa/

Log:Merge closed head 9d9386541679 on branch cleanup-numpypy-namespace

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head c28dc4ddd9be on branch distutils-cppldflags

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68097:47e35549c6d4
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/47e35549c6d4/

Log:Merge closed head c28dc4ddd9be on branch distutils-cppldflags

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 0a8ce6278f68 on branch remove-PYPY_NOT_MAIN_FILE

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68096:e6a2260ea787
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/e6a2260ea787/

Log:Merge closed head 0a8ce6278f68 on branch remove-PYPY_NOT_MAIN_FILE

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head e6b76694838f on branch stdlib-2.7.4-fixed-io

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68088:d435baaea47f
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/d435baaea47f/

Log:Merge closed head e6b76694838f on branch stdlib-2.7.4-fixed-io

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 09e6c7429ebb on branch stdlib-2.7.4-poll-fix

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68086:aef60966ce17
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/aef60966ce17/

Log:Merge closed head 09e6c7429ebb on branch stdlib-2.7.4-poll-fix

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 67779c333eea on branch clean-up-remaining-pypy-rlib-refs

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68090:6b3ebcd26d8a
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/6b3ebcd26d8a/

Log:Merge closed head 67779c333eea on branch clean-up-remaining-pypy-
rlib-refs

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head cf222adc939f on branch numpy-newbyteorder

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68077:333251320e76
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/333251320e76/

Log:Merge closed head cf222adc939f on branch numpy-newbyteorder

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 7630ca70381b on branch array_equal

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68083:7a010056514c
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/7a010056514c/

Log:Merge closed head 7630ca70381b on branch array_equal

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 8412492e8e81 on branch rlib-doc-rpython-refs

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68104:fab5aaa5a12b
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/fab5aaa5a12b/

Log:Merge closed head 8412492e8e81 on branch rlib-doc-rpython-refs

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 3fec18025f0d on branch pickle-dumps

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68084:b6d66231dba3
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/b6d66231dba3/

Log:Merge closed head 3fec18025f0d on branch pickle-dumps

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 3f776b761e09 on branch pycon2013-doc-fixes

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68109:0cc3a7eb47cf
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/0cc3a7eb47cf/

Log:Merge closed head 3f776b761e09 on branch pycon2013-doc-fixes

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 800741417787 on branch ssl_moving_write_buffer

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68118:582320f11d88
Date: 2013-11-14 19:01 +0100
http://bitbucket.org/pypy/pypy/changeset/582320f11d88/

Log:Merge closed head 800741417787 on branch ssl_moving_write_buffer

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head d7746d32bf9d on branch py3k-struct

2013-11-14 Thread arigo 
Author: Armin Rigo 
Branch: closed-branches
Changeset: r68113:2ee19ed8f81f
Date: 2013-11-14 19:01 +0100
http://bitbucket.org/pypy/pypy/changeset/2ee19ed8f81f/

Log:Merge closed head d7746d32bf9d on branch py3k-struct

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

  1   2   >