Permalink
Browse files

[py3] Avoided relying on 2.x-only internals

in LiveServerTestCase.
  • Loading branch information...
1 parent e98cb05 commit 688678e7c091e4549777d8cc47e8984d5e672976 @aaugustin aaugustin committed Aug 16, 2012
Showing with 19 additions and 16 deletions.
  1. +19 −16 django/test/testcases.py
@@ -917,23 +917,26 @@ def log_message(*args):
pass
-class _ImprovedEvent(threading._Event):
- """
- Does the same as `threading.Event` except it overrides the wait() method
- with some code borrowed from Python 2.7 to return the set state of the
- event (see: http://hg.python.org/cpython/rev/b5aa8aa78c0f/). This allows
- to know whether the wait() method exited normally or because of the
- timeout. This class can be removed when Django supports only Python >= 2.7.
- """
+if sys.version_info >= (2, 6, 0):
@charettes
charettes Aug 16, 2012 Django member

@aaugustin shouldn't we check against (2, 7, 0)?

@claudep
claudep Aug 16, 2012 Django member

Fixed in d69bd23

+ _ImprovedEvent = threading._Event
+else:
+ class _ImprovedEvent(threading._Event):
+ """
+ Does the same as `threading.Event` except it overrides the wait() method
+ with some code borrowed from Python 2.7 to return the set state of the
+ event (see: http://hg.python.org/cpython/rev/b5aa8aa78c0f/). This allows
+ to know whether the wait() method exited normally or because of the
+ timeout. This class can be removed when Django supports only Python >= 2.7.
+ """
- def wait(self, timeout=None):
- self._Event__cond.acquire()
- try:
- if not self._Event__flag:
- self._Event__cond.wait(timeout)
- return self._Event__flag
- finally:
- self._Event__cond.release()
+ def wait(self, timeout=None):
+ self._Event__cond.acquire()
+ try:
+ if not self._Event__flag:
+ self._Event__cond.wait(timeout)
+ return self._Event__flag
+ finally:
+ self._Event__cond.release()
class StoppableWSGIServer(WSGIServer):

0 comments on commit 688678e

Please sign in to comment.