scripts: Tweaked -./-p/-P flags in ascii scripts

- -*/--add-char/--chars -> -./--add-char/--chars
- -./--points -> -p/--points
- -!/--points-and-lines -> -P/--points-and-lines

Also fixed an issue in plot.py/Attr where non-list default were failing
to concatenate.

scripts/codemap.py

@@ -95,7 +95,7 @@ class Attr:
                     not isinstance(attr, tuple)
                         or attr[0] in {None, (), ('*',)}
                     for attr in (attrs or []))):
-            attrs = defaults + (attrs or [])
+            attrs = list(defaults) + (attrs or [])
 
         # normalize
         self.attrs = []
@@ -1194,7 +1194,7 @@ if __name__ == "__main__":
             help="Add a label to use. Can be assigned to a specific "
                 "function/subsystem. Accepts %% modifiers.")
     parser.add_argument(
-            '-*', '--add-char', '--chars',
+            '-.', '--add-char', '--chars',
             dest='chars',
             action='append',
             type=lambda x: (

scripts/codemapd3.py

@@ -113,7 +113,7 @@ class Attr:
                     not isinstance(attr, tuple)
                         or attr[0] in {None, (), ('*',)}
                     for attr in (attrs or []))):
-            attrs = defaults + (attrs or [])
+            attrs = list(defaults) + (attrs or [])
 
         # normalize
         self.attrs = []

scripts/plot.py

@@ -381,7 +381,7 @@ class Attr:
                     not isinstance(attr, tuple)
                         or attr[0] in {None, (), ('*',)}
                     for attr in (attrs or []))):
-            attrs = defaults + (attrs or [])
+            attrs = list(defaults) + (attrs or [])
 
         # normalize
         self.attrs = []
@@ -1703,7 +1703,7 @@ if __name__ == "__main__":
                 "where a group is the comma-separated 'by' fields. Accepts %% "
                 "modifiers. Also provides an ordering.")
     parser.add_argument(
-            '-*', '--add-char', '--chars',
+            '-.', '--add-char', '--chars',
             dest='chars',
             action='append',
             type=lambda x: (
@@ -1756,11 +1756,11 @@ if __name__ == "__main__":
             help="Use 2x4 unicode braille characters. Note that braille "
                 "characters sometimes suffer from inconsistent widths.")
     parser.add_argument(
-            '-.', '--points',
+            '-p', '--points',
             action='store_true',
             help="Only draw data points.")
     parser.add_argument(
-            '-!', '--points-and-lines',
+            '-P', '--points-and-lines',
             action='store_true',
             help="Draw data points and lines.")
     parser.add_argument(

scripts/plotmpl.py

@@ -305,7 +305,7 @@ class Attr:
                     not isinstance(attr, tuple)
                         or attr[0] in {None, (), ('*',)}
                     for attr in (attrs or []))):
-            attrs = defaults + (attrs or [])
+            attrs = list(defaults) + (attrs or [])
 
         # normalize
         self.attrs = []
@@ -1341,11 +1341,11 @@ if __name__ == "__main__":
                 "specific group where a group is the comma-separated 'by' "
                 "fields. Accepts %% modifiers.")
     parser.add_argument(
-            '-.', '--points',
+            '-p', '--points',
             action='store_true',
             help="Only draw data points.")
     parser.add_argument(
-            '-!', '--points-and-lines',
+            '-P', '--points-and-lines',
             action='store_true',
             help="Draw data points and lines.")
     parser.add_argument(

scripts/treemap.py

@@ -164,7 +164,7 @@ class Attr:
                     not isinstance(attr, tuple)
                         or attr[0] in {None, (), ('*',)}
                     for attr in (attrs or []))):
-            attrs = defaults + (attrs or [])
+            attrs = list(defaults) + (attrs or [])
 
         # normalize
         self.attrs = []
@@ -1058,7 +1058,7 @@ if __name__ == "__main__":
                 "where a group is the comma-separated 'by' fields. Accepts %% "
                 "modifiers.")
     parser.add_argument(
-            '-*', '--add-char', '--chars',
+            '-.', '--add-char', '--chars',
             dest='chars',
             action='append',
             type=lambda x: (

scripts/treemapd3.py

@@ -181,7 +181,7 @@ class Attr:
                     not isinstance(attr, tuple)
                         or attr[0] in {None, (), ('*',)}
                     for attr in (attrs or []))):
-            attrs = defaults + (attrs or [])
+            attrs = list(defaults) + (attrs or [])
 
         # normalize
         self.attrs = []