]> arthur.barton.de Git - bup.git/commit
Use absolute_import from the __future__ everywhere
authorRob Browning <rlb@defaultvalue.org>
Sat, 27 Jan 2018 17:40:02 +0000 (11:40 -0600)
committerRob Browning <rlb@defaultvalue.org>
Sat, 27 Jan 2018 17:45:11 +0000 (11:45 -0600)
commitc40b3dd5fd74e72024fbaad3daf5a958aefa1c54
tree713d195c88c482291d5d4d282cdf8c2912f76c1c
parent6df109426b0b22f016ccf67414d140655ac5d3c5
Use absolute_import from the __future__ everywhere

Without this, among other things, we can end up with conflicts with
new upstream modules.  For example, given lib/bup/io.py:

  Traceback (most recent call last):
    File "/home/rlb/src/bup/main-4/cmd/bup-index", line 10, in <module>
      from bup import metadata, options, git, index, drecurse, hlinkdb
    File "/home/rlb/src/bup/main-4/lib/bup/metadata.py", line 10, in <module>
      from io import BytesIO
  ImportError: cannot import name BytesIO

This switch also revealed a circular dependency between midx and git,
and several places where we weren't qualifying our bup imports
properly, i.e. "import git" rather than "from bup import git".

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>
85 files changed:
buptest.py
cmd/bloom-cmd.py
cmd/cat-file-cmd.py
cmd/daemon-cmd.py
cmd/damage-cmd.py
cmd/drecurse-cmd.py
cmd/fsck-cmd.py
cmd/ftp-cmd.py
cmd/fuse-cmd.py
cmd/gc-cmd.py
cmd/help-cmd.py
cmd/import-duplicity-cmd.py
cmd/index-cmd.py
cmd/init-cmd.py
cmd/join-cmd.py
cmd/list-idx-cmd.py
cmd/ls-cmd.py
cmd/margin-cmd.py
cmd/memtest-cmd.py
cmd/meta-cmd.py
cmd/midx-cmd.py
cmd/mux-cmd.py
cmd/on--server-cmd.py
cmd/on-cmd.py
cmd/prune-older-cmd.py
cmd/random-cmd.py
cmd/restore-cmd.py
cmd/rm-cmd.py
cmd/save-cmd.py
cmd/server-cmd.py
cmd/split-cmd.py
cmd/tag-cmd.py
cmd/tick-cmd.py
cmd/version-cmd.py
cmd/web-cmd.py
cmd/xstat-cmd.py
lib/bup/bloom.py
lib/bup/client.py
lib/bup/compat.py
lib/bup/csetup.py
lib/bup/drecurse.py
lib/bup/gc.py
lib/bup/git.py
lib/bup/hashsplit.py
lib/bup/helpers.py
lib/bup/hlinkdb.py
lib/bup/index.py
lib/bup/ls.py
lib/bup/metadata.py
lib/bup/midx.py
lib/bup/options.py
lib/bup/path.py
lib/bup/repo.py
lib/bup/rm.py
lib/bup/shquote.py
lib/bup/ssh.py
lib/bup/t/__init__.py
lib/bup/t/tbloom.py
lib/bup/t/tclient.py
lib/bup/t/tgit.py
lib/bup/t/thashsplit.py
lib/bup/t/thelpers.py
lib/bup/t/tindex.py
lib/bup/t/tmetadata.py
lib/bup/t/toptions.py
lib/bup/t/tshquote.py
lib/bup/t/tvfs.py
lib/bup/t/tvint.py
lib/bup/t/txstat.py
lib/bup/version.py
lib/bup/vfs.py
lib/bup/vint.py
lib/bup/xstat.py
main.py
t/data-size
t/hardlink-sets
t/id-other-than
t/mksock
t/ns-timestamp-resolutions
t/root-status
t/subtree-hash
t/test-ftp
t/test-prune-older
t/unknown-owner
wvtest.py