summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/test/conftest.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py
index 8d0ff77bb9..2443d0edf0 100644
--- a/lib/spack/spack/test/conftest.py
+++ b/lib/spack/spack/test/conftest.py
@@ -12,20 +12,19 @@ import os
import os.path
import re
import shutil
-import sys
import tempfile
import xml.etree.ElementTree
-if sys.version_info >= (3,):
+try:
# CVS outputs dates in different formats on different systems. We are using
# the dateutil package to parse these dates. This package does not exist
- # for Python 2.x. That means that we cannot test checkouts "by date" for
+ # for Python <2.7. That means that we cannot test checkouts "by date" for
# CVS respositories. (We can still use CVS repos with all features, only
# our tests break.)
from dateutil.parser import parse as parse_date
-else:
- def parse_date(string):
- pytest.skip("dateutil package not available for Python 2.6")
+except ImportError:
+ def parse_date(string): # type: ignore
+ pytest.skip("dateutil package not available")
import py
import pytest