Ticket #5317: builtins.diff

django/conf/__init__.py

@@ -8 +8 @@
 
 import os
 import time     # Needed for Windows
+import __builtin__
 from django.conf import global_settings
 
 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -145 +146 @@
 # from within this file would cause a circular import.
 def first_time_gettext(*args):
     from django.utils.translation import gettext
-    __builtins__['_'] = gettext
+    setattr(__builtin__, '_', gettext)
     return gettext(*args)
 
-__builtins__['_'] = first_time_gettext
+setattr(__builtin__, '_', first_time_gettext)

django/utils/translation/trans_real.py

@@ -419 +419 @@
     Installs the gettext function as the default translation function under
     the name '_'.
     """
-    __builtins__['_'] = gettext
+    import __builtin__
+    setattr(__builtin__, '_', gettext)
 
 dot_re = re.compile(r'\S')
 def blankout(src, char):