Author: Alex Gaynor
Branch:
Changeset: r50826:f6f8ddc1a2f0
Date: 2011-12-22 16:58 -0600
http://bitbucket.org/pypy/pypy/changeset/f6f8ddc1a2f0/
Log:merged upstream
diff --git a/pypy/objspace/std/stringobject.py
b/pypy/objspace/std/stringobject.py
--- a/pypy/objspace/std/stringobject.py
+++
Author: Alex Gaynor
Branch:
Changeset: r50825:2988075eae8d
Date: 2011-12-22 16:58 -0600
http://bitbucket.org/pypy/pypy/changeset/2988075eae8d/
Log:Work with sqlite's that don't have extension support.
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/
Author: Alex Gaynor
Branch: extradoc
Changeset: r3990:5c5293074ddb
Date: 2011-12-22 16:26 -0600
http://bitbucket.org/pypy/extradoc/changeset/5c5293074ddb/
Log:note which is the tutorial.
diff --git a/blog/draft/pycon-2012-teaser.rst b/blog/draft/pycon-2012-teaser.rst
--- a/blog/draft/pycon-2
Author: Alex Gaynor
Branch:
Changeset: r50824:4d8780140779
Date: 2011-12-22 18:43 +
http://bitbucket.org/pypy/pypy/changeset/4d8780140779/
Log:do the same check as CPython here, explicitly check for length
overflow before doing a replace.
diff --git a/pypy/objspace/std/stringobj
Author: Hakan Ardo
Branch: jit-improve-nested-loops
Changeset: r50823:f637da0553fb
Date: 2011-12-22 16:04 +0100
http://bitbucket.org/pypy/pypy/changeset/f637da0553fb/
Log:hg merge default
diff --git a/pypy/jit/backend/x86/jump.py b/pypy/jit/backend/x86/jump.py
--- a/pypy/jit/backend/x86/jump
Author: Hakan Ardo
Branch: jit-improve-nested-loops
Changeset: r50822:ce62dce925d3
Date: 2011-12-22 16:02 +0100
http://bitbucket.org/pypy/pypy/changeset/ce62dce925d3/
Log:we cant call get_procedure_token if we are in_recursion since the
actual greenkey arguments are wrongly typed for