Merge pull request #2751 from tacaswell/test_qt4_unicodefix

tacaswell · tacaswell · commit fcdb600c3828 · 2014-01-22T07:41:24.000-08:00
BUG : fix failing test on 3.2
diff --git a/lib/matplotlib/tests/test_backend_qt4.py b/lib/matplotlib/tests/test_backend_qt4.py
@@ -77,23 +77,23 @@ def receive(event):
 def test_shift():
     assert_correct_key(QtCore.Qt.Key_A,
                        ShiftModifier,
-                       u'A')
+                       'A')
 
 
 @cleanup
 @knownfailureif(not HAS_QT)
 def test_lower():
     assert_correct_key(QtCore.Qt.Key_A,
                        QtCore.Qt.NoModifier,
-                       u'a')
+                       'a')
 
 
 @cleanup
 @knownfailureif(not HAS_QT)
 def test_control():
     assert_correct_key(QtCore.Qt.Key_A,
                        ControlModifier,
-                       u'ctrl+a')
+                       'ctrl+a')
 
 
 @cleanup
@@ -117,39 +117,39 @@ def test_unicode_lower():
 def test_alt_control():
     assert_correct_key(ControlKey,
                        AltModifier,
-                       u'alt+control')
+                       'alt+control')
 
 
 @cleanup
 @knownfailureif(not HAS_QT)
 def test_control_alt():
     assert_correct_key(AltKey,
                        ControlModifier,
-                       u'ctrl+alt')
+                       'ctrl+alt')
 
 
 @cleanup
 @knownfailureif(not HAS_QT)
 def test_modifier_order():
     assert_correct_key(QtCore.Qt.Key_Aacute,
                        (ControlModifier | AltModifier | SuperModifier),
-                       u'ctrl+alt+super+' + unichr(225))
+                       'ctrl+alt+super+' + unichr(225))
 
 
 @cleanup
 @knownfailureif(not HAS_QT)
 def test_backspace():
     assert_correct_key(QtCore.Qt.Key_Backspace,
                        QtCore.Qt.NoModifier,
-                       u'backspace')
+                       'backspace')
 
 
 @cleanup
 @knownfailureif(not HAS_QT)
 def test_backspace_mod():
     assert_correct_key(QtCore.Qt.Key_Backspace,
                        ControlModifier,
-                       u'ctrl+backspace')
+                       'ctrl+backspace')
 
 
 @cleanup
