From 1a17d631143c7a285b834fabd1cc9fcc2baaa6fa Mon Sep 17 00:00:00 2001
From: Gustavo Jose de Sousa <gustavo.sousa@intel.com>
Date: Fri, 5 Feb 2016 12:21:23 +0000
Subject: [PATCH] waf: reorganize imports in main wscript

---
 wscript | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/wscript b/wscript
index 5bcd854d0e..e252ab03fc 100644
--- a/wscript
+++ b/wscript
@@ -10,9 +10,7 @@ sys.path.insert(0, 'Tools/ardupilotwaf/')
 import ardupilotwaf
 import boards
 
-from waflib import ConfigSet, Utils
-from waflib.Build import BuildContext
-import waflib.Context
+from waflib import Build, ConfigSet, Context, Utils
 
 # TODO: implement a command 'waf help' that shows the basic tasks a
 # developer might want to do: e.g. how to configure a board, compile a
@@ -35,8 +33,8 @@ def init(ctx):
         return
 
     # define the variant build commands according to the board
-    for c in waflib.Context.classes:
-        if not issubclass(c, BuildContext):
+    for c in Context.classes:
+        if not issubclass(c, Build.BuildContext):
             continue
         c.variant = env.BOARD