Commit 56131d0f authored by Adrian Holovaty's avatar Adrian Holovaty
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
parent b4be0d24

django/db/transaction.py

+4 −1
Original line number Diff line number Diff line
@@ -12,7 +12,10 @@ Managed transactions don't do those commits, but will need some kind of manual 
or implicit commits or rollbacks.

"""



try:

    import thread

except ImportError:

    import dummy_thread as thread

from django.db import connection

from django.conf import settings

django/utils/_threading_local.py

+4 −1
Original line number Diff line number Diff line
@@ -234,4 +234,7 @@ class local(_localbase): 
        return __del__

    __del__ = __del__()



try:

    from threading import currentThread, enumerate, RLock

except ImportError:

    from dummy_threading import currentThread, enumerate, RLock