From 7b2bea56f31ed50da64d970c9f514a0d22a17877 Mon Sep 17 00:00:00 2001
From: shuangtai <shuangtai.tian@intel.com>
Date: Wed, 11 Jun 2014 14:51:35 +0800
Subject: [PATCH] Fix E126,H104 violations and re-enable gating

E126 and H104 got stricter in hacking 0.9, so fix new violations and
re-enable gating.

Change-Id: I09704ae7397b00045303ac102bf7ba37d870a7f6
---
 ceilometer/api/app.py                                         | 3 +--
 ceilometer/image/glance.py                                    | 3 +--
 ceilometer/storage/sqlalchemy/migrate_repo/__init__.py        | 1 -
 .../storage/sqlalchemy/migrate_repo/versions/__init__.py      | 1 -
 ceilometer/tests/alarm/test_notifier.py                       | 3 +--
 ceilometer/tests/storage/test_storage_scenarios.py            | 3 +--
 tox.ini                                                       | 4 +---
 7 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py
index 3cd9323ed9..b578b98f72 100644
--- a/ceilometer/api/app.py
+++ b/ceilometer/api/app.py
@@ -54,8 +54,7 @@ def setup_app(pecan_config=None, extra_hooks=None):
     # FIXME: Replace DBHook with a hooks.TransactionHook
     app_hooks = [hooks.ConfigHook(),
                  hooks.DBHook(
-                     storage.get_connection_from_config(cfg.CONF),
-                 ),
+                     storage.get_connection_from_config(cfg.CONF),),
                  hooks.PipelineHook(),
                  hooks.TranslationHook()]
     if extra_hooks:
diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py
index d088a5e885..6690f60b36 100644
--- a/ceilometer/image/glance.py
+++ b/ceilometer/image/glance.py
@@ -97,8 +97,7 @@ class _Base(plugin.CentralPollster):
                         "checksum",
                         "deleted_at",
                         "min_ram",
-                        "size",
-                    ])
+                        "size", ])
 
 
 class ImagePollster(_Base):
diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/__init__.py b/ceilometer/storage/sqlalchemy/migrate_repo/__init__.py
index 2f288d3cf1..e69de29bb2 100644
--- a/ceilometer/storage/sqlalchemy/migrate_repo/__init__.py
+++ b/ceilometer/storage/sqlalchemy/migrate_repo/__init__.py
@@ -1 +0,0 @@
-# template repository default module
diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/__init__.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/__init__.py
index 507b5ff6bd..e69de29bb2 100644
--- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/__init__.py
+++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/__init__.py
@@ -1 +0,0 @@
-# template repository default versions module
diff --git a/ceilometer/tests/alarm/test_notifier.py b/ceilometer/tests/alarm/test_notifier.py
index 6774214f8a..5e9c2f4d60 100644
--- a/ceilometer/tests/alarm/test_notifier.py
+++ b/ceilometer/tests/alarm/test_notifier.py
@@ -81,8 +81,7 @@ class TestAlarmNotifier(tests_base.BaseTestCase):
                                   {
                                       'actions': ['log://'],
                                       'alarm_id': 'foobar',
-                                      'condition': {'threshold': 42},
-                                  })
+                                      'condition': {'threshold': 42}})
 
     @staticmethod
     def _fake_spawn_n(func, *args, **kwargs):
diff --git a/ceilometer/tests/storage/test_storage_scenarios.py b/ceilometer/tests/storage/test_storage_scenarios.py
index 31dad33178..a90a023906 100644
--- a/ceilometer/tests/storage/test_storage_scenarios.py
+++ b/ceilometer/tests/storage/test_storage_scenarios.py
@@ -38,8 +38,7 @@ class DBTestBase(tests_db.TestBase):
     def create_and_store_sample(self, timestamp=datetime.datetime.utcnow(),
                                 metadata={
                                     'display_name': 'test-server',
-                                    'tag': 'self.counter'
-                                },
+                                    'tag': 'self.counter'},
                                 name='instance',
                                 sample_type=sample.TYPE_CUMULATIVE, unit='',
                                 volume=1, user_id='user-id',
diff --git a/tox.ini b/tox.ini
index feeca9e120..f20c8f9b2f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,17 +37,15 @@ commands = python setup.py build_sphinx
 commands = {posargs}
 
 [flake8]
-# E126 continuation line over-indented for hanging indent
 # E128 continuation line under-indented for visual indent
 # E251 unexpected spaces around keyword / parameter equals
 # E265 block comment should start with ‘# ‘
 # F402 import module shadowed by loop variable
-# H104 file contains nothing but comments
 # H305 imports not grouped correctly
 # H307 like imports should be grouped together
 # H405 multi line docstring summary not separated with an empty line
 # H904 Wrap long lines in parentheses instead of a backslash
-ignore = E126,E128,E251,E265,F402,H104,H305,H307,H405,H904
+ignore = E128,E251,E265,F402,H305,H307,H405,H904
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,./ceilometer/openstack/common,*lib/python*,*egg,tools,nova_tests,build
 show-source = True