summaryrefslogtreecommitdiff
path: root/cloudinit/url_helper.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-05-12 14:25:32 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-05-12 14:25:32 -0700
commit78cbc764486060928541b9dee6ce5779e622d1fa (patch)
tree48a886ea0a9857ce353eebe504048e656e1c6e92 /cloudinit/url_helper.py
parent690bdce9a73ec6d00b4eebbbca31cc527e7b2fce (diff)
parent811f7b5b3c4590ee4a16662db37b1f37541d9822 (diff)
downloadvyos-cloud-init-78cbc764486060928541b9dee6ce5779e622d1fa.tar.gz
vyos-cloud-init-78cbc764486060928541b9dee6ce5779e622d1fa.zip
Enable flake8 and fix a large amount of reported issues
Diffstat (limited to 'cloudinit/url_helper.py')
-rw-r--r--cloudinit/url_helper.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
index 936f7da5..c05e9d90 100644
--- a/cloudinit/url_helper.py
+++ b/cloudinit/url_helper.py
@@ -28,8 +28,9 @@ import time
from email.utils import parsedate
from functools import partial
-from requests import exceptions
+
import oauthlib.oauth1 as oauth1
+from requests import exceptions
from six.moves.urllib.parse import (
urlparse, urlunparse,
@@ -61,7 +62,7 @@ try:
SSL_ENABLED = True
if _REQ_VER >= LooseVersion('0.7.0') and _REQ_VER < LooseVersion('1.0.0'):
CONFIG_ENABLED = True
-except:
+except ImportError:
pass