nejch
diff --git a/‎packages/pyright-internal/src/analyzer/constraintSolver.ts
Lines changed: 2 additions & 2 deletions b/‎packages/pyright-internal/src/analyzer/constraintSolver.ts
Lines changed: 2 additions & 2 deletions
diff --git a/‎packages/pyright-internal/src/analyzer/typeUtils.ts
Lines changed: 2 additions & 2 deletions b/‎packages/pyright-internal/src/analyzer/typeUtils.ts
Lines changed: 2 additions & 2 deletions
diff --git a/‎packages/pyright-internal/src/analyzer/types.ts
Lines changed: 4 additions & 2 deletions b/‎packages/pyright-internal/src/analyzer/types.ts
Lines changed: 4 additions & 2 deletions
@@ -201,7 +201,7 @@ export function assignTypeToTypeVar(
                 // If the source and dest are both instantiables (type[T]), then
                 // we need to convert to an instance (T) for the
                 if (TypeBase.isInstantiable(srcType)) {
-                    constrainedType = convertToInstance(srcType);
+                    constrainedType = convertToInstance(srcType, /* includeSubclasses */ false);
                 }
             }
         } else {
@@ -383,7 +383,7 @@ export function assignTypeToTypeVar(
 
     if (TypeBase.isInstantiable(destType)) {
         if (isEffectivelyInstantiable(adjSrcType)) {
-            adjSrcType = convertToInstance(adjSrcType);
+            adjSrcType = convertToInstance(adjSrcType, /* includeSubclasses */ false);
         } else {
             diag?.addMessage(
                 Localizer.DiagnosticAddendum.typeAssignmentMismatch().format({
 
@@ -1668,7 +1668,7 @@ export function isEffectivelyInstantiable(type: Type): boolean {
     return false;
 }
 
-export function convertToInstance(type: Type): Type {
+export function convertToInstance(type: Type, includeSubclasses = true): Type {
     let result = mapSubtypes(type, (subtype) => {
         switch (subtype.category) {
             case TypeCategory.Class: {
@@ -1681,7 +1681,7 @@ export function convertToInstance(type: Type): Type {
                     }
                 }
 
-                return ClassType.cloneAsInstance(subtype);
+                return ClassType.cloneAsInstance(subtype, includeSubclasses);
             }
 
             case TypeCategory.None: {
 
@@ -603,14 +603,16 @@ export namespace ClassType {
         return newClass;
     }
 
-    export function cloneAsInstance(type: ClassType): ClassType {
+    export function cloneAsInstance(type: ClassType, includeSubclasses = true): ClassType {
         if (TypeBase.isInstance(type)) {
             return type;
         }
 
         const newInstance = TypeBase.cloneTypeAsInstance(type);
         newInstance.flags &= ~TypeFlags.SpecialForm;
-        newInstance.includeSubclasses = true;
+        if (includeSubclasses) {
+            newInstance.includeSubclasses = true;
+        }
         return newInstance;
     }
Original file line number	Diff line number	Diff line change
`@@ -1668,7 +1668,7 @@ export function isEffectivelyInstantiable(type: Type): boolean {`
`1668`	`1668`	`return false;`
`1669`	`1669`	`}`
`1670`	`1670`
`1671`		`-export function convertToInstance(type: Type): Type {`
	`1671`	`+export function convertToInstance(type: Type, includeSubclasses = true): Type {`
`1672`	`1672`	`let result = mapSubtypes(type, (subtype) => {`
`1673`	`1673`	`switch (subtype.category) {`
`1674`	`1674`	`case TypeCategory.Class: {`
`@@ -1681,7 +1681,7 @@ export function convertToInstance(type: Type): Type {`
`1681`	`1681`	`}`
`1682`	`1682`	`}`
`1683`	`1683`
`1684`		`- return ClassType.cloneAsInstance(subtype);`
	`1684`	`+ return ClassType.cloneAsInstance(subtype, includeSubclasses);`
`1685`	`1685`	`}`
`1686`	`1686`
`1687`	`1687`	`case TypeCategory.None: {`
Original file line number	Diff line number	Diff line change
`@@ -603,14 +603,16 @@ export namespace ClassType {`
`603`	`603`	`return newClass;`
`604`	`604`	`}`
`605`	`605`
`606`		`- export function cloneAsInstance(type: ClassType): ClassType {`
	`606`	`+ export function cloneAsInstance(type: ClassType, includeSubclasses = true): ClassType {`
`607`	`607`	`if (TypeBase.isInstance(type)) {`
`608`	`608`	`return type;`
`609`	`609`	`}`
`610`	`610`
`611`	`611`	`const newInstance = TypeBase.cloneTypeAsInstance(type);`
`612`	`612`	`newInstance.flags &= ~TypeFlags.SpecialForm;`
`613`		`- newInstance.includeSubclasses = true;`
	`613`	`+ if (includeSubclasses) {`
	`614`	`+ newInstance.includeSubclasses = true;`
	`615`	`+ }`
`614`	`616`	`return newInstance;`
`615`	`617`	`}`
`616`	`618`