Commits

Philip Jenvey committed 733bf19 Merge

merge default

  • Participants
  • Parent commits 57889a2, 5078f60
  • Branches py3k

Comments (0)

Files changed (6)

     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

File pypy/doc/conf.py

 
 # 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

File pypy/doc/whatsnew-head.rst

 
 .. branch: OlivierBlanvillain/fix-3-broken-links-on-pypy-published-pap-1386250839215
 Fix 3 broken links on PyPy published papers in docs.
+
+.. branch: jit-ordereddict

File pypy/module/sys/app.py

     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.

File rpython/jit/metainterp/test/test_dict.py

 from collections import OrderedDict
 
 class DictTests:
+    @staticmethod
+    def newdict():   # overridden in TestLLOrderedDict
+        return {}
+
     def _freeze_(self):
         return True
 
 
 
 class TestLLtype(DictTests, LLJitMixin):
-    @staticmethod
-    def newdict():
-        return {}
+    pass
 
 class TestLLOrderedDict(DictTests, LLJitMixin):
     @staticmethod

File rpython/jit/metainterp/test/test_rawmem.py

                                        '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)
         assert res == 66
         res = self.interp_operations(f, [2, 2], disable_optimizations=True)
         assert res == 44
-
-class TestRawMem(RawMemTests, LLJitMixin):
-    pass