diff options
| author | Monty Taylor <mordred@inaugust.com> | 2012-02-20 12:21:59 -0800 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2012-02-20 12:21:59 -0800 |
| commit | f86ec68be715073fbdcc6ef21f6053deea710289 (patch) | |
| tree | f67ec8347e00bd48305bc3b71b8e576fb6e25b5f | |
| parent | eab6a9fa761cb6631609366927fc02b0efe2555d (diff) | |
| download | nova-f86ec68be715073fbdcc6ef21f6053deea710289.tar.gz nova-f86ec68be715073fbdcc6ef21f6053deea710289.tar.xz nova-f86ec68be715073fbdcc6ef21f6053deea710289.zip | |
Stop ignoring E202.
There is absolutely no reason to ignore E202 in the pep8 checks.
Change-Id: I4abf767639dd94e9e8b7b4a405b4a702a554b876
| -rw-r--r-- | nova/tests/api/openstack/compute/test_servers.py | 2 | ||||
| -rw-r--r-- | nova/virt/disk/api.py | 2 | ||||
| -rwxr-xr-x | run_tests.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 4a78c3c3a..e9607bd7c 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -2140,7 +2140,7 @@ class ServersControllerCreateTest(test.TestCase): res = self.controller.create(req, body).obj server = res['server'] - self.assertTrue('adminPass' in body['server'] ) + self.assertTrue('adminPass' in body['server']) self.assertTrue('adminPass' not in server) def test_create_instance_admin_pass_empty(self): diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 51e8f1907..42ad683a6 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -397,7 +397,7 @@ def _set_passwd(username, admin_passwd, passwd_file, shadow_file): 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' '0123456789./') # encryption algo - id pairs for crypt() - algos = {'SHA-512': '$6$', 'SHA-256': '$5$', 'MD5': '$1$', 'DES': '' } + algos = {'SHA-512': '$6$', 'SHA-256': '$5$', 'MD5': '$1$', 'DES': ''} salt = 16 * ' ' salt = ''.join([random.choice(salt_set) for c in salt]) diff --git a/run_tests.sh b/run_tests.sh index 73543f18f..179164510 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -123,7 +123,7 @@ function run_pep8 { # other than what the PEP8 tool claims. It is deprecated in Python 3, so, # perhaps the mistake was thinking that the deprecation applied to Python 2 # as well. - pep8_opts="--ignore=E202,W602 --repeat" + pep8_opts="--ignore=W602 --repeat" ${wrapper} pep8 ${pep8_opts} ${srcfiles} } |