Remove --preview from some tests

psf · JelleZijlstra · Jan 26, 2024 · Nov 21, 2023 · Nov 21, 2023 · Nov 21, 2023
commit 47449ff135a2f28c131f38b017a19689e18c3b7e
diff --git a/...a/cases/preview_allow_empty_first_line.py → tests/data/cases/allow_empty_first_line.py b/...a/cases/preview_allow_empty_first_line.py → tests/data/cases/allow_empty_first_line.py
@@ -1,4 +1,3 @@
-# flags: --preview
 def foo():
     """
     Docstring

diff --git a/tests/data/cases/preview_async_stmts.py → tests/data/cases/async_stmts.py b/tests/data/cases/preview_async_stmts.py → tests/data/cases/async_stmts.py
@@ -1,4 +1,3 @@
-# flags: --preview
 async def func() -> (int):
     return 0
 

diff --git a/tests/data/cases/conditional_expression.py b/tests/data/cases/conditional_expression.py
@@ -1,4 +1,3 @@
-# flags: --preview
 long_kwargs_single_line = my_function(
     foo="test, this is a sample value",
     bar=some_long_value_name_foo_bar_baz if some_boolean_variable else some_fallback_value_foo_bar_baz,
@@ -197,7 +196,9 @@ def foo(wait: bool = True):
     time.sleep(1) if wait else None
 
 
-a = "".join((
-    "",  # comment
-    "" if True else "",
-))
+a = "".join(
+    (
+        "",  # comment
+        "" if True else "",
+    )
+)
diff --git a/...data/cases/preview_context_managers_38.py → tests/data/cases/context_managers_38.py b/...data/cases/preview_context_managers_38.py → tests/data/cases/context_managers_38.py
@@ -1,4 +1,4 @@
-# flags: --preview --minimum-version=3.8
+# flags: --minimum-version=3.8
 with \
      make_context_manager1() as cm1, \
      make_context_manager2() as cm2, \

diff --git a/...data/cases/preview_context_managers_39.py → tests/data/cases/context_managers_39.py b/...data/cases/preview_context_managers_39.py → tests/data/cases/context_managers_39.py
@@ -1,4 +1,4 @@
-# flags: --preview --minimum-version=3.9
+# flags: --minimum-version=3.9
 with \
      make_context_manager1() as cm1, \
      make_context_manager2() as cm2, \

diff --git a/...review_context_managers_autodetect_310.py → .../cases/context_managers_autodetect_310.py b/...review_context_managers_autodetect_310.py → .../cases/context_managers_autodetect_310.py
@@ -1,4 +1,4 @@
-# flags: --preview --minimum-version=3.10
+# flags: --minimum-version=3.10
 # This file uses pattern matching introduced in Python 3.10.
 
 

diff --git a/...review_context_managers_autodetect_311.py → .../cases/context_managers_autodetect_311.py b/...review_context_managers_autodetect_311.py → .../cases/context_managers_autodetect_311.py
@@ -1,4 +1,4 @@
-# flags: --preview --minimum-version=3.11
+# flags: --minimum-version=3.11
 # This file uses except* clause in Python 3.11.
 
 

diff --git a/...preview_context_managers_autodetect_38.py → ...a/cases/context_managers_autodetect_38.py b/...preview_context_managers_autodetect_38.py → ...a/cases/context_managers_autodetect_38.py
@@ -1,4 +1,3 @@
-# flags: --preview
 # This file doesn't use any Python 3.9+ only grammars.
 
 

diff --git a/...preview_context_managers_autodetect_39.py → ...a/cases/context_managers_autodetect_39.py b/...preview_context_managers_autodetect_39.py → ...a/cases/context_managers_autodetect_39.py
@@ -1,4 +1,4 @@
-# flags: --preview --minimum-version=3.9
+# flags: --minimum-version=3.9
 # This file uses parenthesized context managers introduced in Python 3.9.
 
 

diff --git a/...ta/cases/preview_dummy_implementations.py → tests/data/cases/dummy_implementations.py b/...ta/cases/preview_dummy_implementations.py → tests/data/cases/dummy_implementations.py
@@ -1,4 +1,3 @@
-# flags: --preview
 from typing import NoReturn, Protocol, Union, overload
 
 class Empty:

diff --git a/tests/data/cases/preview_form_feeds.py → tests/data/cases/form_feeds.py b/tests/data/cases/preview_form_feeds.py → tests/data/cases/form_feeds.py
@@ -1,4 +1,3 @@
-# flags: --preview
 
 
 # Warning! This file contains form feeds (ASCII 0x0C, often represented by \f or ^L).

diff --git a/tests/data/cases/module_docstring_1.py b/tests/data/cases/module_docstring_1.py
@@ -1,4 +1,3 @@
-# flags: --preview
 """Single line module-level docstring should be followed by single newline."""
 
 

diff --git a/tests/data/cases/module_docstring_2.py b/tests/data/cases/module_docstring_2.py
@@ -1,7 +1,7 @@
 # flags: --preview
 """I am a very helpful module docstring.
 
-With trailing spaces:      
+With trailing spaces (only removed with unify_docstring_detection on):      
 Lorem ipsum dolor sit amet, consectetur adipiscing elit,
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 Ut enim ad minim veniam,
@@ -39,7 +39,7 @@
 # output
 """I am a very helpful module docstring.
 
-With trailing spaces:
+With trailing spaces (only removed with unify_docstring_detection on):
 Lorem ipsum dolor sit amet, consectetur adipiscing elit,
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 Ut enim ad minim veniam,

diff --git a/tests/data/cases/module_docstring_3.py b/tests/data/cases/module_docstring_3.py
@@ -1,4 +1,3 @@
-# flags: --preview
 """Single line module-level docstring should be followed by single newline."""
 a = 1
 

diff --git a/tests/data/cases/module_docstring_4.py b/tests/data/cases/module_docstring_4.py
@@ -1,4 +1,3 @@
-# flags: --preview
 """Single line module-level docstring should be followed by single newline."""
 
 a = 1

diff --git a/tests/data/cases/module_docstring_followed_by_class.py b/tests/data/cases/module_docstring_followed_by_class.py
@@ -1,4 +1,3 @@
-# flags: --preview
 """Two blank lines between module docstring and a class."""
 class MyClass:
     pass

diff --git a/tests/data/cases/module_docstring_followed_by_function.py b/tests/data/cases/module_docstring_followed_by_function.py
@@ -1,4 +1,3 @@
-# flags: --preview
 """Two blank lines between module docstring and a function def."""
 def function():
     pass

diff --git a/tests/data/cases/nested_stub.py b/tests/data/cases/nested_stub.py
@@ -1,4 +1,4 @@
-# flags: --pyi --preview
+# flags: --pyi
 import sys
 
 class Outer:

diff --git a/...ta/cases/preview_pattern_matching_long.py → tests/data/cases/pattern_matching_long.py b/...ta/cases/preview_pattern_matching_long.py → tests/data/cases/pattern_matching_long.py
@@ -1,4 +1,4 @@
-# flags: --preview --minimum-version=3.10
+# flags: --minimum-version=3.10
 match x:
     case "abcd" | "abcd" | "abcd" :
         pass

diff --git a/...review_pattern_matching_trailing_comma.py → .../cases/pattern_matching_trailing_comma.py b/...review_pattern_matching_trailing_comma.py → .../cases/pattern_matching_trailing_comma.py
@@ -1,4 +1,4 @@
-# flags: --preview --minimum-version=3.10
+# flags: --minimum-version=3.10
 match maybe, multiple:
     case perhaps, 5:
         pass

diff --git a/tests/data/cases/pep604_union_types_line_breaks.py b/tests/data/cases/pep604_union_types_line_breaks.py
@@ -1,4 +1,4 @@
-# flags: --preview --minimum-version=3.10
+# flags: --minimum-version=3.10
 # This has always worked
 z= Loooooooooooooooooooooooong | Loooooooooooooooooooooooong | Loooooooooooooooooooooooong | Loooooooooooooooooooooooong
 

diff --git a/tests/data/cases/preview_pep_572.py → tests/data/cases/pep_572_slices.py b/tests/data/cases/preview_pep_572.py → tests/data/cases/pep_572_slices.py
@@ -1,4 +1,3 @@
-# flags: --preview
 x[(a:=0):]
 x[:(a:=0)]
 

diff --git a/.../data/cases/preview_percent_precedence.py → tests/data/cases/percent_precedence.py b/.../data/cases/preview_percent_precedence.py → tests/data/cases/percent_precedence.py
@@ -1,4 +1,3 @@
-# flags: --preview
 ("" % a) ** 2
 ("" % a)[0]
 ("" % a)()
@@ -31,9 +30,9 @@
 2 // ("" % a)
 2 % ("" % a)
 +("" % a)
-b + "" % a
+b + ("" % a)
 -("" % a)
-b - "" % a
+b - ("" % a)
 b + -("" % a)
 ~("" % a)
 2 ** ("" % a)

diff --git a/tests/data/cases/preview_power_op_spacing.py → tests/data/cases/power_op_spacing_long.py b/tests/data/cases/preview_power_op_spacing.py → tests/data/cases/power_op_spacing_long.py
@@ -1,4 +1,3 @@
-# flags: --preview
 a = 1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1
 b = 1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1**1
 c = 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1 ** 1

diff --git a/tests/data/cases/preview_prefer_rhs_split.py → tests/data/cases/prefer_rhs_split.py b/tests/data/cases/preview_prefer_rhs_split.py → tests/data/cases/prefer_rhs_split.py
@@ -1,4 +1,3 @@
-# flags: --preview
 first_item, second_item = (
     some_looooooooong_module.some_looooooooooooooong_function_name(
         first_argument, second_argument, third_argument

diff --git a/tests/data/cases/py310_pep572.py b/tests/data/cases/py310_pep572.py
@@ -1,4 +1,4 @@
-# flags: --preview --minimum-version=3.10
+# flags: --minimum-version=3.10
 x[a:=0]
 x[a := 0]
 x[a := 0, b := 1]

diff --git a/tests/data/cases/raw_docstring.py b/tests/data/cases/raw_docstring.py
@@ -1,4 +1,4 @@
-# flags: --preview --skip-string-normalization
+# flags: --skip-string-normalization
 class C:
 
     r"""Raw"""

diff --git a/...view_docstring_no_string_normalization.py → .../raw_docstring_no_string_normalization.py b/...view_docstring_no_string_normalization.py → .../raw_docstring_no_string_normalization.py
@@ -1,4 +1,4 @@
-# flags: --preview --skip-string-normalization
+# flags: --skip-string-normalization
 def do_not_touch_this_prefix():
     R"""There was a bug where docstring prefixes would be normalized even with -S."""
 

diff --git a/...ine_format_skip_with_multiple_comments.py → ...ine_format_skip_with_multiple_comments.py b/...ine_format_skip_with_multiple_comments.py → ...ine_format_skip_with_multiple_comments.py
@@ -1,4 +1,3 @@
-# flags: --preview
 foo =  123  # fmt: skip # noqa: E501 # pylint
 bar =    (
     123   ,

diff --git a/tests/data/cases/preview_trailing_comma.py → tests/data/cases/trailing_comma.py b/tests/data/cases/preview_trailing_comma.py → tests/data/cases/trailing_comma.py
@@ -1,4 +1,3 @@
-# flags: --preview
 e = {
     "a": fun(msg, "ts"),
     "longggggggggggggggid": ...,

diff --git a/tests/data/cases/walrus_in_dict.py b/tests/data/cases/walrus_in_dict.py
@@ -1,7 +1,9 @@
 # flags: --preview
+# This is testing an issue that is specific to the preview style
 {
     "is_update": (up := commit.hash in update_hashes)
 }
 
 # output
+# This is testing an issue that is specific to the preview style
 {"is_update": (up := commit.hash in update_hashes)}