From 188986fac37aa0c12b645283dbe12cabb6cf6822 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Fri, 7 Nov 2014 19:00:57 +0200
Subject: Harmonise held_object usage somewhat.

---
 build.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'build.py')

diff --git a/build.py b/build.py
index ca87c26..265f2eb 100644
--- a/build.py
+++ b/build.py
@@ -236,9 +236,7 @@ class BuildTarget():
             d = [d]
         newd = []
         for i in d:
-            if hasattr(i, 'el'):
-                newd.append(i.el)
-            elif hasattr(i, 'held_object'):
+            if hasattr(i, 'held_object'):
                 newd.append(i.held_object)
             else:
                 newd.append(i)
@@ -420,8 +418,8 @@ class BuildTarget():
 
     def add_external_deps(self, deps):
         for dep in deps:
-            if hasattr(dep, 'el'):
-                dep = dep.el
+            if hasattr(dep, 'held_object'):
+                dep = dep.held_object
             if not isinstance(dep, dependencies.Dependency):
                 raise InvalidArguments('Argument is not an external dependency')
             self.external_deps.append(dep)
@@ -504,8 +502,6 @@ class Generator():
             exe = args[0].held_object
             if not isinstance(exe, Executable):
                 raise InvalidArguments('First generator argument must be an executable.')
-        elif hasattr(args[0], 'ep'):
-            exe = args[0].ep
         else:
             raise InvalidArguments('First generator argument must be an executable object.')
         self.exe = exe
@@ -710,8 +706,6 @@ class CustomTarget:
             cmd = [cmd]
         final_cmd = []
         for i, c in enumerate(cmd):
-            if hasattr(c, 'ep'):
-                c = c.ep
             if hasattr(c, 'held_object'):
                 c = c.held_object
             if isinstance(c, str):
-- 
cgit v1.1