[Reproducible-commits] [reprotest] 01/06: Reorganize imports so lib/ is an ordinary package

[Ceridwen]

This is an automated email from the git hooks/post-receive script.

ceridwen-guest pushed a commit to branch virtualization
in repository reprotest.

commit 6f0eb7ff5f4b09263f7cc03d16490a6f26c37a8c
Author: Ceridwen <ceridwenv at gmail.com>
Date:   Mon Jun 20 10:14:09 2016 -0400

    Reorganize imports so lib/ is an ordinary package
---
 reprotest/__init__.py         |  2 ++
 reprotest/lib/VirtSubproc.py  |  2 +-
 reprotest/lib/__init__.py     |  0
 reprotest/lib/adt_binaries.py |  6 ++++--
 reprotest/lib/adt_testbed.py  | 11 ++++++++---
 reprotest/lib/testdesc.py     | 10 ++++++----
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index e6acbe8..58b51af 100644
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -16,6 +16,8 @@ import time
 import traceback
 import types
 
+from reprotest.lib import adt_testbed
+
 # time zone, locales, disorderfs, host name, user/group, shell, CPU
 # number, architecture for uname (using linux64), umask, HOME, see
 # also: https://tests.reproducible-builds.org/index_variations.html
diff --git a/reprotest/lib/VirtSubproc.py b/reprotest/lib/VirtSubproc.py
index 19b4e0f..86be017 100644
--- a/reprotest/lib/VirtSubproc.py
+++ b/reprotest/lib/VirtSubproc.py
@@ -35,7 +35,7 @@ import pipes
 import socket
 import shutil
 
-import adtlog
+from reprotest.lib import adtlog
 
 progname = "<VirtSubproc>"
 devnull_read = open('/dev/null', 'r')
diff --git a/reprotest/lib/__init__.py b/reprotest/lib/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/reprotest/lib/adt_binaries.py b/reprotest/lib/adt_binaries.py
index c723c37..cf99514 100644
--- a/reprotest/lib/adt_binaries.py
+++ b/reprotest/lib/adt_binaries.py
@@ -26,8 +26,10 @@ import atexit
 import shutil
 import errno
 
-import adtlog
-import adt_testbed
+# TODO: not sure if this file is necessary
+
+# import adtlog
+# import adt_testbed
 
 
 class DebBinaries:
diff --git a/reprotest/lib/adt_testbed.py b/reprotest/lib/adt_testbed.py
index 7904bf6..dcc20d5 100644
--- a/reprotest/lib/adt_testbed.py
+++ b/reprotest/lib/adt_testbed.py
@@ -33,10 +33,15 @@ import tempfile
 import shutil
 import urllib.parse
 
-from debian import debian_support
 
-import adtlog
-import VirtSubproc
+# TODO: removing this import disables install_tmp, may want to restore
+# it at some point if I'm improving support for building Debian packages in
+# particular.
+
+# from debian import debian_support
+
+from reprotest.lib import adtlog
+from reprotest.lib import VirtSubproc
 
 
 timeouts = {'short': 100, 'copy': 300, 'install': 3000, 'test': 10000,
diff --git a/reprotest/lib/testdesc.py b/reprotest/lib/testdesc.py
index c5ecf83..32f1a92 100644
--- a/reprotest/lib/testdesc.py
+++ b/reprotest/lib/testdesc.py
@@ -30,11 +30,13 @@ import tempfile
 import atexit
 import shutil
 
-import debian.deb822
-import debian.debian_support
-import debian.debfile
+# TODO: probably this file is unnecessary.
 
-import adtlog
+# import debian.deb822
+# import debian.debian_support
+# import debian.debfile
+
+# import adtlog
 
 #
 # Abstract test representation

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reprotest.git