Remove some straggling Python 2.6-isms

beetbox · Jun 11, 2016 · a11e628 · a11e628
1 parent 0a735c7
commit a11e628
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/confuse.py b/confuse.py
@@ -24,10 +24,7 @@
 import yaml
 import collections
 import re
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from collections import OrderedDict
 
 UNIX_DIR_VAR = 'XDG_CONFIG_HOME'
 UNIX_DIR_FALLBACK = '~/.config'

diff --git a/setup.py b/setup.py
@@ -25,6 +25,9 @@ def _read(fn):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ],
 )
diff --git a/test/__init__.py b/test/__init__.py
@@ -4,13 +4,6 @@
 import os
 
 
-# Use unittest2 on Python < 2.7.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
-
-
 def _root(*sources):
     return confuse.RootView([confuse.ConfigSource.of(s) for s in sources])