Don't skip tests that use OrderedDict

ordereddict is now a dependency in Python 2.6, so we don't need to skip them
anymore.

test/test_dumps.py

@@ -1,21 +1,20 @@
 from   __future__     import unicode_literals
 from   datetime       import datetime
 import time
-import sys
 from   dateutil.tz    import tzoffset
 import pytest
 from   javaproperties import dumps
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
+
 @pytest.fixture(autouse=True)
 def set_timezone(monkeypatch):
     monkeypatch.setenv('TZ', 'EST5EDT,M3.2.0/M11.1.0')
     time.tzset()
 
-need_ordereddict = pytest.mark.skipif(
-    sys.version_info[:2] < (2,7) or sys.version_info[:2] == (3,0),
-    reason='No OrderedDict before 2.7/3.1',
-)
-
 def test_dumps_nothing():
     assert dumps({}, timestamp=False) == ''
 
@@ -44,34 +43,26 @@ def test_dumps_two_simple_rev_sorted():
         sort_keys=True,
     ) == 'key=value\nzebra=apple\n'
 
-@need_ordereddict
 def test_dumps_ordereddict():
-    from collections import OrderedDict
     assert dumps(
         OrderedDict([("key", "value"), ("zebra", "apple")]),
         timestamp=False,
     ) == 'key=value\nzebra=apple\n'
 
-@need_ordereddict
 def test_dumps_ordereddict_rev():
-    from collections import OrderedDict
     assert dumps(
         OrderedDict([("zebra", "apple"), ("key", "value")]),
         timestamp=False,
     ) == 'zebra=apple\nkey=value\n'
 
-@need_ordereddict
 def test_dumps_ordereddict_sorted():
-    from collections import OrderedDict
     assert dumps(
         OrderedDict([("key", "value"), ("zebra", "apple")]),
         timestamp=False,
         sort_keys=True,
     ) == 'key=value\nzebra=apple\n'
 
-@need_ordereddict
 def test_dumps_ordereddict_rev_sorted():
-    from collections import OrderedDict
     assert dumps(
         OrderedDict([("zebra", "apple"), ("key", "value")]),
         timestamp=False,

test/test_dumps_xml.py

@@ -1,12 +1,10 @@
 from   __future__     import unicode_literals
-import sys
-import pytest
 from   javaproperties import dumps_xml
 
-need_ordereddict = pytest.mark.skipif(
-    sys.version_info[:2] < (2,7) or sys.version_info[:2] == (3,0),
-    reason='No OrderedDict before 2.7/3.1',
-)
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 
 def test_dumps_xml_nothing():
     assert dumps_xml({}) == '''\
@@ -65,9 +63,7 @@ def test_dumps_xml_two_simple_rev_sorted():
 </properties>
 '''
 
-@need_ordereddict
 def test_dumps_xml_ordereddict():
-    from collections import OrderedDict
     assert dumps_xml(OrderedDict([("key","value"), ("zebra","apple")])) == '''\
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
@@ -76,9 +72,7 @@ def test_dumps_xml_ordereddict():
 </properties>
 '''
 
-@need_ordereddict
 def test_dumps_xml_ordereddict_rev():
-    from collections import OrderedDict
     assert dumps_xml(OrderedDict([("zebra","apple"), ("key","value")])) == '''\
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
@@ -87,9 +81,7 @@ def test_dumps_xml_ordereddict_rev():
 </properties>
 '''
 
-@need_ordereddict
 def test_dumps_xml_ordereddict_sorted():
-    from collections import OrderedDict
     assert dumps_xml(
         OrderedDict([("key", "value"), ("zebra", "apple")]),
         sort_keys=True,
@@ -101,9 +93,7 @@ def test_dumps_xml_ordereddict_sorted():
 </properties>
 '''
 
-@need_ordereddict
 def test_dumps_xml_ordereddict_rev_sorted():
-    from collections import OrderedDict
     assert dumps_xml(
         OrderedDict([("zebra", "apple"), ("key", "value")]),
         sort_keys=True,

test/test_loads.py

@@ -1,12 +1,10 @@
 from   __future__     import unicode_literals
-import sys
-import pytest
 from   javaproperties import loads
 
-need_ordereddict = pytest.mark.skipif(
-    sys.version_info[:2] < (2,7) or sys.version_info[:2] == (3,0),
-    reason='No OrderedDict before 2.7/3.1',
-)
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 
 def test_loads_simple():
     assert loads('key=value') == {"key": "value"}
@@ -170,15 +168,11 @@ def test_loads_multiple_crlf():
 def test_loads_multiple_cr():
     assert loads('key = value\rfoo = bar') == {"key": "value", "foo": "bar"}
 
-@need_ordereddict
 def test_loads_multiple_ordereddict():
-    from collections import OrderedDict
     assert loads('key = value\nfoo = bar', object_pairs_hook=OrderedDict) == \
         OrderedDict([("key", "value"), ("foo", "bar")])
 
-@need_ordereddict
 def test_loads_multiple_ordereddict_rev():
-    from collections import OrderedDict
     assert loads('foo = bar\nkey = value', object_pairs_hook=OrderedDict) == \
         OrderedDict([("foo", "bar"), ("key", "value")])
 

test/test_loads_xml.py

@@ -1,12 +1,11 @@
 from   __future__     import unicode_literals
-import sys
 import pytest
 from   javaproperties import loads_xml
 
-need_ordereddict = pytest.mark.skipif(
-    sys.version_info[:2] < (2,7) or sys.version_info[:2] == (3,0),
-    reason='No OrderedDict before 2.7/3.1',
-)
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 
 def test_loads_xml_nothing():
     assert loads_xml('<properties></properties>') == {}
@@ -45,9 +44,7 @@ def test_loads_xml_extra_whitespace():
 def test_loads_xml_multiple():
     assert loads_xml('<properties><entry key="key">value</entry><entry key="foo">bar</entry></properties>') == {"key": "value", "foo": "bar"}
 
-@need_ordereddict
 def test_loads_xml_multiple_ordereddict():
-    from collections import OrderedDict
     assert loads_xml('''
 <properties>
     <entry key="key">value</entry>
@@ -56,9 +53,7 @@ def test_loads_xml_multiple_ordereddict():
 ''', object_pairs_hook=OrderedDict) == \
         OrderedDict([("key", "value"), ("foo", "bar")])
 
-@need_ordereddict
 def test_loads_xml_multiple_ordereddict_rev():
-    from collections import OrderedDict
     assert loads_xml('''
 <properties>
     <entry key="foo">bar</entry>