Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4b7a23c

Browse files
authored
Fix custom decoders not working for DateTime and Decimal (#1497)
1 parent9555248 commit4b7a23c

File tree

2 files changed

+61
-7
lines changed

2 files changed

+61
-7
lines changed

‎src/embed_tests/Codecs.cs

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,24 @@ public void ExceptionDecoded()
355355
Assert.AreEqual(TestExceptionMessage,error.Message);
356356
}
357357

358+
[Test]
359+
publicvoidDateTimeDecoded()
360+
{
361+
usingvarscope=Py.CreateScope();
362+
scope.Exec(@"
363+
import clr
364+
from datetime import datetime
365+
366+
367+
from Python.EmbeddingTest import Codecs, DateTimeDecoder
368+
369+
DateTimeDecoder.Setup()
370+
");
371+
scope.Exec("Codecs.AcceptsDateTime(datetime(2021, 1, 22))");
372+
}
373+
374+
publicstaticvoidAcceptsDateTime(DateTimev){}
375+
358376
classValueErrorWrapper:Exception
359377
{
360378
publicValueErrorWrapper(stringmessage):base(message){}
@@ -419,4 +437,30 @@ public bool TryDecode<T>(PyObject pyObj, out T value)
419437
returntrue;
420438
}
421439
}
440+
441+
publicclassDateTimeDecoder:IPyObjectDecoder
442+
{
443+
publicstaticvoidSetup()
444+
{
445+
PyObjectConversions.RegisterDecoder(newDateTimeDecoder());
446+
}
447+
448+
publicboolCanDecode(PyObjectobjectType,TypetargetType)
449+
{
450+
returntargetType==typeof(DateTime);
451+
}
452+
453+
publicboolTryDecode<T>(PyObjectpyObj,outTvalue)
454+
{
455+
vardt=newDateTime(
456+
pyObj.GetAttr("year").As<int>(),
457+
pyObj.GetAttr("month").As<int>(),
458+
pyObj.GetAttr("day").As<int>(),
459+
pyObj.GetAttr("hour").As<int>(),
460+
pyObj.GetAttr("minute").As<int>(),
461+
pyObj.GetAttr("second").As<int>());
462+
value=(T)(object)dt;
463+
returntrue;
464+
}
465+
}
422466
}

‎src/runtime/converter.cs

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,8 @@ internal static IntPtr ToPython(object value, Type type)
149149
returnresult;
150150
}
151151

152-
if(Type.GetTypeCode(type)==TypeCode.Object
153-
&&value.GetType()!=typeof(object)
154-
&&valueis notType
155-
||type.IsEnum
156-
){
152+
if(EncodableByUser(type,value))
153+
{
157154
varencoded=PyObjectConversions.TryEncode(value,type);
158155
if(encoded!=null){
159156
result=encoded.Handle;
@@ -301,6 +298,13 @@ internal static IntPtr ToPython(object value, Type type)
301298
}
302299
}
303300

301+
staticboolEncodableByUser(Typetype,objectvalue)
302+
{
303+
TypeCodetypeCode=Type.GetTypeCode(type);
304+
returntype.IsEnum
305+
||typeCodeisTypeCode.DateTime orTypeCode.Decimal
306+
||typeCode==TypeCode.Object&&value.GetType()!=typeof(object)&&valueis notType;
307+
}
304308

305309
/// <summary>
306310
/// In a few situations, we don't have any advisory type information
@@ -523,8 +527,7 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
523527
returnfalse;
524528
}
525529

526-
TypeCodetypeCode=Type.GetTypeCode(obType);
527-
if(typeCode==TypeCode.Object||obType.IsEnum)
530+
if(DecodableByUser(obType))
528531
{
529532
IntPtrpyType=Runtime.PyObject_TYPE(value);
530533
if(PyObjectConversions.TryDecode(value,pyType,obType,outresult))
@@ -536,6 +539,13 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
536539
returnToPrimitive(value,obType,outresult,setError);
537540
}
538541

542+
staticboolDecodableByUser(Typetype)
543+
{
544+
TypeCodetypeCode=Type.GetTypeCode(type);
545+
returntype.IsEnum
546+
||typeCodeisTypeCode.Object orTypeCode.Decimal orTypeCode.DateTime;
547+
}
548+
539549
internaldelegateboolTryConvertFromPythonDelegate(IntPtrpyObj,outobjectresult);
540550

541551
internalstaticintToInt32(BorrowedReferencevalue)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp