summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceMAAS.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-03-02 16:34:46 -0500
committerScott Moser <smoser@ubuntu.com>2015-03-02 16:34:46 -0500
commit72958f9c40f53c634d1eb7ef55547271e1972d2c (patch)
treeeb15f21f1861200ea628a03b17f5466ad5d83fc7 /cloudinit/sources/DataSourceMAAS.py
parenta934ae9543ccc9c13fbdedddcc04fa82853a7ec2 (diff)
downloadvyos-cloud-init-72958f9c40f53c634d1eb7ef55547271e1972d2c.tar.gz
vyos-cloud-init-72958f9c40f53c634d1eb7ef55547271e1972d2c.zip
DataSourceMAAS: fix oauthlib imports
In both python2 and python3, This throws "'module' object has no attribute 'oauth1'" $ python3 -c 'import oauthlib; oauthlib.oauth1.Client("x")' While this works fine: $ python3 -c 'import oauthlib.oauth1 as oauth1; oauth1.Client("x")'
Diffstat (limited to 'cloudinit/sources/DataSourceMAAS.py')
-rw-r--r--cloudinit/sources/DataSourceMAAS.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceMAAS.py b/cloudinit/sources/DataSourceMAAS.py
index 35c5b5e1..6cc010b7 100644
--- a/cloudinit/sources/DataSourceMAAS.py
+++ b/cloudinit/sources/DataSourceMAAS.py
@@ -22,7 +22,7 @@ from __future__ import print_function
from email.utils import parsedate
import errno
-import oauthlib
+import oauthlib.oauth1 as oauth1
import os
import time
@@ -283,12 +283,12 @@ def check_seed_contents(content, seed):
def oauth_headers(url, consumer_key, token_key, token_secret, consumer_secret,
timestamp=None):
- client = oauthlib.oauth1.Client(
+ client = oauth1.Client(
consumer_key,
client_secret=consumer_secret,
resource_owner_key=token_key,
resource_owner_secret=token_secret,
- signature_method=oauthlib.SIGNATURE_PLAINTEXT)
+ signature_method=oauth1.SIGNATURE_PLAINTEXT)
uri, signed_headers, body = client.sign(url)
return signed_headers