Skip to content

Commit 76ed536

Browse files
authored
Enable test_inheritance (#1414)
1 parent d3f8d64 commit 76ed536

3 files changed

Lines changed: 372 additions & 369 deletions

File tree

Src/IronPython/Runtime/Operations/InstanceOps.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,35 @@ namespace IronPython.Runtime.Operations {
2424
/// InstanceOps contains methods that get added to CLS types depending on what
2525
/// methods and constructors they define. These have not been added directly to
2626
/// PythonType since they need to be added conditionally.
27-
///
27+
///
2828
/// Possibilities include:
29-
///
29+
///
3030
/// __new__, one of 3 __new__ sets can be added:
3131
/// DefaultNew - This is the __new__ used for a PythonType (list, dict, object, etc...) that
32-
/// has only 1 default public constructor that takes no parameters. These types are
32+
/// has only 1 default public constructor that takes no parameters. These types are
3333
/// mutable types, and __new__ returns a new instance of the type, and __init__ can be used
3434
/// to re-initialize the types. This __new__ allows an unlimited number of arguments to
3535
/// be passed if a non-default __init__ is also defined.
3636
///
3737
/// NonDefaultNew - This is used when a type has more than one constructor, or only has one
3838
/// that takes more than zero parameters. This __new__ does not allow an arbitrary # of
3939
/// extra arguments.
40-
///
40+
///
4141
/// DefaultNewCls - This is the default new used for CLS types that have only a single ctor
42-
/// w/ an arbitray number of arguments. This constructor allows setting of properties
42+
/// w/ an arbitrary number of arguments. This constructor allows setting of properties
4343
/// based upon an extra set of kw-args, e.g.: System.Windows.Forms.Button(Text='abc'). It
4444
/// is only used on non-Python types.
45-
///
45+
///
4646
/// __init__:
4747
/// For types that do not define __init__ we have an __init__ function that takes an
4848
/// unlimited number of arguments and does nothing. All types share the same reference
4949
/// to 1 instance of this.
50-
///
50+
///
5151
/// next: Defined when a type is an enumerator to expose the Python iter protocol.
52-
///
53-
///
52+
///
53+
///
5454
/// repr: Added for types that override ToString
55-
///
55+
///
5656
/// get: added for types that implement IDescriptor
5757
/// </summary>
5858
public static class InstanceOps {
@@ -75,7 +75,7 @@ internal static BuiltinMethodDescriptor Init {
7575
return _Init;
7676
}
7777
}
78-
78+
7979

8080
internal static BuiltinFunction New {
8181
get {
@@ -129,7 +129,7 @@ public static object OverloadedNewBasic(CodeContext context, SiteLocalStorage<Ca
129129

130130
public static object OverloadedNewKW(CodeContext context, BuiltinFunction overloads\u00F8, PythonType type\u00F8, [ParamDictionary]IDictionary<object, object> kwargs\u00F8) {
131131
if (type\u00F8 == null) throw PythonOps.TypeError("__new__ expected type object, got {0}", PythonOps.Repr(context, DynamicHelpers.GetPythonType(type\u00F8)));
132-
132+
133133
return overloads\u00F8.Call(context, null, null, ArrayUtils.EmptyObjects, kwargs\u00F8);
134134
}
135135

@@ -213,7 +213,7 @@ public static object NextMethod(object self) {
213213
/// </summary>
214214
public static PythonList DynamicDir(CodeContext/*!*/ context, IDynamicMetaObjectProvider self) {
215215
PythonList res = new PythonList(self.GetMetaObject(Expression.Parameter(typeof(object))).GetDynamicMemberNames());
216-
216+
217217
// add in the non-dynamic members from the dynamic objects base class.
218218
Type t = self.GetType();
219219
while (typeof(IDynamicMetaObjectProvider).IsAssignableFrom(t)) {
@@ -553,7 +553,7 @@ public static bool ComparableLessEqual<T>(T x, [NotNull]T y)
553553
where T : IComparable {
554554
return x.CompareTo(y) <= 0;
555555
}
556-
556+
557557
[return: MaybeNotImplemented]
558558
public static object ComparableEquality<T>([NotNull]T x, object y)
559559
where T : IComparable {
@@ -653,7 +653,7 @@ public static object ComparableLessEqual<T>(object y, [NotNull]T x)
653653
// operator direction is reversed
654654
return ScriptingRuntimeHelpers.BooleanToObject(x.CompareTo(y) >= 0);
655655
}
656-
656+
657657
#endregion
658658

659659
/// <summary>
@@ -672,7 +672,7 @@ public static void ExitMethod(IDisposable/*!*/ self, object exc_type, object exc
672672

673673
[PropertyMethod, StaticExtensionMethod]
674674
public static PythonList/*!*/ Get__all__<T>(CodeContext/*!*/ context) {
675-
Debug.Assert(typeof(T).IsSealed && typeof(T).IsAbstract, "__all__ should only be produced for static members");
675+
Debug.Assert(typeof(T).IsSealed && typeof(T).IsAbstract, "__all__ should only be produced for static members");
676676

677677
PythonType pt = DynamicHelpers.GetPythonTypeFromType(typeof(T));
678678

@@ -801,7 +801,7 @@ out deserializeNew
801801
Debug.Assert(res);
802802

803803
return PythonTuple.MakeTuple(
804-
deserializeNew, // function to call, clr.DeserializeNew
804+
deserializeNew, // function to call, clr.DeserializeNew
805805
data, // data to pass to it - our type & the raw data from the .NET serializer
806806
null // state, unused
807807
);

Src/IronPythonTest/Cases/IronPythonCasesManifest.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ NotParallelSafe=true # Creates/deletes temporary modules and directories with fi
4242
[IronPython.test_importpkg]
4343
Ignore=true
4444

45-
[IronPython.test_inheritance]
46-
Ignore=true
47-
4845
[IronPython.test_interactive]
4946
Ignore=true
5047
Reason=Requires powershell

0 commit comments

Comments
 (0)