Django

Code

Show
Ignore:
Timestamp:
06/17/07 17:18:54 (1 year ago)
Author:
clong
Message:

per-object-permissions: Merged to trunk [5486] NOTE: Not fully tested, will be working on this over the next few weeks.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/per-object-permissions/django/conf/__init__.py

    r4096 r5488  
    88 
    99import os 
     10import time     # Needed for Windows 
    1011from django.conf import global_settings 
    1112 
    …… 
    106107        self.INSTALLED_APPS = new_installed_apps 
    107108 
    108         # move the time zone info into os.environ 
    109         os.environ['TZ'] = self.TIME_ZONE 
     109        if hasattr(time, 'tzset'): 
     110            # Move the time zone info into os.environ. See ticket #2315 for why 
     111            # we don't do this unconditionally (breaks Windows). 
     112            os.environ['TZ'] = self.TIME_ZONE 
    110113 
    111114    def get_all_members(self):