summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cloudinit/url_helper.py4
-rw-r--r--cloudinit/util.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
index 0a5be0b3..4e814a5f 100644
--- a/cloudinit/url_helper.py
+++ b/cloudinit/url_helper.py
@@ -47,7 +47,7 @@ try:
_REQ_VER = LooseVersion(_REQ.version) # pylint: disable=no-member
if _REQ_VER >= LooseVersion('0.8.8'):
SSL_ENABLED = True
- if _REQ_VER >= LooseVersion('0.7.0') and _REQ_VER < LooseVersion('1.0.0'):
+ if LooseVersion('0.7.0') <= _REQ_VER < LooseVersion('1.0.0'):
CONFIG_ENABLED = True
except ImportError:
pass
@@ -121,7 +121,7 @@ class UrlResponse(object):
upper = 300
if redirects_ok:
upper = 400
- if self.code >= 200 and self.code < upper:
+ if 200 <= self.code < upper:
return True
else:
return False
diff --git a/cloudinit/util.py b/cloudinit/util.py
index b03b80c3..1d6cd1c5 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -546,7 +546,7 @@ def is_ipv4(instr):
return False
try:
- toks = [x for x in toks if int(x) < 256 and int(x) >= 0]
+ toks = [x for x in toks if 0 <= int(x) < 256]
except Exception:
return False