Address comments

kshramt · kshramt · commit 97e7dacf0515 · 2017-02-26T11:28:24.000+09:00
- #7931 (comment) - #7931 (comment)
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -1204,8 +1204,8 @@ def score_weight(self, weight1, weight2):
 
         # exact match of the weight names (e.g. weight1 == weight2 == "regular")
         if (isinstance(weight1, six.string_types) and
-            isinstance(weight2, six.string_types) and
-            weight1 == weight2):
+                isinstance(weight2, six.string_types) and
+                weight1 == weight2):
             return 0.0
         try:
             weightval1 = int(weight1)
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -40,8 +40,9 @@ def test_score_weight():
     assert (0 ==
             fontManager.score_weight("regular", "regular") ==
             fontManager.score_weight("bold", "bold") <
-            fontManager.score_weight("normal", "regular") ==
-            fontManager.score_weight(400, 400) <
+            fontManager.score_weight(400, 400) ==
+            # "normal" and "regular" have the same numerical weight
+            fontManager.score_weight("normal", "regular") <
             fontManager.score_weight("normal", "bold"))
 
 
