Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upPrevent unions with itself #1997
Merged
Conversation
This reverts commit 6109ac7.
| @@ -28,15 +28,19 @@ internal sealed class PythonUnionType : LocatedMember, IPythonUnionType { | |||
|
|
|||
| public PythonUnionType(IEnumerable<IPythonType> types, IPythonModule declaringModule) | |||
| : base(declaringModule.Interpreter.ModuleResolution.GetSpecializedModule("typing")) { | |||
| _types.UnionWith(types); | |||
| _types.UnionWith(types.Where(t => !this.Equals(t))); | |||
jakebailey
Apr 17, 2020
Member
Do either of the constructors end up mattering? Or is it just Add that was the problem? I'm not sure how you could end up ever having an object "equal" to the current one if you're in the constructor for this, but I could be wrong.
MikhailArkhipov
Apr 17, 2020
Author
Member
It basically gets confused on
def get_if_str(self, obj: Union[str, Factory]):
"""
Returns object from the registry if ``obj`` type is string.
"""
if type(obj) is str:
return self.get(obj)
return objwhen calculating return value. Another option is to introduce deep compare to Union so !currentType.Equals(valueType) would trigger. But it would be narrower fix as there may be other calls to Add ending up with circular unions.
if (!_fromAnnotation && !currentType.Equals(valueType)) {
var type = PythonUnionType.Combine(currentType, valueType);
// Track instance vs type info.
StaticReturnValue = value is IPythonInstance ? type.CreateInstance(ArgumentSet.WithoutContext) : (IMember)type;
}
MikhailArkhipov
merged commit 52a2397
into
microsoft:master
1 check passed
1 check passed
MikhailArkhipov
added a commit
that referenced
this pull request
Jun 15, 2020
* Remove stale reference * Don't suppress LHS diagnostics on augmented assign * Revert "Don't suppress LHS diagnostics on augmented assign" This reverts commit 6109ac7. * Escape [ and ] * PR feedback * Prevent unions with itself * Add special Union comparison + test (cherry picked from commit 52a2397)
MikhailArkhipov
added a commit
that referenced
this pull request
Jun 15, 2020
* Remove stale reference * Don't suppress LHS diagnostics on augmented assign * Revert "Don't suppress LHS diagnostics on augmented assign" This reverts commit 6109ac7. * Escape [ and ] * PR feedback * Prevent unions with itself * Add special Union comparison + test (cherry picked from commit 52a2397)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Fixes #1985