Skip to content

Remove unnecessary CheckExceptionOccurred calls #1175

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
merged 11 commits into from
Aug 15, 2020
Merged

Remove unnecessary CheckExceptionOccurred calls #1175

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
03a401e
Remove unnecessary `CheckExceptionOccurred` calls
amos402 Jul 2, 2020
950676f
Dispose safety
amos402 Jul 29, 2020
88f2cfa
Refactor Converter.ToPrimitive
amos402 Jul 29, 2020
0e4668c
str to int raises `ValueError`
amos402 Jul 29, 2020
9845e98
Test convert error for float types
amos402 Jul 29, 2020
97f0009
Convert error for UInt32
amos402 Jul 29, 2020
838dfc2
* Ignore package index
amos402 Jul 30, 2020
d9628f7
BorrowedReference instead of `in NewReference`
amos402 Jul 30, 2020
aced268
Remove useless pip argument
amos402 Jul 30, 2020
e379520
Merge branch 'master' into remove-redundant-calls
amos402 Aug 10, 2020
8ca0a62
Merge branch 'master' into remove-redundant-calls
amos402 Aug 11, 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
Convert error for UInt32
  • Loading branch information
@amos402
amos402 committed Jul 29, 2020
commit 97f00095362b006f61a20ffc019f005a87b12935
10 changes: 6 additions & 4 deletions src/runtime/converter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security;
using System.ComponentModel;
using System.Linq.Expressions;

namespace Python.Runtime
{
Expand Down Expand Up @@ -666,6 +664,10 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
else
{
ulong num = Runtime.PyLong_AsUnsignedLong64(op);
if (num == ulong.MaxValue && Exceptions.ErrorOccurred())
{
goto convert_error;
}
try
{
result = Convert.ToUInt32(num);
Expand All @@ -692,7 +694,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
goto convert_error;
}
}
ulong num = Runtime.PyLong_AsUnsignedLongLong(value);
ulong num = Runtime.PyLong_AsUnsignedLongLong(op);
if (num == ulong.MaxValue && Exceptions.ErrorOccurred())
{
goto overflow;
Expand Down