From a8421568f96846ab79dd5eb47198e2704c9bdf42 Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Wed, 8 Nov 2017 08:45:58 -0500
Subject: [PATCH] Fix Flake8 errors

---
 module_build_service/utils.py            | 3 ---
 tests/test_build/test_build.py           | 4 ++--
 tests/test_builder/test_base.py          | 3 +--
 tests/test_scheduler/test_module_init.py | 2 +-
 tests/test_views/test_views.py           | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/module_build_service/utils.py b/module_build_service/utils.py
index 028280bf..edc3b7c7 100644
--- a/module_build_service/utils.py
+++ b/module_build_service/utils.py
@@ -593,7 +593,6 @@ def _fetch_mmd(url, branch=None, allow_local_url=False, whitelist_url=False):
     else:
         mmd.version = int(scm.version)
 
-
     return mmd, scm
 
 
@@ -836,8 +835,6 @@ def merge_included_mmd(mmd, included_mmd):
 
 def record_component_builds(mmd, module, initial_batch=1,
                             previous_buildorder=None, main_mmd=None, session=None):
-    import koji  # Placed here to avoid py2/py3 conflicts...
-
     if not session:
         session = db.session
 
diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py
index 1eb73aaf..e6f0d06c 100644
--- a/tests/test_build/test_build.py
+++ b/tests/test_build/test_build.py
@@ -939,8 +939,8 @@ class TestBuild(unittest.TestCase):
 
         # Resubmit the failed module
         rv = self.client.post('/module-build-service/1/module-builds/', data=json.dumps(
-                {'branch': 'master', 'scmurl': 'git://pkgs.stg.fedoraproject.org/modules/'
-                    'testmodule.git?#7fea453'}))
+            {'branch': 'master', 'scmurl': ('git://pkgs.stg.fedoraproject.org/modules/'
+                                            'testmodule.git?#7fea453')}))
 
         FakeModuleBuilder.BUILD_STATE = 'BUILDING'
         FakeModuleBuilder.INSTANT_COMPLETE = True
diff --git a/tests/test_builder/test_base.py b/tests/test_builder/test_base.py
index 789bf94f..3371c1eb 100644
--- a/tests/test_builder/test_base.py
+++ b/tests/test_builder/test_base.py
@@ -21,12 +21,11 @@
 # Written by Jan Kaluza <jkaluza@redhat.com>
 
 import unittest
-import koji
 
 import module_build_service.models
 import module_build_service.builder
 
-from tests import conf, init_data, db
+from tests import init_data, db
 
 from module_build_service.builder import GenericBuilder
 from mock import patch
diff --git a/tests/test_scheduler/test_module_init.py b/tests/test_scheduler/test_module_init.py
index 09c7be15..96597ec5 100644
--- a/tests/test_scheduler/test_module_init.py
+++ b/tests/test_scheduler/test_module_init.py
@@ -25,7 +25,7 @@ import unittest
 from mock import patch, PropertyMock
 import vcr
 
-from tests import conf, db, clean_database
+from tests import conf, clean_database
 from tests.test_views.test_views import FakeSCM
 import module_build_service.messaging
 import module_build_service.scheduler.handlers.modules
diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py
index 1fb909e0..04b4b431 100644
--- a/tests/test_views/test_views.py
+++ b/tests/test_views/test_views.py
@@ -533,7 +533,7 @@ class TestViews(unittest.TestCase):
 
         rv = self.client.post('/module-build-service/1/module-builds/', data=json.dumps(
             {'branch': 'master', 'rebuild_strategy': 'only-changed',
-                'scmurl': ('git://pkgs.stg.fedoraproject.org/modules/testmodule.git?'
+             'scmurl': ('git://pkgs.stg.fedoraproject.org/modules/testmodule.git?'
                         '#68931c90de214d9d13feefbd35246a81b6cb8d49')}))
         data = json.loads(rv.data)
         self.assertEqual(rv.status_code, 400)