mirror of https://github.com/django/django.git
Fixed #2052 -- Fixed some threading issues for FreeBSD. Thanks, scott@clued-in.co.uk
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
b4be0d2487
commit
56131d0fb9
|
@ -12,7 +12,10 @@ Managed transactions don't do those commits, but will need some kind of manual
|
||||||
or implicit commits or rollbacks.
|
or implicit commits or rollbacks.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import thread
|
try:
|
||||||
|
import thread
|
||||||
|
except ImportError:
|
||||||
|
import dummy_thread as thread
|
||||||
from django.db import connection
|
from django.db import connection
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
|
|
|
@ -234,4 +234,7 @@ class local(_localbase):
|
||||||
return __del__
|
return __del__
|
||||||
__del__ = __del__()
|
__del__ = __del__()
|
||||||
|
|
||||||
from threading import currentThread, enumerate, RLock
|
try:
|
||||||
|
from threading import currentThread, enumerate, RLock
|
||||||
|
except ImportError:
|
||||||
|
from dummy_threading import currentThread, enumerate, RLock
|
||||||
|
|
Loading…
Reference in New Issue