Merge pull request #794 from alphagov/refactior

Rename api_client to service_api_client

app/__init__.py

@@ -34,7 +34,7 @@ from werkzeug.local import LocalProxy
 import app.proxy_fix
 from app.asset_fingerprinter import AssetFingerprinter
 from app.its_dangerous_session import ItsdangerousSessionInterface
-from app.notify_client.api_client import ServiceAPIClient
+from app.notify_client.service_api_client import ServiceAPIClient
 from app.notify_client.api_key_api_client import ApiKeyApiClient
 from app.notify_client.invite_api_client import InviteApiClient
 from app.notify_client.job_api_client import JobApiClient

app/main/views/all_services.py

@@ -4,7 +4,7 @@ from flask_login import login_required
 from app import service_api_client
 from app.main import main
 from app.utils import user_has_permissions
-from app.notify_client.api_client import ServicesBrowsableItem
+from app.notify_client.service_api_client import ServicesBrowsableItem
 
 
 @main.route("/all-services")

app/main/views/choose_service.py

@@ -2,7 +2,7 @@ from flask import (render_template, redirect, url_for, session)
 from flask_login import login_required, current_user
 from app.main import main
 from app import service_api_client
-from app.notify_client.api_client import ServicesBrowsableItem
+from app.notify_client.service_api_client import ServicesBrowsableItem
 
 
 @main.route("/services")