Ticket #1480: t1480-r7662.diff

django/conf/__init__.py

@@ -110 +110 @@
                 new_installed_apps.append(app)
         self.INSTALLED_APPS = new_installed_apps
 
-        if hasattr(time, 'tzset'):
+        if hasattr(time, 'tzset') and hasattr(self, 'TIME_ZONE') and self.TIME_ZONE:
             # 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

django/conf/project_template/settings.py

@@ -19 +19 @@
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
+# On Unix systems you can leave it undefined or set it to None if
+# you want the timezone to remain equal to the server's timezone.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 TIME_ZONE = 'America/Chicago'

django/db/backends/postgresql/base.py

@@ -85 +85 @@
     def _cursor(self, settings):
         set_tz = False
         if self.connection is None:
-            set_tz = True
+            set_tz = hasattr(settings, 'TIME_ZONE') and settings.TIME_ZONE
             if settings.DATABASE_NAME == '':
                 from django.core.exceptions import ImproperlyConfigured
                 raise ImproperlyConfigured("You need to specify DATABASE_NAME in your Django settings file.")

django/db/backends/postgresql_psycopg2/base.py

@@ -53 +53 @@
     def _cursor(self, settings):
         set_tz = False
         if self.connection is None:
-            set_tz = True
+            set_tz = hasattr(settings, 'TIME_ZONE') and settings.TIME_ZONE
             if settings.DATABASE_NAME == '':
                 from django.core.exceptions import ImproperlyConfigured
                 raise ImproperlyConfigured("You need to specify DATABASE_NAME in your Django settings file.")

docs/settings.txt

@@ -1058 +1058 @@
 not necessarily the timezone of the server. For example, one server may serve
 multiple Django-powered sites, each with a separate time-zone setting.
 
+**New in Django development version:** This setting can also be left undefined
+or set to ``None`` for deployment scenarios in which you need the timezone to
+remain in the server's timezone.
+
 Normally, Django sets the ``os.environ['TZ']`` variable to the time zone you
 specify in the  ``TIME_ZONE`` setting. Thus, all your views and models will
-automatically operate in the correct time zone. However, if you're using the
-manual configuration option (see below), Django will *not* touch the ``TZ``
-environment variable, and it'll be up to you to ensure your processes are
-running in the correct environment.
+automatically operate in the correct time zone. However, in the following two
+scenarios:
+
+* If you leave the ``TIME_ZONE`` setting undefined or set it to ``None``
+* If you're using the manual configuration option (see below_)
+
+Django will *not* touch the ``TZ`` environment variable, and it'll be up to you
+to ensure your processes are running in the correct environment.
 
 .. note::
     Django cannot reliably use alternate time zones in a Windows environment.
@@ -1133 +1141 @@
       purely for performance.
     * Don't reinvent an already-existing setting.
 
+.. _below:
+
 Using settings without setting DJANGO_SETTINGS_MODULE
 =====================================================
 
@@ -1163 +1173 @@
 
 Consequently, when configured via ``settings.configure()``, Django will not
 make any modifications to the process environment variables. (See the
-explanation of ``TIME_ZONE``, above, for why this would normally occur.) It's
+explanation of TIME_ZONE_, above, for why this would normally occur.) It's
 assumed that you're already in full control of your environment in these cases.
 
 Custom default settings