Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r68581:733bf19dd5a5
Date: 2014-01-03 15:46 -0800
http://bitbucket.org/pypy/pypy/changeset/733bf19dd5a5/
Log: merge default
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -28,7 +28,7 @@
DEALINGS IN THE SOFTWARE.
-PyPy Copyright holders 2003-2013
+PyPy Copyright holders 2003-2014
-----------------------------------
Except when otherwise stated (look for LICENSE files or information at
diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py
--- a/pypy/doc/conf.py
+++ b/pypy/doc/conf.py
@@ -38,7 +38,7 @@
# General information about the project.
project = u'PyPy'
-copyright = u'2013, The PyPy Project'
+copyright = u'2014, The PyPy Project'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
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
@@ -39,3 +39,5 @@
.. branch:
OlivierBlanvillain/fix-3-broken-links-on-pypy-published-pap-1386250839215
Fix 3 broken links on PyPy published papers in docs.
+
+.. branch: jit-ordereddict
diff --git a/pypy/module/sys/app.py b/pypy/module/sys/app.py
--- a/pypy/module/sys/app.py
+++ b/pypy/module/sys/app.py
@@ -69,11 +69,11 @@
return None
copyright_str = """
-Copyright 2003-2013 PyPy development team.
+Copyright 2003-2014 PyPy development team.
All Rights Reserved.
For further information, see <http://pypy.org>
-Portions Copyright (c) 2001-2013 Python Software Foundation.
+Portions Copyright (c) 2001-2014 Python Software Foundation.
All Rights Reserved.
Portions Copyright (c) 2000 BeOpen.com.
diff --git a/rpython/jit/metainterp/test/test_dict.py
b/rpython/jit/metainterp/test/test_dict.py
--- a/rpython/jit/metainterp/test/test_dict.py
+++ b/rpython/jit/metainterp/test/test_dict.py
@@ -5,6 +5,10 @@
from collections import OrderedDict
class DictTests:
+ @staticmethod
+ def newdict(): # overridden in TestLLOrderedDict
+ return {}
+
def _freeze_(self):
return True
@@ -191,9 +195,7 @@
class TestLLtype(DictTests, LLJitMixin):
- @staticmethod
- def newdict():
- return {}
+ pass
class TestLLOrderedDict(DictTests, LLJitMixin):
@staticmethod
diff --git a/rpython/jit/metainterp/test/test_rawmem.py
b/rpython/jit/metainterp/test/test_rawmem.py
--- a/rpython/jit/metainterp/test/test_rawmem.py
+++ b/rpython/jit/metainterp/test/test_rawmem.py
@@ -71,7 +71,11 @@
'raw_store': 1, 'raw_load': 1,
'finish': 1})
+
+class TestRawMem(RawMemTests, LLJitMixin):
+
def test_getarraysubstruct(self):
+ # NOTE: not for backend/*/test
A2 = lltype.Array(('a', lltype.Signed), ('b', lltype.Signed),
hints={'nolength': True})
p = lltype.malloc(A2, 10, flavor='raw', immortal=True, zero=True)
@@ -90,6 +94,3 @@
assert res == 66
res = self.interp_operations(f, [2, 2], disable_optimizations=True)
assert res == 44
-
-class TestRawMem(RawMemTests, LLJitMixin):
- pass
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
