summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-07-19 19:32:18 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-07-19 19:32:18 +0000
commitff68e85b8e6a8b35e1a5cce0e5dbeb585e70710f (patch)
tree22d3e482b79967e7c7d9f5f2cfa410a2e41c991f
parent99bbaa0090a605cfb80c9f1d7b1f86cb6b9e06f8 (diff)
Starting to do the reverse() threading stuff.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/utils/thread_support.py12
-rw-r--r--django/utils/translation/trans_real.py13
2 files changed, 13 insertions, 12 deletions
diff --git a/django/utils/thread_support.py b/django/utils/thread_support.py
new file mode 100644
index 0000000000..2b97d165ca
--- /dev/null
+++ b/django/utils/thread_support.py
@@ -0,0 +1,12 @@
+"""
+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 451420c7d8..93bb3c9bf9 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -8,18 +8,7 @@ import gettext as gettext_module
from cStringIO import StringIO
from django.utils.safestring import mark_safe, SafeData
-
-try:
- import threading
- hasThreads = True
-except ImportError:
- hasThreads = False
-
-if hasThreads:
- currentThread = threading.currentThread
-else:
- def currentThread():
- return 'no threading'
+from django.utils.thread_support import currentThread
# Translations are cached in a dictionary for every language+app tuple.
# The active translations are stored by threadid to make them thread local.