merged

Author: TheAnyKey

parser/src/fstring.rs

@@ -384,7 +384,6 @@ mod tests {
     #[test]
     fn test_parse_invalid_fstring() {
         assert_eq!(parse_fstring("{5!a"), Err(ExpectedRbrace));
-
         assert_eq!(parse_fstring("{5!a1}"), Err(ExpectedRbrace));
         assert_eq!(parse_fstring("{5!"), Err(ExpectedRbrace));
         assert_eq!(parse_fstring("abc{!a 'cat'}"), Err(EmptyExpression));

tests/snippets/fstrings.py

@@ -4,8 +4,7 @@
 import sys
 import platform
 if platform.python_implementation() == 'CPython':
-    assert sys.version_info.major == 3, 'Incompatible Python Version, expected CPython 3.8 or later'
-    assert sys.version_info.minor == 8, 'Incompatible Python Version, expected CPython 3.8 or later'
+    assert sys.version_info >= (3, 8), 'Incompatible Python Version, expected CPython 3.8 or later'
 elif platform.python_implementation == 'RustPython':
     # ok
     pass
@@ -169,4 +168,4 @@ def assertEqual(self, a,b):
 
 # self.assertEqual(f'X{x  =}Y', 'Xx  ='+x+'Y')
 # self.assertEqual(f'X{x=  }Y', 'Xx=  '+x+'Y')
-# self.assertEqual(f'X{x  =  }Y', 'Xx  =  '+x+'Y')
+# self.assertEqual(f'X{x  =  }Y', 'Xx  =  '+x+'Y')