From f6d35b38f845a84e8df94be380f48b7759b8f37d Mon Sep 17 00:00:00 2001
From: Morgan Fainberg <m@metacloud.com>
Date: Sun, 18 Aug 2013 19:53:44 -0700
Subject: [PATCH] Fix and enable gating on H302: only import modules

Fixes non-module imports and enables gating on H302 in flake8

Change-Id: I366b0ca622d5185732c6c755f8724efb8bbc80f7
---
 tests/test_ec2utils.py  | 12 ++++++------
 tests/v2_0/test_auth.py |  4 ++--
 tox.ini                 |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/test_ec2utils.py b/tests/test_ec2utils.py
index a9ef36a54..7bed90ef8 100644
--- a/tests/test_ec2utils.py
+++ b/tests/test_ec2utils.py
@@ -16,7 +16,7 @@
 
 import testtools
 
-from keystoneclient.contrib.ec2.utils import Ec2Signer
+from keystoneclient.contrib.ec2 import utils
 
 
 class Ec2SignerTest(testtools.TestCase):
@@ -25,7 +25,7 @@ class Ec2SignerTest(testtools.TestCase):
         super(Ec2SignerTest, self).setUp()
         self.access = '966afbde20b84200ae4e62e09acf46b2'
         self.secret = '89cdf9e94e2643cab35b8b8ac5a51f83'
-        self.signer = Ec2Signer(self.secret)
+        self.signer = utils.Ec2Signer(self.secret)
 
     def tearDown(self):
         super(Ec2SignerTest, self).tearDown()
@@ -116,7 +116,7 @@ class Ec2SignerTest(testtools.TestCase):
         """
         # Create a new signer object with the AWS example key
         secret = 'wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY'
-        signer = Ec2Signer(secret)
+        signer = utils.Ec2Signer(secret)
 
         body_hash = ('b6359072c78d70ebee1e81adcbab4f0'
                      '1bf2c23245fa365ef83fe8f1f955085e2')
@@ -149,7 +149,7 @@ class Ec2SignerTest(testtools.TestCase):
         """Test v4 generator with host:port format."""
         # Create a new signer object with the AWS example key
         secret = 'wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY'
-        signer = Ec2Signer(secret)
+        signer = utils.Ec2Signer(secret)
 
         body_hash = ('b6359072c78d70ebee1e81adcbab4f0'
                      '1bf2c23245fa365ef83fe8f1f955085e2')
@@ -186,7 +186,7 @@ class Ec2SignerTest(testtools.TestCase):
         """
         # Create a new signer object with the AWS example key
         secret = 'wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY'
-        signer = Ec2Signer(secret)
+        signer = utils.Ec2Signer(secret)
 
         body_hash = ('b6359072c78d70ebee1e81adcbab4f0'
                      '1bf2c23245fa365ef83fe8f1f955085e2')
@@ -223,7 +223,7 @@ class Ec2SignerTest(testtools.TestCase):
         """
         # Create a new signer object with the AWS example key
         secret = 'wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY'
-        signer = Ec2Signer(secret)
+        signer = utils.Ec2Signer(secret)
 
         body_hash = ('b6359072c78d70ebee1e81adcbab4f0'
                      '1bf2c23245fa365ef83fe8f1f955085e2')
diff --git a/tests/v2_0/test_auth.py b/tests/v2_0/test_auth.py
index 2809c87dc..19cca5cdf 100644
--- a/tests/v2_0/test_auth.py
+++ b/tests/v2_0/test_auth.py
@@ -13,7 +13,7 @@
 #    under the License.
 
 import copy
-from datetime import timedelta
+import datetime
 import json
 
 import requests
@@ -60,7 +60,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
     def test_authenticate_success_expired(self):
         # Build an expired token
         self.TEST_RESPONSE_DICT['access']['token']['expires'] = \
-            (timeutils.utcnow() - timedelta(1)).isoformat()
+            (timeutils.utcnow() - datetime.timedelta(1)).isoformat()
         resp = utils.TestResponse({
             "status_code": 200,
             "text": json.dumps(self.TEST_RESPONSE_DICT),
diff --git a/tox.ini b/tox.ini
index 72f9ae958..af01c2492 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,8 +30,7 @@ downloadcache = ~/cache/pip
 # F811: redefinition of unused 'client' from line 81
 # F821: undefined name
 # F841: local variable is assigned to but never used
-# H302: import only modules
 # H304: no relative imports
-ignore = F811,F821,F841,H302,H304
+ignore = F811,F821,F841,H304
 show-source = True
 exclude = .venv,.tox,dist,doc,*egg,build