Deal with test_configure_width and test_configure_height for Notebooks.

Author: culler

Lib/test/test_tkinter/test_widgets.py

@@ -1556,13 +1556,13 @@ def test_configure_aspect(self):
 
     def test_configure_padx(self):
         widget = self.create()
-        self.checkPixelsParam(widget, 'padx', 3, 4.4, 5.6, '12m')#,
+        self.checkPixelsParam(widget, 'padx', 3, 4.4, 5.6, '12m')
         expected = -2 if tk_version < (9, 0) else self._default_pixels
         self.checkParam(widget, 'padx', -2, expected=expected)
 
     def test_configure_pady(self):
         widget = self.create()
-        self.checkPixelsParam(widget, 'pady', 3, 4.4, 5.6, '12m')#,
+        self.checkPixelsParam(widget, 'pady', 3, 4.4, 5.6, '12m')
         expected = -2 if tk_version < (9, 0) else self._default_pixels
         self.checkParam(widget, 'pady', -2, expected=expected)
 

Lib/test/test_tkinter/widget_tests.py

@@ -145,12 +145,14 @@ def checkEnumParam(self, widget, name, *values,
     def checkPixelsParam(self, widget, name, *values, conv=None, **kwargs):
         if not self._rounds_pixels or name in self._no_round:
             conv = False
-        else:
+        elif conv != str:
             conv = round
         for value in values:
             expected = _sentinel
             conv1 = conv
             if isinstance(value, str):
+                if not getattr(self, '_converts_pixels', True):
+                    conv1 = str
                 if conv1 and conv1 is not str:
                     expected = pixels_conv(value) * self.scaling
                     conv1 = round

Lib/test/test_ttk/test_widgets.py

@@ -994,6 +994,7 @@ class NotebookTest(AbstractWidgetTest, unittest.TestCase):
         'class', 'cursor', 'height', 'padding', 'style', 'takefocus', 'width',
     )
     _rounds_pixels = (tk_version < (9,0))
+    _converts_pixels = False
     _clipped = {}
 
     def setUp(self):
@@ -1009,17 +1010,11 @@ def create(self, **kwargs):
 
     def test_configure_height(self):
         widget = self.create()
-        if tk_version < (9,0):
-            self.checkIntegerParam(widget, 'height', 402, -402, 0)
-        else:
-            self.checkPixelsParam(widget, 'height', 402, -402, 0)
+        self.checkPixelsParam(widget, 'height', '10c', 402, -402, 0)
 
     def test_configure_width(self):
         widget = self.create()
-        if tk_version < (9,0):
-            self.checkIntegerParam(widget, 'width', 402, -402, 0)
-        else:
-            self.checkPixelsParam(widget, 'width', 402, -402, 0)
+        self.checkPixelsParam(widget, 'width', '10c', 402, -402, 0)
 
     def test_tab_identifiers(self):
         self.nb.forget(0)
@@ -1445,8 +1440,10 @@ def test_configure_displaycolumns(self):
 
     def test_configure_height(self):
         widget = self.create()
-        self.checkPixelsParam(widget, 'height', 100, -100, 0, '3c', conv=False)
-        self.checkPixelsParam(widget, 'height', 101.2, 102.6, conv=False)
+        self.checkPixelsParam(widget, 'height', 100, -100, 0, '3c',
+                                  conv=False)
+        self.checkPixelsParam(widget, 'height', 101.2, 102.6, '3c',
+                                  conv=False)
 
     def test_configure_selectmode(self):
         widget = self.create()