Skip to content

Proposal: Safe pointers #1043

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filmor merged 9 commits into from
Feb 26, 2020
Merged

Proposal: Safe pointers #1043

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a84a1e
NewReference type and an example usage
lostmsu Feb 13, 2020
88944a2
BorrowedReference + example, that exposes dangerous pattern
lostmsu Feb 13, 2020
e1ba92c
actually, borrowed refrences can be copied
lostmsu Feb 13, 2020
2d11f82
make BorrowedReference readonly ref struct
lostmsu Feb 13, 2020
dbb3dc5
updated old project file
lostmsu Feb 13, 2020
7304b25
BorrowedReference.Pointer is a private readonly field
lostmsu Feb 13, 2020
2bc218c
drop C# 8.0 requirement
lostmsu Feb 13, 2020
2cf9fc3
renamed NewReference.ToPyObject to MoveToPyObject
lostmsu Feb 23, 2020
6ae63cd
added xmldoc comments to *Reference members
lostmsu Feb 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
drop C# 8.0 requirement
  • Loading branch information
@lostmsu
lostmsu committed Feb 13, 2020
commit 2bc218c23e2093b068c747c0a9e9890f441b4127
2 changes: 1 addition & 1 deletion src/runtime/Python.Runtime.15.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<PythonBuildDir Condition="'$(PythonBuildDir)' == ''">$(SolutionDir)\bin\</PythonBuildDir>
<PublishDir Condition="'$(TargetFramework)'!='net40'">$(PythonBuildDir)\$(TargetFramework)\</PublishDir>
<LangVersion>8.0</LangVersion>
<LangVersion>7.3</LangVersion>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
<CustomDefineConstants Condition="'$(CustomDefineConstants)' == ''">$(PYTHONNET_DEFINE_CONSTANTS)</CustomDefineConstants>
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/Python.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)\bin\</PythonBuildDir>
<AppDesignerFolder>Properties</AppDesignerFolder>
<LangVersion>8.0</LangVersion>
<LangVersion>7.3</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
Expand Down
17 changes: 12 additions & 5 deletions src/runtime/pydict.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,20 @@ public PyObject Values()
/// </remarks>
public PyObject Items()
{
using var items = Runtime.PyDict_Items(this.obj);
if (items.IsNull)
var items = Runtime.PyDict_Items(this.obj);
try
{
throw new PythonException();
}
if (items.IsNull)
{
throw new PythonException();
}

return items.ToPyObject();
return items.ToPyObject();
}
finally
{
items.Dispose();
}
}


Expand Down