diff options
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/thread_support.py | 12 | ||||
| -rw-r--r-- | django/utils/translation/trans_real.py | 13 |
2 files changed, 12 insertions, 13 deletions
diff --git a/django/utils/thread_support.py b/django/utils/thread_support.py deleted file mode 100644 index 2b97d165ca..0000000000 --- a/django/utils/thread_support.py +++ /dev/null @@ -1,12 +0,0 @@ -""" -Code used in a couple of places to work with the current thread's environment. -Current users include i18n and request prefix handling. -""" - -try: - import threading - currentThread = threading.currentThread -except ImportError: - def currentThread(): - return "no threading" - diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 93bb3c9bf9..451420c7d8 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -8,7 +8,18 @@ import gettext as gettext_module from cStringIO import StringIO from django.utils.safestring import mark_safe, SafeData -from django.utils.thread_support import currentThread + +try: + import threading + hasThreads = True +except ImportError: + hasThreads = False + +if hasThreads: + currentThread = threading.currentThread +else: + def currentThread(): + return 'no threading' # Translations are cached in a dictionary for every language+app tuple. # The active translations are stored by threadid to make them thread local. |