gracefully handle systems without tkinter (fixes #20)

2 files changed, 10 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 86f621c..daf5564 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ This file lists the changes in each six version.
 Development version
 -------------------
 
+- Issue #20: Fix tests if tkinter is not available.
+
 - Issue #17: Define callable to be builtin callable when it is available again
   in Python 3.2+.
 
diff --git a/test_six.py b/test_six.py
index afe98b4..f4a12c8 100644
--- a/test_six.py
+++ b/test_six.py
@@ -77,6 +77,13 @@ def test_lazy():
     assert "htmlparser" not in six._MovedItems.__dict__
 
 
+try:
+    import _tkinter
+except ImportError:
+    have_tkinter = False
+else:
+    have_tkinter = True
+
 @py.test.mark.parametrize("item_name",
                           [item.name for item in six._moved_attributes])
 def test_move_items(item_name):
@@ -86,7 +93,7 @@ def test_move_items(item_name):
     except ImportError:
         if item_name == "winreg" and not sys.platform.startswith("win"):
             py.test.skip("Windows only module")
-        if "_tkinter" in str(sys.exc_info()[1]):
+        if item_name.startswith("tkinter") and not have_tkinter:
             py.test.skip("requires tkinter")
         raise