Skip to content

Commit

Permalink
Fixed #2052 -- Fixed some threading issues for FreeBSD. Thanks, scott…
Browse files Browse the repository at this point in the history
…@clued-in.co.uk

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Jun 1, 2006
1 parent b4be0d2 commit 56131d0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion django/db/transaction.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
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


Expand Down
5 changes: 4 additions & 1 deletion django/utils/_threading_local.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -234,4 +234,7 @@ def __del__(self):
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

0 comments on commit 56131d0

Please sign in to comment.