Ticket #10439: 10439-Dont-tzset-in-every-Settings-isntance-r10008.diff

django/conf/__init__.py

@@ -58 +58 @@
     configured = property(configured)
 
 class Settings(object):
-    def __init__(self, settings_module):
+    def __init__(self, settings_module, modify_global_state=True):
         # update this dict from global settings (but only for ALL_CAPS settings)
         for setting in dir(global_settings):
             if setting == setting.upper():
@@ -98 +98 @@
                 new_installed_apps.append(app)
         self.INSTALLED_APPS = new_installed_apps
 
-        if hasattr(time, 'tzset'):
+        if modify_global_state and hasattr(time, 'tzset'):
             # Move the time zone info into os.environ. See ticket #2315 for why
             # we don't do this unconditionally (breaks Windows).
             os.environ['TZ'] = self.TIME_ZONE

tests/regressiontests/app_loading/tests.py

@@ -7 +7 @@
 
 >>> from django.conf import Settings
 
->>> s = Settings('test_settings')
+>>> s = Settings('test_settings', modify_global_state=False)
 
 >>> s.INSTALLED_APPS
 ['parent.app', 'parent.app1']