Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/django/utils/translation/trans_real.py

    r7918 r8215  
    99 
    1010from django.utils.safestring import mark_safe, SafeData 
    11  
    12 try: 
    13     import threading 
    14     hasThreads = True 
    15 except ImportError: 
    16     hasThreads = False 
    17  
    18 if hasThreads: 
    19     currentThread = threading.currentThread 
    20 else: 
    21     def currentThread(): 
    22         return 'no threading' 
     11from django.utils.thread_support import currentThread 
    2312 
    2413# Translations are cached in a dictionary for every language+app tuple.