diff --git a/django/db/transaction.py b/django/db/transaction.py index 906995ca02..60a743c42a 100644 --- a/django/db/transaction.py +++ b/django/db/transaction.py @@ -12,7 +12,10 @@ Managed transactions don't do those commits, but will need some kind of manual 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 diff --git a/django/utils/_threading_local.py b/django/utils/_threading_local.py index 90717a8d84..bf9a25753a 100644 --- a/django/utils/_threading_local.py +++ b/django/utils/_threading_local.py @@ -234,4 +234,7 @@ class local(_localbase): 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