See if travis will let us get away with uniformly relative imports from the future. Sigh. Not making that up.

Author: ianamason

wllvm/as.py

@@ -33,11 +33,11 @@
 
 from subprocess import *
 
-from wllvm.utils import *
+from .utils import *
 
-from wllvm.popenwrapper import Popen
+from .popenwrapper import Popen
 
-from wllvm.arglistfilter 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,12 +10,13 @@
 linked into a library or executable.
 """
 
+from __future__ import absolute_import
 
 import sys, os
 
-from utils import getBuilder, buildObject, buildAndAttachBitcode, logging
+from .utils import getBuilder, buildObject, buildAndAttachBitcode, logging
 
-import logconfig
+import .logconfig
 
 _logger = logging.getLogger(__name__)
 

wllvm/wllvmpp.py

@@ -7,12 +7,13 @@
 file so that it can be found later after all of the objects are linked
 into a library or executable.
 """
+from __future__ import absolute_import
 
 import sys, os
 
-from utils import getBuilder, buildObject, buildAndAttachBitcode, logging
+from .utils import getBuilder, buildObject, buildAndAttachBitcode, logging
 
-import logconfig
+import .logconfig
 
 _logger = logging.getLogger(__name__)