Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 56131d0fb9a1a99577c3866ac63fa0cb8c779cbd 1 parent b4be0d2
@adrianholovaty adrianholovaty authored
Showing with 8 additions and 2 deletions.
  1. +4 −1 django/db/transaction.py
  2. +4 −1 django/utils/_threading_local.py
View
5 django/db/transaction.py
@@ -12,7 +12,10 @@
or implicit commits or rollbacks.
"""
-import thread
+try:
+ import thread
+except ImportError:
+ import dummy_thread as thread
from django.db import connection
from django.conf import settings
View
5 django/utils/_threading_local.py
@@ -234,4 +234,7 @@ def __del__(self):
return __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.
Something went wrong with that request. Please try again.