summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-10-23 06:18:24 -0400
committerScott Moser <smoser@ubuntu.com>2012-10-23 06:18:24 -0400
commit923f5c70fbff04ff538a5df17c300a9f39a85180 (patch)
tree4ad53f7661ae86c5040830d604cf7fbf015856f4
parent605c10763752582af139f8677f1f907705564824 (diff)
downloadvyos-cloud-init-923f5c70fbff04ff538a5df17c300a9f39a85180.tar.gz
vyos-cloud-init-923f5c70fbff04ff538a5df17c300a9f39a85180.zip
fix pep8/pylint
-rw-r--r--cloudinit/distros/__init__.py2
-rw-r--r--tests/unittests/test_datasource/test_configdrive.py5
-rw-r--r--tests/unittests/test_distros/test_user_data_normalize.py1
3 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index abd6cc48..cac3ed7a 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -424,7 +424,7 @@ def _normalize_groups(grp_cfg):
# configuration.
#
# The output is a dictionary of user
-# names => user config which is the standard
+# names => user config which is the standard
# form used in the rest of cloud-init. Note
# the default user will have a special config
# entry 'default' which will be marked as true
diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/test_datasource/test_configdrive.py
index 4fa13db8..00379e03 100644
--- a/tests/unittests/test_datasource/test_configdrive.py
+++ b/tests/unittests/test_datasource/test_configdrive.py
@@ -6,11 +6,10 @@ import os.path
import mocker
from mocker import MockerTestCase
-from cloudinit.sources import DataSourceConfigDrive as ds
+from cloudinit import helpers
from cloudinit import settings
+from cloudinit.sources import DataSourceConfigDrive as ds
from cloudinit import util
-from cloudinit import helpers
-
PUBKEY = u'ssh-rsa AAAAB3NzaC1....sIkJhq8wdX+4I3A4cYbYP ubuntu@server-460\n'
diff --git a/tests/unittests/test_distros/test_user_data_normalize.py b/tests/unittests/test_distros/test_user_data_normalize.py
index f27af826..8f0d8896 100644
--- a/tests/unittests/test_distros/test_user_data_normalize.py
+++ b/tests/unittests/test_distros/test_user_data_normalize.py
@@ -14,6 +14,7 @@ bcfg = {
'groups': ["foo"]
}
+
class TestUGNormalize(MockerTestCase):
def _make_distro(self, dtype, def_user=None):