Update for Python 3.12

Author: domdfcoding

formate/dynamic_quotes.py

@@ -46,6 +46,11 @@
 
 __all__ = ("dynamic_quotes", )
 
+if sys.version_info >= (3, 12):
+	StrOrConstant = ast.Constant
+else:
+	StrOrConstant = Union[ast.Str, ast.Constant]
+
 
 class QuoteRewriter(Rewriter):
 
@@ -83,7 +88,7 @@ def visit_FunctionDef(self, node: ast.FunctionDef) -> None:
 	def visit_AsyncFunctionDef(self, node: ast.AsyncFunctionDef) -> None:
 		self.visit_definition(node)
 
-	def rewrite_quotes_for_node(self, node: Union[ast.Str, ast.Constant]) -> None:
+	def rewrite_quotes_for_node(self, node: StrOrConstant) -> None:
 		"""
 		Mark the area for rewriting quotes in the given node.
 
@@ -101,20 +106,26 @@ def rewrite_quotes_for_node(self, node: Union[ast.Str, ast.Constant]) -> None:
 			# TODO: format docstring with triple quotes and correct indentation
 			return
 		else:
+
+			if sys.version_info >= (3, 12):  # pragma: no cover (<py312)
+				value = node.value
+			else:  # pragma: no cover (py312+)
+				value = node.s
+
 			if string in {'""', "''"}:
 				self.record_replacement(text_range, "''")
 			elif not re.match("^[\"']", string):
 				return
-			elif len(node.s) == 1:
-				self.record_replacement(text_range, repr(node.s))
+			elif len(value) == 1:
+				self.record_replacement(text_range, repr(value))
 			elif '\n' in string:
 				return
-			elif '\n' in node.s or "\\n" in node.s:
+			elif '\n' in value or "\\n" in value:
 				return
 			else:
 				self.record_replacement(
 						text_range,
-						double_repr_string(node.s).translate(_surrogate_translator),
+						double_repr_string(value).translate(_surrogate_translator),
 						)
 
 

formate/ellipses.py

@@ -72,16 +72,24 @@ def rewrite_ellipsis(
 		if not isinstance(node.body[0], ast.Expr):
 			return
 
-		if not isinstance(node.body[0].value, (ast.Constant, ast.Ellipsis)):
-			return
+		if sys.version_info >= (3, 12):  # pragma: no cover (<py312)
+			if not isinstance(node.body[0].value, ast.Constant):
+				return
+			if not node.body[0].value.value is Ellipsis:
+				return
 
-		if sys.version_info < (3, 8):  # pragma: no cover (py38+)
-			if not isinstance(node.body[0].value, ast.Ellipsis):
+		elif sys.version_info >= (3, 8):  # pragma: no cover (<py38)
+			if not isinstance(node.body[0].value, (ast.Constant, ast.Ellipsis)):
 				return
 
-		else:  # pragma: no cover (<py38)
 			if not node.body[0].value.value is Ellipsis:
 				return
+		else:  # pragma: no cover (py38+)
+			if not isinstance(node.body[0].value, (ast.Constant, ast.Ellipsis)):
+				return
+
+			if not isinstance(node.body[0].value, ast.Ellipsis):
+				return
 
 		body_text_range = self.tokens.get_text_range(node)
 		ellipsis_text_range = self.tokens.get_text_range(node.body[0])

formate/reformat_generics.py

@@ -233,11 +233,11 @@ def visit_ClassDef(self, node: ast.ClassDef) -> None:
 	def visit_AsyncFunctionDef(self, node: ast.AsyncFunctionDef) -> None:
 		return None
 
-	def visit_NameConstant(self, node: ast.NameConstant) -> None:
-		self.structure.append(node.value)
-
 	if sys.version_info[:2] < (3, 8):  # pragma: no cover (py38+)
 
+		def visit_NameConstant(self, node: ast.NameConstant) -> None:
+			self.structure.append(node.value)
+
 		def visit_Str(self, node: ast.Str) -> None:
 			self.structure.append(f'"{node.s}"')
 

tox.ini

@@ -232,6 +232,7 @@ filterwarnings =
     ignore:can't resolve package from __spec__ or __package__, falling back on __name__ and __path__:ImportWarning
     ignore:lib2to3 package is deprecated and may not be able to parse Python 3.10+:DeprecationWarning
     ignore:lib2to3 package is deprecated and may not be able to parse Python 3.10+:PendingDeprecationWarning
+    always:ast.Str is deprecated and will be removed in Python 3.14; use ast.Constant instead:DeprecationWarning
 
 [testenv:py312-dev-click{7,8.0,8.1}]
 setenv =