Merge pull request #121 from timofurrer/cleanup/remove-py26-support

Remove last traces of Python 2.6 support. Closes #120
gabrielfalcao · Jun 22, 2016 · 6f012cc · 6f012cc
2 parents 3bc2598 + 829b9de
commit 6f012cc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 169 deletions.
diff --git a/sure/__init__.py b/sure/__init__.py
@@ -51,18 +51,6 @@
 version = '1.3.0'
 
 
-def print_py26_deprecation_warn():
-    # warn the user if sure is used with python 2.6.
-    # sure will remove python 2.6 support in the next version.
-    # make sure to remove this code as soon as the python 2.6 support is removed
-    if sys.version_info[0] == 2 and sys.version_info[1] == 6:
-        import warnings
-        warnings.simplefilter("always", PendingDeprecationWarning)
-        warnings.warn("The next version of sure will NO LONGER support python 2.6", PendingDeprecationWarning)
-
-print_py26_deprecation_warn()
-
-
 not_here_error = \
     'you have tried to access the attribute %r from the context ' \
     '(aka VariablesBag), but there is no such attribute assigned to it. ' \

diff --git a/sure/compat.py b/sure/compat.py
@@ -1,10 +1,9 @@
+# -*- coding: utf-8 -*-
+
 from __future__ import unicode_literals
-import six
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from sure.ordereddict import OrderedDict
+import six
+from collections import OrderedDict
 
 from sure.terminal import red, green, yellow
 

diff --git a/sure/ordereddict.py b/sure/ordereddict.py
diff --git a/tests/test_py26_deprecation.py b/tests/test_py26_deprecation.py