Use absolute_import from the __future__ everywhere

[bup.git] / main.py

diff --git a/main.py b/main.py
index 119826564d7266815639d978c9d11400c5364ddc..edb3ed88fa4196cafa26e81be957d08c634684fd 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -5,6 +5,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 """
 # end of bup preamble
 
+from __future__ import absolute_import
 import errno, re, sys, os, subprocess, signal, getopt
 
 from fcntl import F_GETFL, F_SETFL
@@ -35,7 +36,7 @@ os.environ['BUP_MAIN_EXE'] = os.path.abspath(exe)
 os.environ['BUP_RESOURCE_PATH'] = resourcepath
 
 
-from bup import helpers
+from bup import compat, helpers
 from bup.compat import add_ex_tb, chain_ex, wrap_main
 from bup.helpers import atoi, columnate, debug1, log, tty_width
 
@@ -215,7 +216,7 @@ def filter_output(src_out, src_err, dest_out, dest_err):
         pending_ex = chain_ex(add_ex_tb(ex), pending_ex)
     try:
         # Try to finish each of the streams
-        for fd, pending_items in pending.iteritems():
+        for fd, pending_items in compat.items(pending):
             dest = dest_out if fd == src_out else dest_err
             try:
                 print_clean_line(dest, pending_items, width)