summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2020-01-27 00:31:13 -0600
committerTodd Gamblin <tgamblin@llnl.gov>2020-01-26 22:31:13 -0800
commiteb79c82cbae2005ebcbf531879cb293692fa3a30 (patch)
tree7353df95b0cd74a433bdc9661cda8f3d34df5ad8
parent0e86961b842bd818bed37eadfb70914e5332f47f (diff)
downloadspack-eb79c82cbae2005ebcbf531879cb293692fa3a30.tar.gz
spack-eb79c82cbae2005ebcbf531879cb293692fa3a30.tar.bz2
spack-eb79c82cbae2005ebcbf531879cb293692fa3a30.tar.xz
spack-eb79c82cbae2005ebcbf531879cb293692fa3a30.zip
Fix Python version compatibility tests for vermin 0.10.0 (#14632)
-rw-r--r--lib/spack/spack/cmd/list.py2
-rw-r--r--lib/spack/spack/util/web.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/spack/spack/cmd/list.py b/lib/spack/spack/cmd/list.py
index c4157349d0..656282599d 100644
--- a/lib/spack/spack/cmd/list.py
+++ b/lib/spack/spack/cmd/list.py
@@ -23,7 +23,7 @@ import spack.cmd.common.arguments as arguments
from spack.version import VersionList
if sys.version_info > (3, 1):
- from html import escape
+ from html import escape # novm
else:
from cgi import escape
diff --git a/lib/spack/spack/util/web.py b/lib/spack/spack/util/web.py
index fbd4ea8c5a..4fb8c5a591 100644
--- a/lib/spack/spack/util/web.py
+++ b/lib/spack/spack/util/web.py
@@ -21,7 +21,7 @@ import multiprocessing.pool
try:
# Python 2 had these in the HTMLParser package.
- from HTMLParser import HTMLParser, HTMLParseError
+ from HTMLParser import HTMLParser, HTMLParseError # novm
except ImportError:
# In Python 3, things moved to html.parser
from html.parser import HTMLParser
@@ -80,7 +80,7 @@ if sys.version_info[0] < 3:
Process = NonDaemonProcess
else:
- class NonDaemonContext(type(multiprocessing.get_context())):
+ class NonDaemonContext(type(multiprocessing.get_context())): # novm
Process = NonDaemonProcess
class NonDaemonPool(multiprocessing.pool.Pool):
@@ -128,7 +128,7 @@ def read_from_url(url, accept_content_type=None):
warn_no_ssl_cert_checking()
else:
# User wants SSL verification, and it *can* be provided.
- context = ssl.create_default_context()
+ context = ssl.create_default_context() # novm
else:
# User has explicitly indicated that they do not want SSL
# verification.