Fixes and cleans code related to pyplot xticks() and yticks() to allow setting only the labels

rscmendes · rscmendes · commit 3035a0ad07ac · 2019-11-28T14:20:58.000Z
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1428,15 +1428,16 @@ def xticks(ticks=None, labels=None, **kwargs):
     """
     ax = gca()
 
-    if ticks is None and labels is None:
+    if ticks is None:
         locs = ax.get_xticks()
-        labels = ax.get_xticklabels()
-    elif labels is None:
+    else:
         locs = ax.set_xticks(ticks)
+
+    if labels is None:
         labels = ax.get_xticklabels()
     else:
-        locs = ax.set_xticks(ticks)
         labels = ax.set_xticklabels(labels, **kwargs)
+
     for l in labels:
         l.update(kwargs)
 
@@ -1503,15 +1504,16 @@ def yticks(ticks=None, labels=None, **kwargs):
     """
     ax = gca()
 
-    if ticks is None and labels is None:
+    if ticks is None:
         locs = ax.get_yticks()
-        labels = ax.get_yticklabels()
-    elif labels is None:
+    else:
         locs = ax.set_yticks(ticks)
+
+    if labels is None:
         labels = ax.get_yticklabels()
     else:
-        locs = ax.set_yticks(ticks)
         labels = ax.set_yticklabels(labels, **kwargs)
+
     for l in labels:
         l.update(kwargs)
 
