renamed module __builtin__ to builtins

paweljasinski · paweljasinski · commit b28d7b2167ad · 2014-03-26T23:00:45.000+01:00
diff --git a/Src/IronPython.Modules/_io.cs b/Src/IronPython.Modules/_io.cs
@@ -60,7 +60,7 @@ public static void PerformModuleReload(PythonContext/*!*/ context, PythonDiction
                 typeof(BlockingIOError),
                 dict,
                 "BlockingIOError",
-                "__builtin__",
+                "builtins",
                 msg => new _BlockingIOErrorException(msg)
             );
             context.EnsureModuleException(
diff --git a/Src/IronPython/Modules/Builtin.cs b/Src/IronPython/Modules/Builtin.cs
@@ -42,13 +42,13 @@
 using Complex = Microsoft.Scripting.Math.Complex64;
 #endif
 
-[assembly: PythonModule("__builtin__", typeof(IronPython.Modules.Builtin))]
+[assembly: PythonModule("builtins", typeof(IronPython.Modules.Builtin))]
 namespace IronPython.Modules {
     [Documentation("")]  // Documentation suppresses XML Doc on startup.
     public static partial class Builtin {
         public const string __doc__ = "Provides access to commonly used built-in functions, exception objects, etc...";
         public const object __package__ = null;
-        public const string __name__ = "__builtin__";
+        public const string __name__ = "builtins";
 
         public static object True {
             get {
@@ -2472,7 +2472,7 @@ private static CompileFlags GetCompilerFlags(int flags) {
 
             if (!globals.ContainsKey("__builtins__")) {
                 if (setBuiltinsToModule) {
-                    globals["__builtins__"] = python.SystemStateModules["__builtin__"];
+                    globals["__builtins__"] = python.SystemStateModules["builtins"];
                 } else {
                     globals["__builtins__"] = python.BuiltinModuleDict;
                 }
diff --git a/Src/IronPython/Runtime/Operations/PythonTypeOps.cs b/Src/IronPython/Runtime/Operations/PythonTypeOps.cs
@@ -67,7 +67,7 @@ internal static string GetModuleName(CodeContext/*!*/ context, Type type) {
                 return (string)modField.GetRawConstantValue();
             }
 
-            return "__builtin__";
+            return "builtins";
         }
 
         internal static object CallParams(CodeContext/*!*/ context, PythonType cls, params object[] args\u03c4) {
diff --git a/Src/IronPython/Runtime/PythonContext.cs b/Src/IronPython/Runtime/PythonContext.cs
@@ -1831,7 +1831,7 @@ private void InitializeBuiltins() {
 
             _builtins = new PythonModule(dict);
 
-            _modulesDict["__builtin__"] = _builtins;
+            _modulesDict["builtins"] = _builtins;
         }
 
         private Dictionary<string, Type> CreateBuiltinTable() {
diff --git a/Src/IronPython/Runtime/Types/BuiltinFunction.cs b/Src/IronPython/Runtime/Types/BuiltinFunction.cs
@@ -649,7 +649,7 @@ public string Get__module__(CodeContext/*!*/ context) {
                 PythonType declaringType = DynamicHelpers.GetPythonTypeFromType(DeclaringType);
 
                 string res = PythonTypeOps.GetModuleName(context, declaringType.UnderlyingSystemType);
-                if (res != "__builtin__" || DeclaringType == typeof(IronPython.Modules.Builtin)) {
+                if (res != "builtins" || DeclaringType == typeof(IronPython.Modules.Builtin)) {
                     return res;
                 }
             }
diff --git a/Src/IronPython/Runtime/Types/PythonType.cs b/Src/IronPython/Runtime/Types/PythonType.cs
@@ -695,7 +695,7 @@ public static void Set__name__(PythonType type, string name) {
             if (IsSystemType) {
                 if (PythonTypeOps.IsRuntimeAssembly(UnderlyingSystemType.GetTypeInfo().Assembly) || IsPythonType) {
                     object module = Get__module__(context, this);
-                    if (!module.Equals("__builtin__")) {
+                    if (!module.Equals("builtins")) {
                         return string.Format("<type '{0}.{1}'>", module, Name);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ internal static string GetModuleName(CodeContext/!/ context, Type type) {`
`67`	`67`	`return (string)modField.GetRawConstantValue();`
`68`	`68`	`}`
`69`	`69`
`70`		`- return "__builtin__";`
	`70`	`+ return "builtins";`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`internal static object CallParams(CodeContext/!/ context, PythonType cls, params object[] args\u03c4) {`
Original file line number	Diff line number	Diff line change
`@@ -1831,7 +1831,7 @@ private void InitializeBuiltins() {`
`1831`	`1831`
`1832`	`1832`	`_builtins = new PythonModule(dict);`
`1833`	`1833`
`1834`		`- _modulesDict["__builtin__"] = _builtins;`
	`1834`	`+ _modulesDict["builtins"] = _builtins;`
`1835`	`1835`	`}`
`1836`	`1836`
`1837`	`1837`	`private Dictionary<string, Type> CreateBuiltinTable() {`
Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ public string Get__module__(CodeContext/!/ context) {`
`649`	`649`	`PythonType declaringType = DynamicHelpers.GetPythonTypeFromType(DeclaringType);`
`650`	`650`
`651`	`651`	`string res = PythonTypeOps.GetModuleName(context, declaringType.UnderlyingSystemType);`
`652`		`- if (res != "__builtin__" \|\| DeclaringType == typeof(IronPython.Modules.Builtin)) {`
	`652`	`+ if (res != "builtins" \|\| DeclaringType == typeof(IronPython.Modules.Builtin)) {`
`653`	`653`	`return res;`
`654`	`654`	`}`
`655`	`655`	`}`
Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ public static void Set__name__(PythonType type, string name) {`
`695`	`695`	`if (IsSystemType) {`
`696`	`696`	`if (PythonTypeOps.IsRuntimeAssembly(UnderlyingSystemType.GetTypeInfo().Assembly) \|\| IsPythonType) {`
`697`	`697`	`object module = Get__module__(context, this);`
`698`		`- if (!module.Equals("__builtin__")) {`
	`698`	`+ if (!module.Equals("builtins")) {`
`699`	`699`	`return string.Format("<type '{0}.{1}'>", module, Name);`
`700`	`700`	`}`
`701`	`701`	`}`