Permalink
Browse files

Fixed #2315 -- added work around for Windows timezone setting (i.e. …

…we can't do

it). This will work until somebody wants to write some full Win32 timezone changing code for us. Thanks to Marc Fargas and SmileyChris for the combined patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
malcolmt committed Feb 12, 2007
1 parent 6c47577 commit 80e58b3211ae54754b734a409d5b944117d7963d
Showing with 13 additions and 2 deletions.
  1. +1 −0 AUTHORS
  2. +5 −2 django/conf/__init__.py
  3. +2 −0 django/conf/project_template/settings.py
  4. +5 −0 docs/settings.txt
View
@@ -79,6 +79,7 @@ answer newbie questions, and generally made Django that much better:
Andy Dustman <farcepest@gmail.com>
Clint Ecker
Enrico <rico.bl@gmail.com>
+ Marc Fargas <telenieko@telenieko.com>
favo@exoweb.net
Eric Floehr <eric@intellovations.com>
gandalf@owca.info
View
@@ -7,6 +7,7 @@
"""
import os
+import time # Needed for Windows
from django.conf import global_settings
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -105,8 +106,10 @@ def __init__(self, settings_module):
new_installed_apps.append(app)
self.INSTALLED_APPS = new_installed_apps
- # move the time zone info into os.environ
- os.environ['TZ'] = self.TIME_ZONE
+ if 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
def get_all_members(self):
return dir(self)
@@ -18,6 +18,8 @@
# Local time zone for this installation. All choices can be found here:
# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
TIME_ZONE = 'America/Chicago'
# Language code for this installation. All choices can be found here:
View
@@ -827,6 +827,11 @@ 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.
+ When running Django on Windows this variable must be set to match the
+ system timezone.
+
URL_VALIDATOR_USER_AGENT
------------------------

0 comments on commit 80e58b3

Please sign in to comment.