- Notifications
You must be signed in to change notification settings - Fork750
Provide hook to implement __repr__#808
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
17 commits Select commitHold shift + click to select a range
351d9ff Provide hook to implement __repr__
koubaad71a391 Merge branch 'master' into repr
filmor2a002d7 fix casing
koubaacf1f1dc Merge branch 'master' into repr
filmor1c0984f Merge branch 'master' into repr
koubaaa5b245b Merge branch 'master' into repr
filmor82aea1f Merge branch 'master' into repr
filmor502f0c3 Merge branch 'master' into repr
filmoreb4004a Merge branch 'master' into repr
filmorc6ae6a4 Merge branch 'master' into repr
filmor0916406 update based on review
koubaa2fb6a43 fix whitespace
koubaa9fc5b5f fix whitespace
koubaa00b55db fix
koubaaaccc797 Don't use repr in __str__. Clean up unneeded tests
koubaaff5d96c fix leak
koubaa264c78b Merge branch 'master' into repr
koubaaFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
1 change: 1 addition & 0 deletionsAUTHORS.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletionsCHANGELOG.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletionssrc/runtime/classbase.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -246,6 +246,44 @@ public static IntPtr tp_str(IntPtr ob) | ||
| } | ||
| } | ||
| public static IntPtr tp_repr(IntPtr ob) | ||
| { | ||
| var co = GetManagedObject(ob) as CLRObject; | ||
| if (co == null) | ||
| { | ||
| return Exceptions.RaiseTypeError("invalid object"); | ||
| } | ||
| try | ||
| { | ||
| //if __repr__ is defined, use it | ||
| var instType = co.inst.GetType(); | ||
| System.Reflection.MethodInfo methodInfo = instType.GetMethod("__repr__"); | ||
| if (methodInfo != null && methodInfo.IsPublic) | ||
| { | ||
| var reprString = methodInfo.Invoke(co.inst, null) as string; | ||
koubaa marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| return Runtime.PyString_FromString(reprString); | ||
| } | ||
| //otherwise use the standard object.__repr__(inst) | ||
| IntPtr args = Runtime.PyTuple_New(1); | ||
| Runtime.PyTuple_SetItem(args, 0, ob); | ||
| IntPtr reprFunc = Runtime.PyObject_GetAttrString(Runtime.PyBaseObjectType, "__repr__"); | ||
| var output = Runtime.PyObject_Call(reprFunc, args, IntPtr.Zero); | ||
| Runtime.XDecref(args); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Decreasing args reference count actually decreases ob reference count, which marks it as garbage for the GC! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Thanks a lot for catching this. Would you prepare a small PR? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Done | ||
| Runtime.XDecref(reprFunc); | ||
| return output; | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| if (e.InnerException != null) | ||
| { | ||
| e = e.InnerException; | ||
| } | ||
| Exceptions.SetError(e); | ||
| return IntPtr.Zero; | ||
| } | ||
| } | ||
| /// <summary> | ||
| /// Standard dealloc implementation for instances of reflected types. | ||
23 changes: 23 additions & 0 deletionssrc/runtime/exceptions.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletionsrc/testing/Python.Test.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletionssrc/testing/ReprTest.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| using System; | ||
| using System.Text; | ||
| namespace Python.Test | ||
| { | ||
| /// <summary> | ||
| /// Supports repr unit tests. | ||
| /// </summary> | ||
| public class ReprTest | ||
| { | ||
| public class Point | ||
| { | ||
| public Point(double x, double y) | ||
| { | ||
| X = x; | ||
| Y = y; | ||
| } | ||
| public double X { get; set; } | ||
| public double Y { get; set; } | ||
| public override string ToString() | ||
| { | ||
| return base.ToString() + ": X=" + X.ToString() + ", Y=" + Y.ToString(); | ||
| } | ||
| public string __repr__() | ||
| { | ||
| return "Point(" + X.ToString() + "," + Y.ToString() + ")"; | ||
| } | ||
| } | ||
| public class Foo | ||
| { | ||
| public string __repr__() | ||
| { | ||
| return "I implement __repr__() but not ToString()!"; | ||
| } | ||
| } | ||
| public class Bar | ||
| { | ||
| public override string ToString() | ||
| { | ||
| return "I implement ToString() but not __repr__()!"; | ||
| } | ||
| } | ||
| public class BazBase | ||
| { | ||
| public override string ToString() | ||
| { | ||
| return "Base class implementing ToString()!"; | ||
| } | ||
| } | ||
| public class BazMiddle : BazBase | ||
| { | ||
| public override string ToString() | ||
| { | ||
| return "Middle class implementing ToString()!"; | ||
| } | ||
| } | ||
| //implements ToString via BazMiddle | ||
| public class Baz : BazMiddle | ||
| { | ||
| } | ||
| public class Quux | ||
| { | ||
| public string ToString(string format) | ||
| { | ||
| return "I implement ToString() with an argument!"; | ||
| } | ||
| } | ||
| public class QuuzBase | ||
| { | ||
| protected string __repr__() | ||
| { | ||
| return "I implement __repr__ but it isn't public!"; | ||
| } | ||
| } | ||
| public class Quuz : QuuzBase | ||
| { | ||
| } | ||
| public class Corge | ||
| { | ||
| public string __repr__(int i) | ||
| { | ||
| return "__repr__ implemention with input parameter!"; | ||
| } | ||
| } | ||
| public class Grault | ||
| { | ||
| public int __repr__() | ||
| { | ||
| return "__repr__ implemention with wrong return type!".Length; | ||
| } | ||
| } | ||
| } | ||
| } |
7 changes: 2 additions & 5 deletionssrc/tests/test_exceptions.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletionssrc/tests/test_repr.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| # -*- coding: utf-8 -*- | ||
| """Test __repr__ output""" | ||
| import System | ||
| import pytest | ||
| from Python.Test import ReprTest | ||
| def test_basic(): | ||
| """Test Point class which implements both ToString and __repr__ without inheritance""" | ||
| ob = ReprTest.Point(1,2) | ||
| # point implements ToString() and __repr__() | ||
| assert ob.__repr__() == "Point(1,2)" | ||
| assert str(ob) == "Python.Test.ReprTest+Point: X=1, Y=2" | ||
| def test_system_string(): | ||
| """Test system string""" | ||
| ob = System.String("hello") | ||
| assert str(ob) == "hello" | ||
| assert "<System.String object at " in ob.__repr__() | ||
| def test_str_only(): | ||
| """Test class implementing ToString() but not __repr__()""" | ||
| ob = ReprTest.Bar() | ||
| assert str(ob) == "I implement ToString() but not __repr__()!" | ||
| assert "<Python.Test.Bar object at " in ob.__repr__() | ||
| def test_hierarchy1(): | ||
| """Test inheritance heirarchy with base & middle class implementing ToString""" | ||
| ob1 = ReprTest.BazBase() | ||
| assert str(ob1) == "Base class implementing ToString()!" | ||
| assert "<Python.Test.BazBase object at " in ob1.__repr__() | ||
| ob2 = ReprTest.BazMiddle() | ||
| assert str(ob2) == "Middle class implementing ToString()!" | ||
| assert "<Python.Test.BazMiddle object at " in ob2.__repr__() | ||
| ob3 = ReprTest.Baz() | ||
| assert str(ob3) == "Middle class implementing ToString()!" | ||
| assert "<Python.Test.Baz object at " in ob3.__repr__() | ||
| def bad_tostring(): | ||
| """Test ToString that can't be used by str()""" | ||
| ob = ReprTest.Quux() | ||
| assert str(ob) == "Python.Test.ReprTest+Quux" | ||
| assert "<Python.Test.Quux object at " in ob.__repr__() | ||
| def bad_repr(): | ||
| """Test incorrect implementation of repr""" | ||
| ob1 = ReprTest.QuuzBase() | ||
| assert str(ob1) == "Python.Test.ReprTest+QuuzBase" | ||
| assert "<Python.Test.QuuzBase object at " in ob.__repr__() | ||
| ob2 = ReprTest.Quuz() | ||
| assert str(ob2) == "Python.Test.ReprTest+Quuz" | ||
| assert "<Python.Test.Quuz object at " in ob.__repr__() | ||
| ob3 = ReprTest.Corge() | ||
| with pytest.raises(Exception): | ||
| str(ob3) | ||
| with pytest.raises(Exception): | ||
| ob3.__repr__() | ||
| ob4 = ReprTest.Grault() | ||
| with pytest.raises(Exception): | ||
| str(ob4) | ||
| with pytest.raises(Exception): | ||
| ob4.__repr__() |
1 change: 1 addition & 0 deletionssrc/tests/tests.pyproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
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.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.