[Python] Rename mapping separator scopes

Applies #3228

Python/Python.sublime-syntax

@@ -601,12 +601,12 @@ contexts:
       scope: punctuation.section.mapping.end.python
       pop: true
     - match: ','
-      scope: punctuation.separator.mapping.pair.python
+      scope: punctuation.separator.sequence.python
     - match: \*\*
       scope: keyword.operator.unpacking.mapping.python
       push: case-pattern-dictionary-patterns
     - match: ':'
-      scope: meta.mapping.python punctuation.separator.mapping.key-value.python
+      scope: meta.mapping.python punctuation.separator.key-value.python
       push:
         - case-pattern-dictionary-value
         - allow-unpack-operators
@@ -1528,7 +1528,7 @@ contexts:
       set: after-expression
     - include: illegal-assignment-expression
     - match: ':'
-      scope: punctuation.separator.mapping.key-value.python
+      scope: punctuation.separator.key-value.python
       set: inside-directory-value
     - match: ','
       scope: invalid.illegal.expected-colon.python

Python/syntax_test_python.py

@@ -652,7 +652,7 @@ def _():
 
 {foo.: bar.baz.}.
 #   ^ punctuation.accessor.dot.python
-#    ^ punctuation.separator.mapping.key-value.python
+#    ^ punctuation.separator.key-value.python
 #         ^ punctuation.accessor.dot.python
 #             ^ punctuation.accessor.dot.python
 #               ^ punctuation.accessor.dot.python
@@ -1116,13 +1116,13 @@ def _():
 #   ^^^^ keyword.control.conditional.case.python
 #        ^ punctuation.section.mapping.begin.python
 #         ^^^^^ meta.qualified-name.python meta.generic-name.python
-#              ^ punctuation.separator.mapping.key-value.python
+#              ^ punctuation.separator.key-value.python
 #                ^^^^^^^ string.quoted.single.python
-#                       ^ punctuation.separator.mapping.pair.python
+#                       ^ punctuation.separator.sequence.python
 #                         ^^^^^^^ meta.qualified-name.python
-#                                ^ punctuation.separator.mapping.key-value.python
+#                                ^ punctuation.separator.key-value.python
 #                                  ^^^ constant.numeric.value.python
-#                                     ^ punctuation.separator.mapping.pair.python
+#                                     ^ punctuation.separator.sequence.python
 #                                       ^^ keyword.operator.unpacking.mapping.python
 #                                         ^^^^^^^ meta.generic-name.python
 #                                                ^ punctuation.section.mapping.end.python
@@ -1804,11 +1804,11 @@ def __call__(self, *args, **kwds):
 #        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping - meta.mapping meta.mapping
 #        ^ punctuation.section.mapping.begin
 #         ^^^^^ meta.mapping.key.python string.quoted.double
-#              ^ punctuation.separator.mapping.key-value
+#              ^ punctuation.separator.key-value
 #                ^^^^ meta.mapping.value.python constant.language
-#                    ^ punctuation.separator.mapping
+#                    ^ punctuation.separator.mapping.python
 #                      ^^^^ meta.mapping.key.python meta.qualified-name
-#                          ^ punctuation.separator.mapping
+#                          ^ punctuation.separator.key-value.python
 #                            ^^^^^^^^^^^^^^^^ meta.sequence.tuple
 #                            ^ punctuation.section.sequence.begin
 #                             ^ constant.numeric
@@ -1822,7 +1822,7 @@ def __call__(self, *args, **kwds):
 
 mydict = { 'a' : xform, 'b' : form, 'c' : frm }
 #                                 ^ meta.mapping.python punctuation.separator.mapping.python
-#                                       ^ punctuation.separator.mapping.key-value.python
+#                                       ^ punctuation.separator.key-value.python
 
 mydict = { a : b async for b in range(1, 2) }
 #                ^^^^^ storage.modifier.async.python
@@ -1846,7 +1846,7 @@ def __call__(self, *args, **kwds):
 #                ^ meta.mapping.python punctuation.section.mapping.begin.python
     1: True
 #   ^ meta.mapping.key.python meta.number.integer.decimal.python constant.numeric.value.python
-#    ^ punctuation.separator.mapping.key-value.python
+#    ^ punctuation.separator.key-value.python
 }
 # <- meta.mapping.python punctuation.section.mapping.end.python
 
@@ -1856,7 +1856,7 @@ def __call__(self, *args, **kwds):
 more_complex_mapping = {**{1: 1}, 2: 2}
 #                      ^ meta.mapping.python
 #                               ^ meta.mapping.python punctuation.separator.mapping.python
-#                                  ^ meta.mapping.python punctuation.separator.mapping.key-value.python
+#                                  ^ meta.mapping.python punctuation.separator.key-value.python
 
 more_complex_set = {
 #                  ^ meta.set.python