Skip to content

Commit 20e172d

Browse files
committed
[py] Switch from collections.OrderedDict to dict.
Python 3.7 ensures iteration in insertion order.
1 parent ec6f352 commit 20e172d

4 files changed

Lines changed: 8 additions & 32 deletions

File tree

GenPy.fu

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,8 @@ public class GenPy : GenPySwift
329329
break;
330330
case FuId.DictionaryClass:
331331
case FuId.SortedDictionaryClass:
332-
WriteCollectionTypeAnnotation("dict", klass);
333-
break;
334332
case FuId.OrderedDictionaryClass:
335-
Include("collections");
336-
WriteCollectionTypeAnnotation("collections.OrderedDict", klass);
333+
WriteCollectionTypeAnnotation("dict", klass);
337334
break;
338335
case FuId.TextWriterClass:
339336
Include("io");
@@ -732,11 +729,8 @@ public class GenPy : GenPySwift
732729
break;
733730
case FuId.DictionaryClass:
734731
case FuId.SortedDictionaryClass:
735-
Write("{}");
736-
break;
737732
case FuId.OrderedDictionaryClass:
738-
Include("collections");
739-
Write("collections.OrderedDict()");
733+
Write("{}");
740734
break;
741735
case FuId.StringWriterClass:
742736
Include("io");

libfut.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24610,11 +24610,8 @@ void GenPy::writeTypeAnnotation(const FuType * type, bool nullable)
2461024610
break;
2461124611
case FuId::dictionaryClass:
2461224612
case FuId::sortedDictionaryClass:
24613-
writeCollectionTypeAnnotation("dict", klass);
24614-
break;
2461524613
case FuId::orderedDictionaryClass:
24616-
include("collections");
24617-
writeCollectionTypeAnnotation("collections.OrderedDict", klass);
24614+
writeCollectionTypeAnnotation("dict", klass);
2461824615
break;
2461924616
case FuId::textWriterClass:
2462024617
include("io");
@@ -25013,11 +25010,8 @@ void GenPy::writeNew(const FuReadWriteClassType * klass, FuPriority parent)
2501325010
break;
2501425011
case FuId::dictionaryClass:
2501525012
case FuId::sortedDictionaryClass:
25016-
write("{}");
25017-
break;
2501825013
case FuId::orderedDictionaryClass:
25019-
include("collections");
25020-
write("collections.OrderedDict()");
25014+
write("{}");
2502125015
break;
2502225016
case FuId::stringWriterClass:
2502325017
include("io");

libfut.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25473,11 +25473,8 @@ void WriteTypeAnnotation(FuType type, bool nullable = false)
2547325473
break;
2547425474
case FuId.DictionaryClass:
2547525475
case FuId.SortedDictionaryClass:
25476-
WriteCollectionTypeAnnotation("dict", klass);
25477-
break;
2547825476
case FuId.OrderedDictionaryClass:
25479-
Include("collections");
25480-
WriteCollectionTypeAnnotation("collections.OrderedDict", klass);
25477+
WriteCollectionTypeAnnotation("dict", klass);
2548125478
break;
2548225479
case FuId.TextWriterClass:
2548325480
Include("io");
@@ -25871,11 +25868,8 @@ protected override void WriteNew(FuReadWriteClassType klass, FuPriority parent)
2587125868
break;
2587225869
case FuId.DictionaryClass:
2587325870
case FuId.SortedDictionaryClass:
25874-
Write("{}");
25875-
break;
2587625871
case FuId.OrderedDictionaryClass:
25877-
Include("collections");
25878-
Write("collections.OrderedDict()");
25872+
Write("{}");
2587925873
break;
2588025874
case FuId.StringWriterClass:
2588125875
Include("io");

libfut.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26129,11 +26129,8 @@ export class GenPy extends GenPySwift
2612926129
break;
2613026130
case FuId.DICTIONARY_CLASS:
2613126131
case FuId.SORTED_DICTIONARY_CLASS:
26132-
this.#writeCollectionTypeAnnotation("dict", klass);
26133-
break;
2613426132
case FuId.ORDERED_DICTIONARY_CLASS:
26135-
this.include("collections");
26136-
this.#writeCollectionTypeAnnotation("collections.OrderedDict", klass);
26133+
this.#writeCollectionTypeAnnotation("dict", klass);
2613726134
break;
2613826135
case FuId.TEXT_WRITER_CLASS:
2613926136
this.include("io");
@@ -26538,11 +26535,8 @@ export class GenPy extends GenPySwift
2653826535
break;
2653926536
case FuId.DICTIONARY_CLASS:
2654026537
case FuId.SORTED_DICTIONARY_CLASS:
26541-
this.write("{}");
26542-
break;
2654326538
case FuId.ORDERED_DICTIONARY_CLASS:
26544-
this.include("collections");
26545-
this.write("collections.OrderedDict()");
26539+
this.write("{}");
2654626540
break;
2654726541
case FuId.STRING_WRITER_CLASS:
2654826542
this.include("io");

0 commit comments

Comments
 (0)