Merge pull request IronLanguages#43 from paweljasinski/i40

renamed module __builtin__ to builtins
jdhardy · Mar 27, 2014 · c8ad6f7 · c8ad6f7
2 parents aa24f99 + b28d7b2
commit c8ad6f7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
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);
                     }
                 }