Merge branch 'master' into librt_base64_simd_cpu_dispatch

Author: mr-c

mypy-requirements.txt

@@ -4,4 +4,4 @@ typing_extensions>=4.6.0
 mypy_extensions>=1.0.0
 pathspec>=0.9.0
 tomli>=1.1.0; python_version<'3.11'
-librt>=0.6.0
+librt>=0.6.2

mypy/checker.py

@@ -3424,7 +3424,11 @@ def check_assignment(
                             and lvalue_type is not None
                         ):
                             lvalue.node.type = remove_instance_last_known_values(lvalue_type)
-                elif self.options.allow_redefinition_new and lvalue_type is not None:
+                elif (
+                    self.options.allow_redefinition_new
+                    and lvalue_type is not None
+                    and not isinstance(lvalue_type, PartialType)
+                ):
                     # TODO: Can we use put() here?
                     self.binder.assign_type(lvalue, lvalue_type, lvalue_type)
 

pyproject.toml

@@ -9,7 +9,7 @@ requires = [
     "mypy_extensions>=1.0.0",
     "pathspec>=0.9.0",
     "tomli>=1.1.0; python_version<'3.11'",
-    "librt>=0.6.0",
+    "librt>=0.6.2",
     # the following is from build-requirements.txt
     "types-psutil",
     "types-setuptools",
@@ -54,7 +54,7 @@ dependencies = [
   "mypy_extensions>=1.0.0",
   "pathspec>=0.9.0",
   "tomli>=1.1.0; python_version<'3.11'",
-  "librt>=0.6.0",
+  "librt>=0.6.2",
 ]
 dynamic = ["version"]
 

test-data/unit/check-redefine2.test

@@ -369,6 +369,16 @@ class C4:
         reveal_type(self.x) # N: Revealed type is "builtins.list[builtins.str]"
 
 reveal_type(C4().x) # N: Revealed type is "builtins.list[builtins.str]"
+
+class C5:
+    def __init__(self) -> None:
+        if int():
+            self.x = None
+            return
+        self.x = [""]
+        reveal_type(self.x) # N: Revealed type is "builtins.list[builtins.str]"
+
+reveal_type(C5().x) # N: Revealed type is "Union[builtins.list[builtins.str], None]"
 [builtins fixtures/list.pyi]
 
 [case testNewRedefinePartialGenericTypes]

test-requirements.txt

@@ -22,7 +22,7 @@ identify==2.6.15
     # via pre-commit
 iniconfig==2.1.0
     # via pytest
-librt==0.6.0
+librt==0.6.2
     # via -r mypy-requirements.txt
 lxml==6.0.2 ; python_version < "3.15"
     # via -r test-requirements.in