Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r49582:307b3c6238de
Date: 2011-11-20 18:01 +0200
http://bitbucket.org/pypy/pypy/changeset/307b3c6238de/
Log: merge
diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst
--- a/pypy/doc/coding-guide.rst
+++ b/pypy/doc/coding-guide.rst
@@ -270,7 +270,12 @@
- *slicing*:
the slice start must be within bounds. The stop doesn't need to, but it
must
not be smaller than the start. All negative indexes are disallowed,
except for
- the [:-1] special case. No step.
+ the [:-1] special case. No step. Slice deletion follows the same rules.
+
+ - *slice assignment*:
+ only supports ``lst[x:y] = sublist``, if ``len(sublist) == y - x``.
+ In other words, slice assignment cannot change the total length of the
list,
+ but just replace items.
- *other operators*:
``+``, ``+=``, ``in``, ``*``, ``*=``, ``==``, ``!=`` work as expected.
diff --git a/pypy/doc/release-1.7.0.rst b/pypy/doc/release-1.7.0.rst
--- a/pypy/doc/release-1.7.0.rst
+++ b/pypy/doc/release-1.7.0.rst
@@ -12,6 +12,9 @@
* windows fixes
* stackless and JIT integration
+ (stackless is now in the same executable, but any loop using
+ stackless features will interrupt the JIT for now, so no real
+ performance improvement for now)
* numpy progress - dtypes, numpy -> numpypy renaming
diff --git a/pypy/module/pypyjit/test_pypy_c/test_string.py
b/pypy/module/pypyjit/test_pypy_c/test_string.py
--- a/pypy/module/pypyjit/test_pypy_c/test_string.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_string.py
@@ -147,8 +147,8 @@
i31 = int_gt(i30, 23)
guard_false(i31, descr=...)
copystrcontent(p9, p21, 0, i25, i10)
- i33 = int_eq(i30, 23)
- guard_false(i33, descr=...)
+ i33 = int_lt(i30, 23)
+ guard_true(i33, descr=...)
p35 = call(ConstClass(ll_shrink_array__rpy_stringPtr_Signed), p21,
i30, descr=<GcPtrCallDescr>)
guard_no_exception(descr=...)
i37 = strlen(p35)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
