Merge branch 'master' of https://github.com/SRI-CSL/whole-program-llvm

Author: ianamason

wllvm/as.py

@@ -27,16 +27,17 @@
 """
 
 from __future__ import absolute_import
+
 import sys
 import os
 
 from subprocess import *
 
-from wllvm.utils import *
+from .utils import *
 
-from wllvm.popenwrapper import Popen
+from .popenwrapper import Popen
 
-from wllvm.argumentlistfilter import ArgumentListFilter
+from .arglistfilter import ArgumentListFilter
 
 import logging
 logging.basicConfig()

wllvm/extractor.py

@@ -20,10 +20,11 @@
 that contains a section called __llvm_bc.
 
 """
+from __future__ import absolute_import
 
 import sys
 
-from extraction import *
+from .extraction import *
 
 def main():
     try:

wllvm/wllvm.py

@@ -10,7 +10,6 @@
 linked into a library or executable.
 """
 
-
 import sys, os
 
 from utils import getBuilder, buildObject, buildAndAttachBitcode, logging

wllvm/wllvmpp.py

@@ -7,7 +7,6 @@
 file so that it can be found later after all of the objects are linked
 into a library or executable.
 """
-
 import sys, os
 
 from utils import getBuilder, buildObject, buildAndAttachBitcode, logging