Fix determination of f-string expression spans (#2654)

[etc/vim.git] / src / black / mode.py

diff --git a/src/black/mode.py b/src/black/mode.py
index 01ee336366c8e113d3e5cb0d2eb397c6db0c2760..e2417531240b7c38ae0a61d782a84f9cdf9ee7fd 100644 (file)
--- a/src/black/mode.py
+++ b/src/black/mode.py
@@ -6,6 +6,7 @@ chosen by the user.
 
 from dataclasses import dataclass, field
 from enum import Enum
 
 from dataclasses import dataclass, field
 from enum import Enum

+from operator import attrgetter

 from typing import Dict, Set
 
 from black.const import DEFAULT_LINE_LENGTH
 from typing import Dict, Set
 
 from black.const import DEFAULT_LINE_LENGTH


@@ -20,6 +21,7 @@ class TargetVersion(Enum):
     PY37 = 7
     PY38 = 8
     PY39 = 9
     PY37 = 7
     PY38 = 8
     PY39 = 9

+    PY310 = 10

 
     def is_python2(self) -> bool:
         return self is TargetVersion.PY27
 
     def is_python2(self) -> bool:
         return self is TargetVersion.PY27


@@ -39,6 +41,7 @@ class Feature(Enum):
     ASSIGNMENT_EXPRESSIONS = 8
     POS_ONLY_ARGUMENTS = 9
     RELAXED_DECORATORS = 10
     ASSIGNMENT_EXPRESSIONS = 8
     POS_ONLY_ARGUMENTS = 9
     RELAXED_DECORATORS = 10

+    PATTERN_MATCHING = 11

     FORCE_OPTIONAL_PARENTHESES = 50
 
     # temporary for Python 2 deprecation
     FORCE_OPTIONAL_PARENTHESES = 50
 
     # temporary for Python 2 deprecation


@@ -108,6 +111,18 @@ VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
         Feature.RELAXED_DECORATORS,
         Feature.POS_ONLY_ARGUMENTS,
     },
         Feature.RELAXED_DECORATORS,
         Feature.POS_ONLY_ARGUMENTS,
     },

+    TargetVersion.PY310: {
+        Feature.UNICODE_LITERALS,
+        Feature.F_STRINGS,
+        Feature.NUMERIC_UNDERSCORES,
+        Feature.TRAILING_COMMA_IN_CALL,
+        Feature.TRAILING_COMMA_IN_DEF,
+        Feature.ASYNC_KEYWORDS,
+        Feature.ASSIGNMENT_EXPRESSIONS,
+        Feature.RELAXED_DECORATORS,
+        Feature.POS_ONLY_ARGUMENTS,
+        Feature.PATTERN_MATCHING,
+    },

 }
 
 
 }
 
 


@@ -129,7 +144,7 @@ class Mode:
         if self.target_versions:
             version_str = ",".join(
                 str(version.value)
         if self.target_versions:
             version_str = ",".join(
                 str(version.value)

-                for version in sorted(self.target_versions, key=lambda v: v.value)
+                for version in sorted(self.target_versions, key=attrgetter("value"))

             )
         else:
             version_str = "-"
             )
         else:
             version_str = "-"