From d9722e9ed60a4ca8f58eae5992a8feb34da90b08 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 25 Oct 2016 09:49:34 -0400
Subject: [PATCH] Move CoprClient imports inside the functions where they are
 referenced.

---
 module_build_service/builder.py | 7 ++-----
 module_build_service/pdc.py     | 9 ++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 55ee16fd..d5ce5a26 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -53,11 +53,6 @@ import module_build_service.utils
 
 logging.basicConfig(level=logging.DEBUG)
 
-try:
-    from copr.client import CoprClient
-except ImportError:
-    log.exception("Failed to import CoprClient.")
-
 # TODO: read defaults from module_build_service's config
 KOJI_DEFAULT_GROUPS = {
     'build': [
@@ -814,6 +809,8 @@ class CoprModuleBuilder(GenericBuilder):
         m1 = db.session.query(ModuleBuild).first()
         m1.mmd().dump(modulemd)
 
+        from copr.client import CoprClient
+
         # @TODO how the authentication is designed?
         username, copr = "@copr", "modules"
         client = CoprClient.create_from_file_config()
diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py
index adda17cf..c637d5f3 100644
--- a/module_build_service/pdc.py
+++ b/module_build_service/pdc.py
@@ -31,11 +31,6 @@ from pdc_client import PDCClient
 import logging
 log = logging.getLogger()
 
-try:
-    from copr.client import CoprClient
-except ImportError:
-    log.exception("Failed to import CoprClient.")
-
 import six
 import module_build_service
 
@@ -180,6 +175,10 @@ def get_module_repo(session, module_info, strict=False, config=module_build_serv
     if module["koji_tag"] != "-":
         raise NotImplementedError
 
+    # TODO We should revisit the decision to include CoprClient code in the
+    # pdc.py module.
+    from copr.client import CoprClient
+
     # Module was built in Copr
     # @TODO get the correct user
     owner, nvr = "@copr", module["variant_id"]