Unify 3.4 and 3.6 (#1967)

slozier · web-flow · commit c16ab3b4571d · 2025-07-16T21:58:34.000-04:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -27,7 +27,8 @@
     <FileVersion>$(MajorVersion).$(MinorVersion).$(MicroVersion).$(AssemblyFileRevision)</FileVersion>
     <InformationalVersion>$(MSBuildProjectName) $(MajorVersion).$(MinorVersion).$(MicroVersion) $(ReleaseLevel) $(ReleaseSerial)</InformationalVersion>
 
-    <DefineConstants>PYTHON_$(MajorVersion)$(MinorVersion)</DefineConstants>
+    <PythonSymbols>PYTHON_$(MajorVersion)$(MinorVersion)</PythonSymbols>
+    <PythonSymbols Condition="'$(MajorVersion)$(MinorVersion)' >= '36'">$(PythonSymbols);PYTHON_36_OR_GREATER</PythonSymbols>
 
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
 
@@ -127,7 +128,7 @@
     <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <DefineConstants>$(DefineConstants);$(Features);$(SignedSym);TRACE</DefineConstants>
+    <DefineConstants>$(PythonSymbols);$(Features);$(SignedSym);TRACE</DefineConstants>
   </PropertyGroup>
 
   <!-- Debug -->
@@ -137,6 +138,6 @@
     <Optimize>false</Optimize>
     <!-- TODO: Python & zlib.net need some work -->
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <DefineConstants>$(DefineConstants);$(Features);$(SignedSym);DEBUG;TRACE</DefineConstants>
+    <DefineConstants>$(PythonSymbols);$(Features);$(SignedSym);DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
 </Project>
diff --git a/src/core/IronPython.Modules/_ctypes/CData.cs b/src/core/IronPython.Modules/_ctypes/CData.cs
@@ -72,8 +72,11 @@ internal void SetAddress(IntPtr address) {
 
             internal void InitializeFromBuffer(object? data, int offset, int size) {
                 var bp = data as IBufferProtocol
+#if PYTHON_34
                     ?? throw PythonOps.TypeErrorForBadInstance("{0} object does not have the buffer interface", data);
-                    // Python 3.5: PythonOps.TypeErrorForBytesLikeTypeMismatch(data);
+#else
+                    ?? throw PythonOps.TypeErrorForBytesLikeTypeMismatch(data);
+#endif
 
                 IPythonBuffer buffer = bp.GetBuffer(BufferFlags.FullRO);
                 if (buffer.IsReadOnly) {
@@ -97,8 +100,11 @@ internal void InitializeFromBuffer(object? data, int offset, int size) {
 
             internal void InitializeFromBufferCopy(object? data, int offset, int size) {
                 var bp = data as IBufferProtocol
+#if PYTHON_34
                     ?? throw PythonOps.TypeErrorForBadInstance("{0} object does not have the buffer interface", data);
-                    // Python 3.5: PythonOps.TypeErrorForBytesLikeTypeMismatch(data);
+#else
+                    ?? throw PythonOps.TypeErrorForBytesLikeTypeMismatch(data);
+#endif
 
                 using IPythonBuffer buffer = bp.GetBuffer();
                 var span = buffer.AsReadOnlySpan();
diff --git a/src/core/IronPython.Modules/_ctypes/SimpleType.cs b/src/core/IronPython.Modules/_ctypes/SimpleType.cs
@@ -60,13 +60,13 @@ public SimpleType(CodeContext/*!*/ context, string name, PythonTuple bases, Pyth
                     case 'I': _type = SimpleTypeKind.UnsignedInt; break;
                     case 'l':
                         _type = SimpleTypeKind.SignedLong;
-#if !PYTHON_34
+#if PYTHON_36_OR_GREATER
                         _charType = TypecodeOps.IsCLong32Bit ? _charType : 'q';
 #endif
                         break;
                     case 'L':
                         _type = SimpleTypeKind.UnsignedLong;
-#if !PYTHON_34
+#if PYTHON_36_OR_GREATER
                         _charType = TypecodeOps.IsCLong32Bit ? _charType : 'Q';
 #endif
                         break;
diff --git a/src/core/IronPython.Modules/_datetime.cs b/src/core/IronPython.Modules/_datetime.cs
@@ -1237,7 +1237,7 @@ public PythonTuple __reduce__() {
                 );
             }
 
-#if PYTHON_34
+#if PYTHON_34 // removed in 3.5
             public bool __bool__() {
                 return this.UtcTime.TimeSpan.Ticks != 0 || this.UtcTime.LostMicroseconds != 0;
             }
diff --git a/src/core/IronPython.Modules/_heapq.cs b/src/core/IronPython.Modules/_heapq.cs
@@ -77,7 +77,7 @@ public static void heappush(CodeContext/*!*/ context, [NotNone] PythonList list,
             }
         }
 
-        // TODO: removed in Python 3.5
+#if PYTHON_34 // removed in 3.5
         [Documentation("Find the n largest elements in a dataset.\n\n"
             + "Equivalent to:  sorted(iterable, reverse=True)[:n]\n"
             )]
@@ -110,7 +110,6 @@ public static PythonList nlargest(CodeContext/*!*/ context, int n, object? itera
             return ret;
         }
 
-        // TODO: removed in Python 3.5
         [Documentation("Find the n smallest elements in a dataset.\n\n"
             + "Equivalent to:  sorted(iterable)[:n]\n"
             )]
@@ -142,6 +141,7 @@ public static PythonList nsmallest(CodeContext/*!*/ context, int n, object? iter
             HeapSort(context, ret);
             return ret;
         }
+#endif
 
         #endregion
 
diff --git a/src/core/IronPython.Modules/_sre.cs b/src/core/IronPython.Modules/_sre.cs
@@ -14,7 +14,11 @@ namespace IronPython.Modules {
     public static class PythonSRegEx {
         public const string __doc__ = "non-functional _sre module.  Included only for completeness.";
 
+#if PYTHON_34
         public const int MAGIC = 20031017;
+#else
+        public const int MAGIC = 20140917;
+#endif
         public const int CODESIZE = 2;
         public const int MAXREPEAT = 65535;
         public const int MAXGROUPS = int.MaxValue;
diff --git a/src/core/IronPython.Modules/re.cs b/src/core/IronPython.Modules/re.cs
@@ -165,8 +165,9 @@ public class Pattern : IWeakReferenceable {
             internal Pattern(CodeContext/*!*/ context, object pattern, ReFlags flags = 0, bool compiled = false) {
                 _prePattern = PreParseRegex(context, PatternAsString(pattern, ref flags), verbose: flags.HasFlag(ReFlags.VERBOSE), isBytes: !flags.HasFlag(ReFlags.UNICODE), out ReFlags options);
                 flags |= options;
-                // TODO: re-enable in 3.6
-                // if (flags.HasFlag(ReFlags.UNICODE | ReFlags.LOCALE)) throw PythonOps.ValueError("cannot use LOCALE flag with a str pattern");
+#if PYTHON_36_OR_GREATER
+                if (flags.HasFlag(ReFlags.UNICODE | ReFlags.LOCALE)) throw PythonOps.ValueError("cannot use LOCALE flag with a str pattern");
+#endif
                 if (flags.HasFlag(ReFlags.ASCII | ReFlags.LOCALE)) throw PythonOps.ValueError("ASCII and LOCALE flags are incompatible");
                 _re = GenRegex(context, _prePattern, flags, compiled, false);
                 this.pattern = pattern;
@@ -418,7 +419,7 @@ public object sub(CodeContext/*!*/ context, object? repl, object? @string, int c
                         //  only when not adjacent to a previous match
                         if (string.IsNullOrEmpty(match.Value) && match.Index == prevEnd) {
                             return "";
-                        };
+                        }
                         prevEnd = match.Index + match.Length;
 
                         if (replacement != null) return UnescapeGroups(context, match, replacement);
@@ -445,7 +446,7 @@ public PythonTuple subn(CodeContext/*!*/ context, object? repl, object? @string,
                         //  only when not adjacent to a previous match
                         if (string.IsNullOrEmpty(match.Value) && match.Index == prevEnd) {
                             return "";
-                        };
+                        }
                         prevEnd = match.Index + match.Length;
 
                         totalCount++;
diff --git a/src/core/IronPython/Compiler/Ast/TupleExpression.cs b/src/core/IronPython/Compiler/Ast/TupleExpression.cs
@@ -17,17 +17,20 @@ public TupleExpression(bool expandable, params Expression[] items)
         }
 
         internal override string? CheckAssign() {
+#if !PYTHON_36_OR_GREATER
             if (Items.Count == 0) {
-                //  TODO: remove this when we get to 3.6
                 return "can't assign to ()";
             }
+#endif
 
             return base.CheckAssign();
         }
 
         internal override string? CheckDelete() {
+#if !PYTHON_36_OR_GREATER
             if (Items.Count == 0)
-                return "can't delete ()"; //  TODO: remove this when we get to 3.6
+                return "can't delete ()";
+#endif
             return base.CheckDelete();
         }
 
diff --git a/src/core/IronPython/Modules/Builtin.cs b/src/core/IronPython/Modules/Builtin.cs
@@ -58,7 +58,11 @@ public static object __import__(CodeContext/*!*/ context, [NotNone] string name,
 
             object ret = Importer.ImportModule(context, globals, name, from != null && from.Count > 0, level);
             if (ret == null) {
+#if PYTHON_36_OR_GREATER // ModuleNotFoundError since Python 3.6
+                var err = PythonOps.ModuleNotFoundError("No module named {0}", PythonOps.Repr(context, name));
+#else
                 var err = PythonOps.ImportError("No module named '{0}'", name);
+#endif
                 ((PythonExceptions._ImportError)err.GetPythonException()!).name = name;
                 return LightExceptions.Throw(err);
             }
diff --git a/src/core/IronPython/Runtime/Operations/StringOps.cs b/src/core/IronPython/Runtime/Operations/StringOps.cs
@@ -1219,8 +1219,11 @@ private static void AppendValueForTranslate(this StringBuilder ret, object? mapp
                     return;
                 case int mappedInt:
                     if (mappedInt > 0xFFFF) {
-                        // TODO: change to a ValueError in Python 3.5
+#if PYTHON_34
                         throw PythonOps.TypeError("character mapping must be in range(0x10000)");
+#else
+                        throw PythonOps.ValueError("character mapping must be in range(0x10000)");
+#endif
                     }
                     ret.Append((char)mappedInt);
                     break;
diff --git a/src/core/IronPython/Runtime/PythonContext.cs b/src/core/IronPython/Runtime/PythonContext.cs
@@ -299,7 +299,9 @@ void BootstrapImportLib() {
 
                 try {
                     var _frozen_importlib = LoadModuleFromResource("_frozen_importlib", "IronPython.Modules._bootstrap.py");
-
+#if PYTHON_36_OR_GREATER
+                    LoadModuleFromResource("_frozen_importlib_external", "IronPython.Modules._bootstrap_external.py");
+#endif
                     PythonOps.Invoke(SharedClsContext, _frozen_importlib, "_install", SystemState, GetBuiltinModule("_imp"));
                 } catch { }
 
diff --git a/src/core/IronPython/Runtime/PythonDictionary.cs b/src/core/IronPython/Runtime/PythonDictionary.cs
@@ -1053,6 +1053,7 @@ void ICollection.CopyTo(Array array, int index) {
         #region ICodeFormattable Members
 
         public string __repr__(CodeContext context) {
+#if PYTHON_34
             StringBuilder res = new StringBuilder(20);
             res.Append("dict_values([");
             string comma = "";
@@ -1069,6 +1070,36 @@ public string __repr__(CodeContext context) {
             res.Append("])");
 
             return res.ToString();
+#else
+            List<object> infinite = PythonOps.GetAndCheckInfinite(this);
+            if (infinite == null) {
+                return "...";
+            }
+
+            int index = infinite.Count;
+            infinite.Add(this);
+            try {
+                StringBuilder res = new StringBuilder(20);
+                res.Append("dict_values([");
+                string comma = "";
+                foreach (object value in this) {
+                    res.Append(comma);
+                    comma = ", ";
+                    try {
+                        PythonOps.FunctionPushFrame(context.LanguageContext);
+                        res.Append(PythonOps.Repr(context, value));
+                    } finally {
+                        PythonOps.FunctionPopFrame();
+                    }
+                }
+                res.Append("])");
+
+                return res.ToString();
+            } finally {
+                Debug.Assert(index == infinite.Count - 1);
+                infinite.RemoveAt(index);
+            }
+#endif
         }
 
         #endregion
@@ -1772,6 +1803,7 @@ public override bool Equals(object obj) {
         #region ICodeFormattable Members
 
         public string __repr__(CodeContext context) {
+#if PYTHON_34
             StringBuilder res = new StringBuilder(20);
             res.Append("dict_items([");
             string comma = "";
@@ -1788,6 +1820,36 @@ public string __repr__(CodeContext context) {
             res.Append("])");
 
             return res.ToString();
+#else
+            List<object> infinite = PythonOps.GetAndCheckInfinite(this);
+            if (infinite == null) {
+                return "...";
+            }
+
+            int index = infinite.Count;
+            infinite.Add(this);
+            try {
+                StringBuilder res = new StringBuilder(20);
+                res.Append("dict_items([");
+                string comma = "";
+                foreach (object item in this) {
+                    res.Append(comma);
+                    comma = ", ";
+                    try {
+                        PythonOps.FunctionPushFrame(context.LanguageContext);
+                        res.Append(PythonOps.Repr(context, item));
+                    } finally {
+                        PythonOps.FunctionPopFrame();
+                    }
+                }
+                res.Append("])");
+
+                return res.ToString();
+            } finally {
+                Debug.Assert(index == infinite.Count - 1);
+                infinite.RemoveAt(index);
+            }
+#endif
         }
 
         #endregion
diff --git a/src/core/IronPython/Runtime/StringFormatter.cs b/src/core/IronPython/Runtime/StringFormatter.cs
@@ -387,8 +387,11 @@ private void WriteConversion() {
 
         private object GetIntegerValue(char format, out bool fPos, bool allowDouble = true) {
             if (!allowDouble && (_opts.Value is float || _opts.Value is double || _opts.Value is Extensible<double>)) {
-                // TODO: this should fail in 3.5
+#if PYTHON_34
                 PythonOps.Warn(_context, PythonExceptions.DeprecationWarning, "automatic int conversions have been deprecated");
+#else
+                throw PythonOps.TypeError($"an integer is required, not {PythonOps.GetPythonTypeName(_opts.Value)}");
+#endif
             }
 
             switch (_opts.Value) {

Original file line number	Diff line number	Diff line change
`@@ -1237,7 +1237,7 @@ public PythonTuple __reduce__() {`
`1237`	`1237`	`);`
`1238`	`1238`	`}`
`1239`	`1239`
`1240`		`-#if PYTHON_34`
	`1240`	`+#if PYTHON_34 // removed in 3.5`
`1241`	`1241`	`public bool __bool__() {`
`1242`	`1242`	`return this.UtcTime.TimeSpan.Ticks != 0 \|\| this.UtcTime.LostMicroseconds != 0;`
`1243`	`1243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public static void heappush(CodeContext/!/ context, [NotNone] PythonList list,`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`- // TODO: removed in Python 3.5`
	`80`	`+#if PYTHON_34 // removed in 3.5`
`81`	`81`	`[Documentation("Find the n largest elements in a dataset.\n\n"`
`82`	`82`	`+ "Equivalent to: sorted(iterable, reverse=True)[:n]\n"`
`83`	`83`	`)]`
`@@ -110,7 +110,6 @@ public static PythonList nlargest(CodeContext/!/ context, int n, object? itera`
`110`	`110`	`return ret;`
`111`	`111`	`}`
`112`	`112`
`113`		`- // TODO: removed in Python 3.5`
`114`	`113`	`[Documentation("Find the n smallest elements in a dataset.\n\n"`
`115`	`114`	`+ "Equivalent to: sorted(iterable)[:n]\n"`
`116`	`115`	`)]`
`@@ -142,6 +141,7 @@ public static PythonList nsmallest(CodeContext/!/ context, int n, object? iter`
`142`	`141`	`HeapSort(context, ret);`
`143`	`142`	`return ret;`
`144`	`143`	`}`
	`144`	`+#endif`
`145`	`145`
`146`	`146`	`#endregion`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -17,17 +17,20 @@ public TupleExpression(bool expandable, params Expression[] items)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`internal override string? CheckAssign() {`
	`20`	`+#if !PYTHON_36_OR_GREATER`
`20`	`21`	`if (Items.Count == 0) {`
`21`		`- // TODO: remove this when we get to 3.6`
`22`	`22`	`return "can't assign to ()";`
`23`	`23`	`}`
	`24`	`+#endif`
`24`	`25`
`25`	`26`	`return base.CheckAssign();`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`internal override string? CheckDelete() {`
	`30`	`+#if !PYTHON_36_OR_GREATER`
`29`	`31`	`if (Items.Count == 0)`
`30`		`- return "can't delete ()"; // TODO: remove this when we get to 3.6`
	`32`	`+ return "can't delete ()";`
	`33`	`+#endif`
`31`	`34`	`return base.CheckDelete();`
`32`	`35`	`}`
`33`	`36`