[pypy-commit] pypy default: Make imports of OrderedDict unconditional, since we only support 2.7 now.

[rlamy]

Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: 
Changeset: r80620:8e96ccf1c83d
Date: 2015-11-10 18:44 +0000
http://bitbucket.org/pypy/pypy/changeset/8e96ccf1c83d/

Log:    Make imports of OrderedDict unconditional, since we only support 2.7
        now.

diff --git a/rpython/annotator/test/test_annrpython.py 
b/rpython/annotator/test/test_annrpython.py
--- a/rpython/annotator/test/test_annrpython.py
+++ b/rpython/annotator/test/test_annrpython.py
@@ -1,6 +1,8 @@
 from __future__ import with_statement
 import py.test
 import sys
+from collections import OrderedDict
+
 from rpython.conftest import option
 
 from rpython.annotator import model as annmodel
@@ -4265,10 +4267,6 @@
         assert ("format() is not RPython" in exc.value.msg)
 
     def test_prebuilt_ordered_dict(self):
-        try:
-            from collections import OrderedDict
-        except ImportError:
-            py.test.skip("Please upgrade to python 2.7")
         d = OrderedDict([("aa", 1)])
 
         def f():
diff --git a/rpython/rlib/objectmodel.py b/rpython/rlib/objectmodel.py
--- a/rpython/rlib/objectmodel.py
+++ b/rpython/rlib/objectmodel.py
@@ -9,6 +9,8 @@
 import types
 import math
 import inspect
+from collections import OrderedDict
+
 from rpython.tool.sourcetools import rpython_wrapper, func_with_new_name
 from rpython.rtyper.extregistry import ExtRegistryEntry
 from rpython.flowspace.specialcase import register_flow_sc
@@ -744,8 +746,6 @@
 
 class r_ordereddict(r_dict):
     def _newdict(self):
-        from collections import OrderedDict
-
         return OrderedDict()
 
 class _r_dictkey(object):
diff --git a/rpython/rlib/test/test_objectmodel.py 
b/rpython/rlib/test/test_objectmodel.py
--- a/rpython/rlib/test/test_objectmodel.py
+++ b/rpython/rlib/test/test_objectmodel.py
@@ -1,3 +1,4 @@
+from collections import OrderedDict
 import py
 from rpython.rlib.objectmodel import *
 from rpython.rlib import types
@@ -330,10 +331,6 @@
         assert res == 42     # "did not crash"
 
     def test_prepare_dict_update_2(self):
-        try:
-            from collections import OrderedDict
-        except ImportError:     # Python 2.6
-            py.test.skip("requires collections.OrderedDict")
         def g(n):
             d = OrderedDict()
             prepare_dict_update(d, n)
diff --git a/rpython/rtyper/test/test_rordereddict.py 
b/rpython/rtyper/test/test_rordereddict.py
--- a/rpython/rtyper/test/test_rordereddict.py
+++ b/rpython/rtyper/test/test_rordereddict.py
@@ -1,9 +1,7 @@
 
 import py
-try:
-    from collections import OrderedDict
-except ImportError:     # Python 2.6
-    py.test.skip("requires collections.OrderedDict")
+from collections import OrderedDict
+
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.rtyper.lltypesystem import rordereddict, rstr
 from rpython.rlib.rarithmetic import intmask
diff --git a/rpython/translator/c/test/test_genc.py 
b/rpython/translator/c/test/test_genc.py
--- a/rpython/translator/c/test/test_genc.py
+++ b/rpython/translator/c/test/test_genc.py
@@ -1,4 +1,5 @@
 import ctypes
+from collections import OrderedDict
 
 import py
 
@@ -573,11 +574,6 @@
     assert fn(True)
 
 def test_ordered_dict():
-    try:
-        from collections import OrderedDict
-    except ImportError:
-        py.test.skip("Please update to Python 2.7")
-
     expected = [('ea', 1), ('bb', 2), ('c', 3), ('d', 4), ('e', 5),
                 ('ef', 6)]
     d = OrderedDict(expected)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit