Tidy up feature imports

- Move `api_common` module from steps to support as it contains no steps
- Rearrange all imports to:
  - Use relative imports where appropriate
  - Separate imports into system, 3rd party and local
  - Alphabetise imports within each group

features/environment.py

@@ -1,9 +1,10 @@
 import logging
 import os
 import sys
-from features.support.splinter_client import SplinterClient
 
-from features.support.stagecraft import stop_stagecraft_service_if_running
+from .support.splinter_client import SplinterClient
+from .support.stagecraft import stop_stagecraft_service_if_running
+
 
 sys.path.append(
     os.path.join(os.path.dirname(__file__), '..')

features/steps/admin.py

@@ -1,7 +1,8 @@
-from behave import given
 import os
 import shutil
 
+from behave import given
+
 
 @given(u'a file named "{filename}" with fixture "{fixturename}"')
 def step(context, filename, fixturename):

features/steps/authentication.py

@@ -1,5 +1,6 @@
-from behave import *
-from ..support.authentication import \
+from behave import given
+
+from features.support.authentication import \
     ensure_user_has_permissions, ensure_user_exists
 
 

features/steps/read_api.py

@@ -1,13 +1,16 @@
+import datetime
 import os
 import re
+
 from behave import given, when, then, step_matcher
+from dateutil import parser
 from flask import json
 from hamcrest import assert_that, is_, matches_regexp, has_length, equal_to, \
     has_item, has_entries, has_entry
-from dateutil import parser
-import datetime
 import pytz
-from api_common import ensure_data_set_exists
+
+from features.support.api_common import ensure_data_set_exists
+from features.support.stagecraft import create_or_update_stagecraft_service
 
 
 FIXTURE_PATH = os.path.join(os.path.dirname(__file__), '..', 'fixtures')

features/steps/splinter.py

@@ -1,6 +1,9 @@
-import json
 import datetime
-from hamcrest import *
+import json
+
+from behave import when, when
+from hamcrest import contains_inanyorder, has_items, has_entries, \
+    assert_that, is_
 
 from backdrop.core.timeutils import utc
 

features/steps/write_api.py

@@ -1,8 +1,10 @@
 import os
+
 from behave import given, when, then
 from dateutil import parser
 from hamcrest import assert_that, has_length, equal_to
 
+
 FIXTURE_PATH = os.path.join(os.path.dirname(__file__), '..', 'fixtures')
 
 

features/steps/api_common.py → features/support/api_common.py

@@ -1,4 +1,5 @@
-from features.support.stagecraft import create_or_update_stagecraft_service
+from .stagecraft import create_or_update_stagecraft_service
+
 
 TEST_STAGECRAFT_PORT = 3204
 

features/support/authentication.py

@@ -1,4 +1,4 @@
-from stagecraft import create_or_update_stagecraft_service
+from .stagecraft import create_or_update_stagecraft_service
 
 
 TEST_STAGECRAFT_PORT = 3204

features/support/flask_test_client.py

@@ -1,4 +1,4 @@
-from features.support.support import BaseClient
+from .support import BaseClient
 
 
 class FlaskTestClient(BaseClient):

features/support/http_test_client.py

@@ -1,6 +1,7 @@
 from pymongo import MongoClient
 import requests
-from features.support.support import FlaskApp, BaseClient
+
+from .support import FlaskApp, BaseClient
 
 
 class HTTPTestClient(BaseClient):

features/support/splinter_client.py

@@ -1,12 +1,13 @@
 from datetime import datetime
 import logging
+
 from pymongo import MongoClient
 from splinter import Browser
 
-from features.support.support import FlaskApp, BaseClient
+from .support import FlaskApp, BaseClient
 
 
-logger = logging.getLogger(__name__)
+log = logging.getLogger(__name__)
 
 
 class SplinterClient(BaseClient):
@@ -41,11 +42,11 @@ def _save_screenshot(self, filename):
         try:
             success = self.browser.driver.save_screenshot(filename)
             if not success:
-                logger.warn(
+                log.warn(
                     "Unable to save screenshot %s: IO error" % filename)
         except Exception as e:
-            logger.warn("Unable to save screenshot %s: Exception" % filename)
-            logger.warn(e)
+            log.warn("Unable to save screenshot %s: Exception" % filename)
+            log.warn(e)
 
 
 class SplinterResponse:

features/support/stagecraft.py

@@ -1,10 +1,10 @@
 import os
+from multiprocessing import Process
 
 from flask import Flask, Response, abort, json, request
-from multiprocessing import Process
 import requests
 
-from features.support.support import wait_until
+from .support import wait_until
 
 
 def create_or_update_stagecraft_service(context, port, routes):

features/support/support.py

@@ -1,6 +1,7 @@
 import os
 import subprocess
 import time
+
 import requests