summaryrefslogtreecommitdiff
path: root/cloudinit/url_helper.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-05-12 10:56:26 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-05-12 10:56:26 -0700
commitf11827aee59cf2678c3d2a157218a3fe2831f5c2 (patch)
tree94c8f39d66d003b7d0d211dd521b64b5041287b3 /cloudinit/url_helper.py
parent690bdce9a73ec6d00b4eebbbca31cc527e7b2fce (diff)
downloadcloud-init-git-f11827aee59cf2678c3d2a157218a3fe2831f5c2.tar.gz
Fix up a ton of flake8 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