summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-08-22 14:12:32 -0400
committerScott Moser <smoser@ubuntu.com>2012-08-22 14:12:32 -0400
commit451e48732ff7885502db2f8296777fa58b670f3b (patch)
treecf2578bd0ba2849525e44b58b0bfce49f40ec2fe /tools
parent49242c2a2e7e0ab6812de741b4ac2e8d1888ad08 (diff)
downloadvyos-cloud-init-451e48732ff7885502db2f8296777fa58b670f3b.tar.gz
vyos-cloud-init-451e48732ff7885502db2f8296777fa58b670f3b.zip
fix pep8 complaints.
make pep8 now is silent on precise's pep8 ( 0.6.1-2ubuntu2).
Diffstat (limited to 'tools')
-rwxr-xr-xtools/hacking.py4
-rwxr-xr-xtools/mock-meta.py24
2 files changed, 14 insertions, 14 deletions
diff --git a/tools/hacking.py b/tools/hacking.py
index a2e6e829..11163df3 100755
--- a/tools/hacking.py
+++ b/tools/hacking.py
@@ -100,7 +100,7 @@ def cloud_todo_format(physical_line):
"""
pos = physical_line.find('TODO')
pos1 = physical_line.find('TODO(')
- pos2 = physical_line.find('#') # make sure it's a comment
+ pos2 = physical_line.find('#') # make sure it's a comment
if (pos != pos1 and pos2 >= 0 and pos2 < pos):
return pos, "N101: Use TODO(NAME)"
@@ -133,7 +133,6 @@ def cloud_docstring_multiline_end(physical_line):
return (pos, "N403: multi line docstring end on new line")
-
current_file = ""
@@ -169,4 +168,3 @@ if __name__ == "__main__":
if len(_missingImport) > 0:
print >> sys.stderr, ("%i imports missing in this test environment"
% len(_missingImport))
-
diff --git a/tools/mock-meta.py b/tools/mock-meta.py
index 78838f64..c79f0598 100755
--- a/tools/mock-meta.py
+++ b/tools/mock-meta.py
@@ -6,7 +6,7 @@
"""
To use this to mimic the EC2 metadata service entirely, run it like:
- # Where 'eth0' is *some* interface.
+ # Where 'eth0' is *some* interface.
sudo ifconfig eth0:0 169.254.169.254 netmask 255.255.255.255
sudo ./mock-meta.py -a 169.254.169.254 -p 80
@@ -23,7 +23,7 @@ import json
import logging
import os
import random
-import string # pylint: disable=W0402
+import string # pylint: disable=W0402
import sys
import yaml
@@ -156,6 +156,8 @@ def traverse(keys, mp):
ID_CHARS = [c for c in (string.ascii_uppercase + string.digits)]
+
+
def id_generator(size=6, lower=False):
txt = ''.join(random.choice(ID_CHARS) for x in range(size))
if lower:
@@ -235,11 +237,11 @@ class MetaDataHandler(object):
nparams = params[1:]
# This is a weird kludge, why amazon why!!!
# public-keys is messed up, list of /latest/meta-data/public-keys/
- # shows something like: '0=brickies'
- # but a GET to /latest/meta-data/public-keys/0=brickies will fail
- # you have to know to get '/latest/meta-data/public-keys/0', then
- # from there you get a 'openssh-key', which you can get.
- # this hunk of code just re-works the object for that.
+ # shows something like: '0=brickies'
+ # but a GET to /latest/meta-data/public-keys/0=brickies will fail
+ # you have to know to get '/latest/meta-data/public-keys/0', then
+ # from there you get a 'openssh-key', which you can get.
+ # this hunk of code just re-works the object for that.
avail_keys = get_ssh_keys()
key_ids = sorted(list(avail_keys.keys()))
if nparams:
@@ -255,7 +257,7 @@ class MetaDataHandler(object):
"openssh-key": "\n".join(avail_keys[key_name]),
})
if isinstance(result, (dict)):
- # TODO: This might not be right??
+ # TODO(harlowja): This might not be right??
result = "\n".join(sorted(result.keys()))
if not result:
result = ''
@@ -304,13 +306,13 @@ class UserDataHandler(object):
blob = "\n".join(lines)
return blob.strip()
- def get_data(self, params, who, **kwargs): # pylint: disable=W0613
+ def get_data(self, params, who, **kwargs): # pylint: disable=W0613
if not params:
return self._get_user_blob(who=who)
return NOT_IMPL_RESPONSE
-# Seem to need to use globals since can't pass
+# Seem to need to use globals since can't pass
# data into the request handlers instances...
# Puke!
meta_fetcher = None
@@ -432,7 +434,7 @@ def setup_fetchers(opts):
def run_server():
- # Using global here since it doesn't seem like we
+ # Using global here since it doesn't seem like we
# can pass opts into a request handler constructor...
opts = extract_opts()
setup_logging(logging.DEBUG)