@darabonba/python-generator 1.2.17 → 1.2.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/ChangeLog.md +3 -0
  2. package/package.json +1 -1
  3. package/src/langs/python/combinator.js +31 -31
  4. package/src/langs/python2/combinator.js +31 -31
  5. package/tests/expected/python2/complex/tea_python_tests/models.py +15 -15
  6. package/tests/expected/python3/complex/tea_python_tests/models.py +5 -5
package/ChangeLog.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # ChangeLog
2
2
 
3
+ ## 1.2.18 - 2024-02-29
4
+ * Fix: avoid keywords in variables.
5
+
3
6
  ## 1.2.17 - 2023-12-27
4
7
  * Fix: correct model name when first letter is capitalized && and some keywords
5
8
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@darabonba/python-generator",
3
- "version": "1.2.17",
3
+ "version": "1.2.18",
4
4
  "description": "The darabonba generator for Python",
5
5
  "main": "src/generator.js",
6
6
  "directories": {
package/src/langs/python/combinator.js CHANGED
@@ -538,9 +538,9 @@ class Combinator extends CombinatorBase {
538
538
  this.emitComplexValidate(emitter, `k${depth}`, fieldType.itemType, depth + 1);
539
539
  this.levelDown();
540
540
  } else {
541
- emitter.emitln(`if self.${_name(name)}:`, this.level);
541
+ emitter.emitln(`if self.${_varName(name)}:`, this.level);
542
542
  this.levelUp();
543
- emitter.emitln(`for k in self.${_name(name)}:`, this.level);
543
+ emitter.emitln(`for k in self.${_varName(name)}:`, this.level);
544
544
  this.levelUp();
545
545
  this.emitComplexValidate(emitter, 'k', fieldType.itemType, depth + 1);
546
546
  this.levelDown();
@@ -553,9 +553,9 @@ class Combinator extends CombinatorBase {
553
553
  this.emitComplexValidate(emitter, `v${depth}`, fieldType.valType, depth + 1);
554
554
  this.levelDown();
555
555
  } else {
556
- emitter.emitln(`if self.${_name(name)}:`, this.level);
556
+ emitter.emitln(`if self.${_varName(name)}:`, this.level);
557
557
  this.levelUp();
558
- emitter.emitln(`for v in self.${_name(name)}.values():`, this.level);
558
+ emitter.emitln(`for v in self.${_varName(name)}.values():`, this.level);
559
559
  this.levelUp();
560
560
  this.emitComplexValidate(emitter, 'v', fieldType.valType, depth + 1);
561
561
  this.levelDown();
@@ -587,29 +587,29 @@ class Combinator extends CombinatorBase {
587
587
 
588
588
  if (required.length > 0) {
589
589
  emitter.emitln(
590
- `self.validate_required(self.${_name(prop.name)}, '${_name(prop.name)}')`,
590
+ `self.validate_required(self.${_varName(prop.name)}, '${_varName(prop.name)}')`,
591
591
  this.level
592
592
  );
593
593
  haveValidate = true;
594
594
  }
595
595
  if (maxLength.length > 0 || pattern.length > 0 || maximum.length > 0 || minimum.length > 0) {
596
- emitter.emitln(`if self.${_name(prop.name)} is not None:`, this.level);
596
+ emitter.emitln(`if self.${_varName(prop.name)} is not None:`, this.level);
597
597
  this.levelUp();
598
598
 
599
599
  if (maxLength.length > 0) {
600
- emitter.emitln(`self.validate_max_length(self.${_name(prop.name)}, '${_name(prop.name)}', ${maxLength[0].value})`, this.level);
600
+ emitter.emitln(`self.validate_max_length(self.${_varName(prop.name)}, '${_varName(prop.name)}', ${maxLength[0].value})`, this.level);
601
601
  }
602
602
 
603
603
  if (pattern.length > 0) {
604
- emitter.emitln(`self.validate_pattern(self.${_name(prop.name)}, '${_name(prop.name)}', '${pattern[0].value}')`, this.level);
604
+ emitter.emitln(`self.validate_pattern(self.${_varName(prop.name)}, '${_varName(prop.name)}', '${pattern[0].value}')`, this.level);
605
605
  }
606
606
 
607
607
  if (maximum.length > 0) {
608
- emitter.emitln(`self.validate_maximum(self.${_name(prop.name)}, '${_name(prop.name)}', ${maximum[0].value})`, this.level);
608
+ emitter.emitln(`self.validate_maximum(self.${_varName(prop.name)}, '${_varName(prop.name)}', ${maximum[0].value})`, this.level);
609
609
  }
610
610
 
611
611
  if (minimum.length > 0) {
612
- emitter.emitln(`self.validate_minimum(self.${_name(prop.name)}, '${_name(prop.name)}', ${minimum[0].value})`, this.level);
612
+ emitter.emitln(`self.validate_minimum(self.${_varName(prop.name)}, '${_varName(prop.name)}', ${minimum[0].value})`, this.level);
613
613
  }
614
614
  this.levelDown();
615
615
  haveValidate = true;
@@ -624,9 +624,9 @@ class Combinator extends CombinatorBase {
624
624
  emitter.emit(emt.output);
625
625
  }
626
626
  } else if (prop.type.objectType === 'model') {
627
- emitter.emitln(`if self.${_name(prop.name)}:`, this.level);
627
+ emitter.emitln(`if self.${_varName(prop.name)}:`, this.level);
628
628
  this.levelUp();
629
- emitter.emitln(`self.${_name(prop.name)}.validate()`, this.level);
629
+ emitter.emitln(`self.${_varName(prop.name)}.validate()`, this.level);
630
630
  this.levelDown();
631
631
  haveValidate = true;
632
632
  }
@@ -666,9 +666,9 @@ class Combinator extends CombinatorBase {
666
666
  }
667
667
  } else {
668
668
  emitter.emitln(`result['${fieldName}'] = []`, this.level);
669
- emitter.emitln(`if self.${_name(name)} is not None:`, this.level);
669
+ emitter.emitln(`if self.${_varName(name)} is not None:`, this.level);
670
670
  this.levelUp();
671
- emitter.emitln(`for k in self.${_name(name)}:`, this.level);
671
+ emitter.emitln(`for k in self.${_varName(name)}:`, this.level);
672
672
  this.levelUp();
673
673
  if (type.itemType.valType || type.itemType.itemType) {
674
674
  const propInfo = {
@@ -710,9 +710,9 @@ class Combinator extends CombinatorBase {
710
710
  }
711
711
  } else {
712
712
  emitter.emitln(`result['${fieldName}'] = {}`, this.level);
713
- emitter.emitln(`if self.${_name(name)} is not None:`, this.level);
713
+ emitter.emitln(`if self.${_varName(name)} is not None:`, this.level);
714
714
  this.levelUp();
715
- emitter.emitln(`for k, v in self.${_name(name)}.items():`, this.level);
715
+ emitter.emitln(`for k, v in self.${_varName(name)}.items():`, this.level);
716
716
  this.levelUp();
717
717
  if (type.valType.valType || type.valType.itemType) {
718
718
  const propInfo = {
@@ -769,19 +769,19 @@ class Combinator extends CombinatorBase {
769
769
  if (emt.needSave === true) {
770
770
  emitter.emit(emt.output);
771
771
  } else {
772
- emitter.emitln(`if self.${_name(prop.name)} is not None:`, this.level);
772
+ emitter.emitln(`if self.${_varName(prop.name)} is not None:`, this.level);
773
773
  this.levelUp();
774
- emitter.emitln(`result['${name}'] = self.${_name(prop.name)}`, this.level);
774
+ emitter.emitln(`result['${name}'] = self.${_varName(prop.name)}`, this.level);
775
775
  this.levelDown();
776
776
  }
777
777
 
778
778
  } else {
779
- emitter.emitln(`if self.${_name(prop.name)} is not None:`, this.level);
779
+ emitter.emitln(`if self.${_varName(prop.name)} is not None:`, this.level);
780
780
  this.levelUp();
781
781
  if (prop.type.objectType === 'model') {
782
- emitter.emitln(`result['${name}'] = self.${_name(prop.name)}.to_map()`, this.level);
782
+ emitter.emitln(`result['${name}'] = self.${_varName(prop.name)}.to_map()`, this.level);
783
783
  } else {
784
- emitter.emitln(`result['${name}'] = self.${_name(prop.name)}`, this.level);
784
+ emitter.emitln(`result['${name}'] = self.${_varName(prop.name)}`, this.level);
785
785
  }
786
786
  this.levelDown();
787
787
  }
@@ -819,7 +819,7 @@ class Combinator extends CombinatorBase {
819
819
  emitter.emitln(`${carrier}['k${num}'] = l${depth}`, this.level);
820
820
  }
821
821
  } else {
822
- emitter.emitln(`self.${_name(name)} = []`, this.level);
822
+ emitter.emitln(`self.${_varName(name)} = []`, this.level);
823
823
  emitter.emitln(`if m.get('${fieldName}') is not None:`, this.level);
824
824
  this.levelUp();
825
825
  emitter.emitln(`for k in m.get('${fieldName}'):`, this.level);
@@ -831,11 +831,11 @@ class Combinator extends CombinatorBase {
831
831
  type: type.itemType,
832
832
  parentType: type.lexeme
833
833
  };
834
- this.emitComplexFromMap(emitter, propInfo, `self.${_name(name)}`, depth + 1);
834
+ this.emitComplexFromMap(emitter, propInfo, `self.${_varName(name)}`, depth + 1);
835
835
  } else {
836
836
  if (type.itemType.objectType === 'model') {
837
837
  emitter.emitln(`temp_model = ${type.itemType.lexeme}()`, this.level);
838
- emitter.emitln(`self.${_name(name)}.append(temp_model.from_map(k))`, this.level);
838
+ emitter.emitln(`self.${_varName(name)}.append(temp_model.from_map(k))`, this.level);
839
839
  emitter.needSave = true;
840
840
  } else {
841
841
  emitter.needSave = false;
@@ -865,7 +865,7 @@ class Combinator extends CombinatorBase {
865
865
  emitter.emitln(`${carrier}[k${num}] = d${depth}`, this.level);
866
866
  }
867
867
  } else {
868
- emitter.emitln(`self.${_name(name)} = {}`, this.level);
868
+ emitter.emitln(`self.${_varName(name)} = {}`, this.level);
869
869
  emitter.emitln(`if m.get('${fieldName}') is not None:`, this.level);
870
870
  this.levelUp();
871
871
  emitter.emitln(`for k, v in m.get('${fieldName}').items():`, this.level);
@@ -877,11 +877,11 @@ class Combinator extends CombinatorBase {
877
877
  type: type.valType,
878
878
  parentType: type.lexeme
879
879
  };
880
- this.emitComplexFromMap(emitter, propInfo, `self.${_name(name)}`, depth + 1);
880
+ this.emitComplexFromMap(emitter, propInfo, `self.${_varName(name)}`, depth + 1);
881
881
  } else {
882
882
  if (type.valType.objectType === 'model') {
883
883
  emitter.emitln(`temp_model = ${type.valType.lexeme}()`, this.level);
884
- emitter.emitln(`self.${_name(name)}[k] = temp_model.from_map(v)`, this.level);
884
+ emitter.emitln(`self.${_varName(name)}[k] = temp_model.from_map(v)`, this.level);
885
885
  emitter.needSave = true;
886
886
  } else {
887
887
  emitter.needSave = false;
@@ -935,7 +935,7 @@ class Combinator extends CombinatorBase {
935
935
  } else {
936
936
  emitter.emitln(`if m.get('${name}') is not None:`, this.level);
937
937
  this.levelUp();
938
- emitter.emitln(`self.${_name(prop.name)} = m.get('${name}')`, this.level);
938
+ emitter.emitln(`self.${_varName(prop.name)} = m.get('${name}')`, this.level);
939
939
  this.levelDown();
940
940
  }
941
941
  } else {
@@ -944,9 +944,9 @@ class Combinator extends CombinatorBase {
944
944
  if (prop.type.objectType === 'model') {
945
945
  let type = _type(prop.type);
946
946
  emitter.emitln(`temp_model = ${type}()`, this.level);
947
- emitter.emitln(`self.${_name(prop.name)} = temp_model.from_map(m['${name}'])`, this.level);
947
+ emitter.emitln(`self.${_varName(prop.name)} = temp_model.from_map(m['${name}'])`, this.level);
948
948
  } else {
949
- emitter.emitln(`self.${_name(prop.name)} = m.get('${name}')`, this.level);
949
+ emitter.emitln(`self.${_varName(prop.name)} = m.get('${name}')`, this.level);
950
950
  }
951
951
  this.levelDown();
952
952
  }
@@ -1023,7 +1023,7 @@ class Combinator extends CombinatorBase {
1023
1023
  emitter.emitln(`# ${d}`, this.level);
1024
1024
  });
1025
1025
  }
1026
- emitter.emitln(`self.${_name(prop.name)} = ${_varName(prop.name)}`, this.level);
1026
+ emitter.emitln(`self.${_varName(prop.name)} = ${_varName(prop.name)}`, this.level);
1027
1027
  });
1028
1028
  if (construct.body.length > 0) {
1029
1029
  construct.body.forEach(gram => {
package/src/langs/python2/combinator.js CHANGED
@@ -479,9 +479,9 @@ class Combinator extends CombinatorBase {
479
479
  this.emitComplexValidate(emitter, `k${depth}`, fieldType.itemType, depth + 1);
480
480
  this.levelDown();
481
481
  } else {
482
- emitter.emitln(`if self.${_name(name)}:`, this.level);
482
+ emitter.emitln(`if self.${_varName(name)}:`, this.level);
483
483
  this.levelUp();
484
- emitter.emitln(`for k in self.${_name(name)}:`, this.level);
484
+ emitter.emitln(`for k in self.${_varName(name)}:`, this.level);
485
485
  this.levelUp();
486
486
  this.emitComplexValidate(emitter, 'k', fieldType.itemType, depth + 1);
487
487
  this.levelDown();
@@ -494,9 +494,9 @@ class Combinator extends CombinatorBase {
494
494
  this.emitComplexValidate(emitter, `v${depth}`, fieldType.valType, depth + 1);
495
495
  this.levelDown();
496
496
  } else {
497
- emitter.emitln(`if self.${_name(name)}:`, this.level);
497
+ emitter.emitln(`if self.${_varName(name)}:`, this.level);
498
498
  this.levelUp();
499
- emitter.emitln(`for v in self.${_name(name)}.values():`, this.level);
499
+ emitter.emitln(`for v in self.${_varName(name)}.values():`, this.level);
500
500
  this.levelUp();
501
501
  this.emitComplexValidate(emitter, 'v', fieldType.valType, depth + 1);
502
502
  this.levelDown();
@@ -528,29 +528,29 @@ class Combinator extends CombinatorBase {
528
528
 
529
529
  if (required.length > 0) {
530
530
  emitter.emitln(
531
- `self.validate_required(self.${_name(prop.name)}, '${_name(prop.name)}')`,
531
+ `self.validate_required(self.${_varName(prop.name)}, '${_varName(prop.name)}')`,
532
532
  this.level
533
533
  );
534
534
  haveValidate = true;
535
535
  }
536
536
  if (maxLength.length > 0 || pattern.length > 0 || maximum.length > 0 || minimum.length > 0) {
537
- emitter.emitln(`if self.${_name(prop.name)} is not None:`, this.level);
537
+ emitter.emitln(`if self.${_varName(prop.name)} is not None:`, this.level);
538
538
  this.levelUp();
539
539
 
540
540
  if (maxLength.length > 0) {
541
- emitter.emitln(`self.validate_max_length(self.${_name(prop.name)}, '${_name(prop.name)}', ${maxLength[0].value})`, this.level);
541
+ emitter.emitln(`self.validate_max_length(self.${_varName(prop.name)}, '${_varName(prop.name)}', ${maxLength[0].value})`, this.level);
542
542
  }
543
543
 
544
544
  if (pattern.length > 0) {
545
- emitter.emitln(`self.validate_pattern(self.${_name(prop.name)}, '${_name(prop.name)}', '${pattern[0].value}')`, this.level);
545
+ emitter.emitln(`self.validate_pattern(self.${_varName(prop.name)}, '${_varName(prop.name)}', '${pattern[0].value}')`, this.level);
546
546
  }
547
547
 
548
548
  if (maximum.length > 0) {
549
- emitter.emitln(`self.validate_maximum(self.${_name(prop.name)}, '${_name(prop.name)}', ${maximum[0].value})`, this.level);
549
+ emitter.emitln(`self.validate_maximum(self.${_varName(prop.name)}, '${_varName(prop.name)}', ${maximum[0].value})`, this.level);
550
550
  }
551
551
 
552
552
  if (minimum.length > 0) {
553
- emitter.emitln(`self.validate_minimum(self.${_name(prop.name)}, '${_name(prop.name)}', ${minimum[0].value})`, this.level);
553
+ emitter.emitln(`self.validate_minimum(self.${_varName(prop.name)}, '${_varName(prop.name)}', ${minimum[0].value})`, this.level);
554
554
  }
555
555
  this.levelDown();
556
556
  haveValidate = true;
@@ -565,9 +565,9 @@ class Combinator extends CombinatorBase {
565
565
  emitter.emit(emt.output);
566
566
  }
567
567
  } else if (prop.type.objectType === 'model') {
568
- emitter.emitln(`if self.${_name(prop.name)}:`, this.level);
568
+ emitter.emitln(`if self.${_varName(prop.name)}:`, this.level);
569
569
  this.levelUp();
570
- emitter.emitln(`self.${_name(prop.name)}.validate()`, this.level);
570
+ emitter.emitln(`self.${_varName(prop.name)}.validate()`, this.level);
571
571
  this.levelDown();
572
572
  haveValidate = true;
573
573
  }
@@ -607,9 +607,9 @@ class Combinator extends CombinatorBase {
607
607
  }
608
608
  } else {
609
609
  emitter.emitln(`result['${fieldName}'] = []`, this.level);
610
- emitter.emitln(`if self.${_name(name)} is not None:`, this.level);
610
+ emitter.emitln(`if self.${_varName(name)} is not None:`, this.level);
611
611
  this.levelUp();
612
- emitter.emitln(`for k in self.${_name(name)}:`, this.level);
612
+ emitter.emitln(`for k in self.${_varName(name)}:`, this.level);
613
613
  this.levelUp();
614
614
  if (type.itemType.valType || type.itemType.itemType) {
615
615
  const propInfo = {
@@ -651,9 +651,9 @@ class Combinator extends CombinatorBase {
651
651
  }
652
652
  } else {
653
653
  emitter.emitln(`result['${fieldName}'] = {}`, this.level);
654
- emitter.emitln(`if self.${_name(name)} is not None:`, this.level);
654
+ emitter.emitln(`if self.${_varName(name)} is not None:`, this.level);
655
655
  this.levelUp();
656
- emitter.emitln(`for k, v in self.${_name(name)}.items():`, this.level);
656
+ emitter.emitln(`for k, v in self.${_varName(name)}.items():`, this.level);
657
657
  this.levelUp();
658
658
  if (type.valType.valType || type.valType.itemType) {
659
659
  const propInfo = {
@@ -710,19 +710,19 @@ class Combinator extends CombinatorBase {
710
710
  if (emt.needSave === true) {
711
711
  emitter.emit(emt.output);
712
712
  } else {
713
- emitter.emitln(`if self.${_name(prop.name)} is not None:`, this.level);
713
+ emitter.emitln(`if self.${_varName(prop.name)} is not None:`, this.level);
714
714
  this.levelUp();
715
- emitter.emitln(`result['${name}'] = self.${_name(prop.name)}`, this.level);
715
+ emitter.emitln(`result['${name}'] = self.${_varName(prop.name)}`, this.level);
716
716
  this.levelDown();
717
717
  }
718
718
 
719
719
  } else {
720
- emitter.emitln(`if self.${_name(prop.name)} is not None:`, this.level);
720
+ emitter.emitln(`if self.${_varName(prop.name)} is not None:`, this.level);
721
721
  this.levelUp();
722
722
  if (prop.type.objectType === 'model') {
723
- emitter.emitln(`result['${name}'] = self.${_name(prop.name)}.to_map()`, this.level);
723
+ emitter.emitln(`result['${name}'] = self.${_varName(prop.name)}.to_map()`, this.level);
724
724
  } else {
725
- emitter.emitln(`result['${name}'] = self.${_name(prop.name)}`, this.level);
725
+ emitter.emitln(`result['${name}'] = self.${_varName(prop.name)}`, this.level);
726
726
  }
727
727
  this.levelDown();
728
728
  }
@@ -760,7 +760,7 @@ class Combinator extends CombinatorBase {
760
760
  emitter.emitln(`${carrier}['k${num}'] = l${depth}`, this.level);
761
761
  }
762
762
  } else {
763
- emitter.emitln(`self.${_name(name)} = []`, this.level);
763
+ emitter.emitln(`self.${_varName(name)} = []`, this.level);
764
764
  emitter.emitln(`if m.get('${fieldName}') is not None:`, this.level);
765
765
  this.levelUp();
766
766
  emitter.emitln(`for k in m.get('${fieldName}'):`, this.level);
@@ -772,11 +772,11 @@ class Combinator extends CombinatorBase {
772
772
  type: type.itemType,
773
773
  parentType: type.lexeme
774
774
  };
775
- this.emitComplexFromMap(emitter, propInfo, `self.${_name(name)}`, depth + 1);
775
+ this.emitComplexFromMap(emitter, propInfo, `self.${_varName(name)}`, depth + 1);
776
776
  } else {
777
777
  if (type.itemType.objectType === 'model') {
778
778
  emitter.emitln(`temp_model = ${type.itemType.lexeme}()`, this.level);
779
- emitter.emitln(`self.${_name(name)}.append(temp_model.from_map(k))`, this.level);
779
+ emitter.emitln(`self.${_varName(name)}.append(temp_model.from_map(k))`, this.level);
780
780
  emitter.needSave = true;
781
781
  } else {
782
782
  emitter.needSave = false;
@@ -806,7 +806,7 @@ class Combinator extends CombinatorBase {
806
806
  emitter.emitln(`${carrier}[k${num}] = d${depth}`, this.level);
807
807
  }
808
808
  } else {
809
- emitter.emitln(`self.${_name(name)} = {}`, this.level);
809
+ emitter.emitln(`self.${_varName(name)} = {}`, this.level);
810
810
  emitter.emitln(`if m.get('${fieldName}') is not None:`, this.level);
811
811
  this.levelUp();
812
812
  emitter.emitln(`for k, v in m.get('${fieldName}').items():`, this.level);
@@ -818,11 +818,11 @@ class Combinator extends CombinatorBase {
818
818
  type: type.valType,
819
819
  parentType: type.lexeme
820
820
  };
821
- this.emitComplexFromMap(emitter, propInfo, `self.${_name(name)}`, depth + 1);
821
+ this.emitComplexFromMap(emitter, propInfo, `self.${_varName(name)}`, depth + 1);
822
822
  } else {
823
823
  if (type.valType.objectType === 'model') {
824
824
  emitter.emitln(`temp_model = ${type.valType.lexeme}()`, this.level);
825
- emitter.emitln(`self.${_name(name)}[k] = temp_model.from_map(v)`, this.level);
825
+ emitter.emitln(`self.${_varName(name)}[k] = temp_model.from_map(v)`, this.level);
826
826
  emitter.needSave = true;
827
827
  } else {
828
828
  emitter.needSave = false;
@@ -876,7 +876,7 @@ class Combinator extends CombinatorBase {
876
876
  } else {
877
877
  emitter.emitln(`if m.get('${name}') is not None:`, this.level);
878
878
  this.levelUp();
879
- emitter.emitln(`self.${_name(prop.name)} = m.get('${name}')`, this.level);
879
+ emitter.emitln(`self.${_varName(prop.name)} = m.get('${name}')`, this.level);
880
880
  this.levelDown();
881
881
  }
882
882
  } else {
@@ -885,9 +885,9 @@ class Combinator extends CombinatorBase {
885
885
  if (prop.type.objectType === 'model') {
886
886
  let type = _type(prop.type);
887
887
  emitter.emitln(`temp_model = ${type}()`, this.level);
888
- emitter.emitln(`self.${_name(prop.name)} = temp_model.from_map(m['${name}'])`, this.level);
888
+ emitter.emitln(`self.${_varName(prop.name)} = temp_model.from_map(m['${name}'])`, this.level);
889
889
  } else {
890
- emitter.emitln(`self.${_name(prop.name)} = m.get('${name}')`, this.level);
890
+ emitter.emitln(`self.${_varName(prop.name)} = m.get('${name}')`, this.level);
891
891
  }
892
892
  this.levelDown();
893
893
  }
@@ -965,7 +965,7 @@ class Combinator extends CombinatorBase {
965
965
  }
966
966
 
967
967
  const fieldType = this.typeHint(prop.type);
968
- emitter.emitln(`self.${_name(prop.name)} = ${_varName(prop.name)} # type: ${fieldType}`, this.level);
968
+ emitter.emitln(`self.${_varName(prop.name)} = ${_varName(prop.name)} # type: ${fieldType}`, this.level);
969
969
  });
970
970
  if (construct.body.length > 0) {
971
971
  construct.body.forEach(gram => {
package/tests/expected/python2/complex/tea_python_tests/models.py CHANGED
@@ -162,11 +162,11 @@ class ComplexRequest(TeaModel):
162
162
  # test keywords
163
163
  self.from_ = from_ # type: str
164
164
  # test keywords
165
- self.self = self_ # type: str
165
+ self.self_ = self_ # type: str
166
166
  # test keywords
167
- self.print = print_ # type: str
167
+ self.print_ = print_ # type: str
168
168
  # test keywords
169
- self.exec = exec_ # type: str
169
+ self.exec_ = exec_ # type: str
170
170
 
171
171
  def validate(self):
172
172
  self.validate_required(self.access_key, 'access_key')
@@ -199,9 +199,9 @@ class ComplexRequest(TeaModel):
199
199
  if k2:
200
200
  k2.validate()
201
201
  self.validate_required(self.from_, 'from_')
202
- self.validate_required(self.self, 'self')
203
- self.validate_required(self.print, 'print')
204
- self.validate_required(self.exec, 'exec')
202
+ self.validate_required(self.self_, 'self_')
203
+ self.validate_required(self.print_, 'print_')
204
+ self.validate_required(self.exec_, 'exec_')
205
205
 
206
206
  def to_map(self):
207
207
  _map = super(ComplexRequest, self).to_map()
@@ -249,12 +249,12 @@ class ComplexRequest(TeaModel):
249
249
  result['ComplexList2'].append(l1)
250
250
  if self.from_ is not None:
251
251
  result['from'] = self.from_
252
- if self.self is not None:
253
- result['self'] = self.self
254
- if self.print is not None:
255
- result['print'] = self.print
256
- if self.exec is not None:
257
- result['exec'] = self.exec
252
+ if self.self_ is not None:
253
+ result['self'] = self.self_
254
+ if self.print_ is not None:
255
+ result['print'] = self.print_
256
+ if self.exec_ is not None:
257
+ result['exec'] = self.exec_
258
258
  return result
259
259
 
260
260
  def from_map(self, m=None):
@@ -305,11 +305,11 @@ class ComplexRequest(TeaModel):
305
305
  if m.get('from') is not None:
306
306
  self.from_ = m.get('from')
307
307
  if m.get('self') is not None:
308
- self.self = m.get('self')
308
+ self.self_ = m.get('self')
309
309
  if m.get('print') is not None:
310
- self.print = m.get('print')
310
+ self.print_ = m.get('print')
311
311
  if m.get('exec') is not None:
312
- self.exec = m.get('exec')
312
+ self.exec_ = m.get('exec')
313
313
  return self
314
314
 
315
315
 
package/tests/expected/python3/complex/tea_python_tests/models.py CHANGED
@@ -196,7 +196,7 @@ class ComplexRequest(TeaModel):
196
196
  # test keywords
197
197
  self.from_ = from_
198
198
  # test keywords
199
- self.self = self_
199
+ self.self_ = self_
200
200
  # test keywords
201
201
  self.print = print
202
202
  # test keywords
@@ -233,7 +233,7 @@ class ComplexRequest(TeaModel):
233
233
  if k2:
234
234
  k2.validate()
235
235
  self.validate_required(self.from_, 'from_')
236
- self.validate_required(self.self, 'self')
236
+ self.validate_required(self.self_, 'self_')
237
237
  self.validate_required(self.print, 'print')
238
238
  self.validate_required(self.exec, 'exec')
239
239
 
@@ -283,8 +283,8 @@ class ComplexRequest(TeaModel):
283
283
  result['ComplexList2'].append(l1)
284
284
  if self.from_ is not None:
285
285
  result['from'] = self.from_
286
- if self.self is not None:
287
- result['self'] = self.self
286
+ if self.self_ is not None:
287
+ result['self'] = self.self_
288
288
  if self.print is not None:
289
289
  result['print'] = self.print
290
290
  if self.exec is not None:
@@ -339,7 +339,7 @@ class ComplexRequest(TeaModel):
339
339
  if m.get('from') is not None:
340
340
  self.from_ = m.get('from')
341
341
  if m.get('self') is not None:
342
- self.self = m.get('self')
342
+ self.self_ = m.get('self')
343
343
  if m.get('print') is not None:
344
344
  self.print = m.get('print')
345
345
  if m.get('exec') is not None: