a31104
diff --git a/Lib/threading.py b/Lib/threading.py
a31104
index cb49c4a..c9795a5 100644
a31104
--- a/Lib/threading.py
a31104
+++ b/Lib/threading.py
a31104
@@ -305,7 +305,7 @@ class _Condition(_Verbose):
a31104
         else:
a31104
             return True
a31104
 
a31104
-    def wait(self, timeout=None):
a31104
+    def wait(self, timeout=None, balancing=True):
a31104
         """Wait until notified or until a timeout occurs.
a31104
 
a31104
         If the calling thread has not acquired the lock when this method is
a31104
@@ -354,7 +354,10 @@ class _Condition(_Verbose):
a31104
                     remaining = endtime - _time()
a31104
                     if remaining <= 0:
a31104
                         break
a31104
-                    delay = min(delay * 2, remaining, .05)
a31104
+                    if balancing:
a31104
+                        delay = min(delay * 2, remaining, 0.05)
a31104
+                    else:
a31104
+                        delay = remaining
a31104
                     _sleep(delay)
a31104
                 if not gotit:
a31104
                     if __debug__:
a31104
@@ -599,7 +602,7 @@ class _Event(_Verbose):
Robert Kuska 2318e4
         with self.__cond:
Robert Kuska 2318e4
             self.__flag = False
a31104
 
a31104
-    def wait(self, timeout=None):
a31104
+    def wait(self, timeout=None, balancing=True):
a31104
         """Block until the internal flag is true.
a31104
 
a31104
         If the internal flag is true on entry, return immediately. Otherwise,
a31104
@@ -617,7 +620,7 @@ class _Event(_Verbose):
Robert Kuska 2318e4
         """
Robert Kuska 2318e4
         with self.__cond:
a31104
             if not self.__flag:
a31104
-                self.__cond.wait(timeout)
a31104
+                self.__cond.wait(timeout, balancing)
a31104
             return self.__flag
Robert Kuska 2318e4
Robert Kuska 2318e4
 # Helper to generate new thread names
a31104
@@ -908,7 +911,7 @@ class Thread(_Verbose):
a31104
             if 'dummy_threading' not in _sys.modules:
a31104
                 raise
a31104
 
a31104
-    def join(self, timeout=None):
a31104
+    def join(self, timeout=None, balancing=True):
a31104
         """Wait until the thread terminates.
a31104
 
a31104
         This blocks the calling thread until the thread whose join() method is
a31104
@@ -957,7 +960,7 @@ class Thread(_Verbose):
a31104
                         if __debug__:
a31104
                             self._note("%s.join(): timed out", self)
a31104
                         break
a31104
-                    self.__block.wait(delay)
a31104
+                    self.__block.wait(delay, balancing)
a31104
                 else:
a31104
                     if __debug__:
a31104
                         self._note("%s.join(): thread stopped", self)
a31104
@@ -1143,7 +1146,7 @@ class _DummyThread(Thread):
a31104
     def _set_daemon(self):
a31104
         return True
a31104
 
a31104
-    def join(self, timeout=None):
a31104
+    def join(self, timeout=None, balancing=True):
a31104
         assert False, "cannot join a dummy thread"
a31104
 
a31104