scripts: Fixed missing tuple unpack in glob-all CLI attrs

This was broken:

  $ ./scripts/plotmpl.py -L'*=bs=%(bs)s'

There may be a better way to organize this logic, but spamming if
statements works well enough.

scripts/codemap.py

@@ -247,9 +247,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
+            if not isinstance(attr, tuple):
-                    or attr[0] in {None, (), (None,), ('*',)}):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 

scripts/codemapd3.py

@@ -116,9 +116,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
+            if not isinstance(attr, tuple):
-                    or attr[0] in {None, (), (None,), ('*',)}):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 

scripts/dbgbmap.py

@@ -3806,9 +3806,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
+            if not isinstance(attr, tuple):
-                    or attr[0] in {None, (), (None,), ('*',)}):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 

scripts/dbgbmapd3.py

@@ -3694,9 +3694,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
+            if not isinstance(attr, tuple):
-                    or attr[0] in {None, (), (None,), ('*',)}):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 

scripts/dbgtrace.py

@@ -262,9 +262,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
+            if not isinstance(attr, tuple):
-                    or attr[0] in {None, (), (None,), ('*',)}):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 

scripts/plot.py

@@ -424,9 +424,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
+            if not isinstance(attr, tuple):
-                    or attr[0] in {None, (), (None,), ('*',)}):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 

scripts/plotmpl.py

@@ -308,9 +308,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
+            if not isinstance(attr, tuple):
-                    or attr[0] in {None, (), (None,), ('*',)}):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 

scripts/treemap.py

@@ -316,9 +316,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
+            if not isinstance(attr, tuple):
-                    or attr[0] in {None, (), (None,), ('*',)}):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 

scripts/treemapd3.py

@@ -184,9 +184,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
+            if not isinstance(attr, tuple):
-                    or attr[0] in {None, (), (None,), ('*',)}):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])