[PATCH 4/4] tests: Don't use exceptions for flow control
Stephen Finucane
stephen.finucane at intel.com
Mon Nov 9 13:29:16 AEDT 2015
Using exceptions for flow control is bad. Be consistent and instead
use proper functions to check for version support. This also allows
the use of tools to automatically identify feature flags when
removing support for Django versions in the future.
Signed-off-by: Stephen Finucane <stephen.finucane at intel.com>
---
patchwork/tests/browser.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/patchwork/tests/browser.py b/patchwork/tests/browser.py
index 80285db..256a4d9 100644
--- a/patchwork/tests/browser.py
+++ b/patchwork/tests/browser.py
@@ -21,10 +21,11 @@ import errno
import os
import time
-try: # django 1.7+
- from django.contrib.staticfiles.testing import StaticLiveServerTestCase
-except:
+import django
+if django.VERSION < (1, 7):
from django.test import LiveServerTestCase as StaticLiveServerTestCase
+else:
+ from django.contrib.staticfiles.testing import StaticLiveServerTestCase
from selenium.common.exceptions import (
NoSuchElementException, StaleElementReferenceException,
TimeoutException)
--
2.0.0
More information about the Patchwork
mailing list