let's use pythonesque imports, shall we?

diff --git a/dak/check_archive.py b/dak/check_archive.py
index 7a2c779c8d4724dda07e9778d34f4936c5666cce..2d9321d68c68f1caf5e7d77799c6eece507cb739 100755 (executable)
--- a/dak/check_archive.py
+++ b/dak/check_archive.py
@@ -28,8 +28,8 @@
 
 import commands, os, pg, stat, sys, time
 import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index cdab644935f67a866408da210f087360235dd87c..2a576b58ad1c77ba7e19b4032ba7831bc504bc79 100644 (file)
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -50,9 +50,9 @@
 
 import pg, sys, os
 import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/check_proposed_updates.py b/dak/check_proposed_updates.py
index a4e7c0cb7c36b1344e3b3a7ddc7f3af5820dadd1..afb0faaeb9a1832552e6bd75c762f5bfcf0fda43 100755 (executable)
--- a/dak/check_proposed_updates.py
+++ b/dak/check_proposed_updates.py
@@ -30,8 +30,8 @@
 
 import pg, sys, os
 import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/clean_proposed_updates.py b/dak/clean_proposed_updates.py
index fc063ddb62bb787cd71ed616c428a31d1e2c809e..3dd6e6f3dbad3bd34a3489751d5f769c3c825fa0 100755 (executable)
--- a/dak/clean_proposed_updates.py
+++ b/dak/clean_proposed_updates.py
@@ -21,8 +21,8 @@
 
 import os, pg, re, sys
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index 30e0baf1b5ebac357f8c441b9e09a6c26c4f10ba..9f771b7261e6fbd8c846c9966327fe43d4ebfff4 100755 (executable)
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -35,7 +35,7 @@
 
 import os, stat, sys, time
 import apt_pkg
-import daklib.utils as utils
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index f459cdda154eb7565b237ed6eee405a6bf8668b7..fc4b8473669e6554ee7ab2d343a81880755a9d10 100755 (executable)
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -30,7 +30,7 @@
 
 import os, pg, stat, sys, time
 import apt_pkg
-import daklib.utils as utils
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/compare_suites.py b/dak/compare_suites.py
index a3df829818d45787ac2ef2d605492472a91293e0..8c367582663622701c48ea49803931050ccb846c 100755 (executable)
--- a/dak/compare_suites.py
+++ b/dak/compare_suites.py
@@ -22,8 +22,8 @@
 
 import pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/control_overrides.py b/dak/control_overrides.py
index 9ea1cd60c2bd813bafdb42e7d4df95facfa51203..0af5c48b35897733a9b32a89a548c45c380c5640 100644 (file)
--- a/dak/control_overrides.py
+++ b/dak/control_overrides.py
@@ -51,9 +51,9 @@
 
 import pg, sys, time
 import apt_pkg
-import daklib.utils as utils
-import daklib.database as database
-import daklib.logging as logging
+from daklib import utils
+from daklib import database
+from daklib import logging
 
 ################################################################################
 

diff --git a/dak/control_suite.py b/dak/control_suite.py
index 63a0386b1ed0f26f14cc5033c2055defdee09e57..4cb5bd3805e3c4fa0b03efe7ce8e308247f80f89 100644 (file)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -43,9 +43,9 @@
 
 import pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import utils
 
 #######################################################################################
 

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index cc5aa4b8520d946341ff61703c2aceb70a66cb9e..6837ebf7cd2c8e22f82c32a0cd2b7c6408a7a5b7 100755 (executable)
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -29,8 +29,8 @@
 
 import commands, pg, os, sys, time
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/decode_dot_dak.py b/dak/decode_dot_dak.py
index d4373641a0d11e853f1c64bde4a62b8b0df04827..00bf8e7d354ede10618e9f19d9148c349ae220c1 100644 (file)
--- a/dak/decode_dot_dak.py
+++ b/dak/decode_dot_dak.py
@@ -28,8 +28,8 @@
 
 import sys
 import apt_pkg
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import queue
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 81191d257616963e492512d62aa94f2e44520f3c..ae3ec6c9c4e4b4f7f22d1468b4e859e9b6abe4f9 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -34,8 +34,8 @@
 
 import errno, os, pg, re, sys, md5
 import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/find_null_maintainers.py b/dak/find_null_maintainers.py
index c4e457f13c6df1c9793668204db0346e2a4f13c1..652edfd2e3ef9c403b1ab812aed04bb522d631b5 100755 (executable)
--- a/dak/find_null_maintainers.py
+++ b/dak/find_null_maintainers.py
@@ -21,7 +21,7 @@
 
 import ldap, pg, sys, time
 import apt_pkg
-import daklib.utils as utils
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 7cbedb9cbf13acc03361d9c9c9f374834d9a2a7d..286c1eba7f3ed870ead854ff7b395fb17c1ba6b8 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -32,7 +32,7 @@
 
 import sys, os, tempfile
 import apt_pkg
-import daklib.utils as utils
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index afd4a02bdf4bcbecf282efe1a234573c4f0361a8..c9dece836e70fe3a639fb527cedff46084d82713 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -24,7 +24,7 @@
 
 import sys, os, popen2, tempfile, stat, time, pg
 import apt_pkg
-import daklib.utils as utils
+from daklib import utils
 from daklib.dak_exceptions import *
 
 ################################################################################

diff --git a/dak/import_archive.py b/dak/import_archive.py
index b1e11fceea9b16728afa934e468f16631ec1fd03..203221bee9d01a92e8c50d5c9219511765b3e8ac 100755 (executable)
--- a/dak/import_archive.py
+++ b/dak/import_archive.py
@@ -38,8 +38,8 @@
 
 import commands, os, pg, re, sys, time
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 from daklib.dak_exceptions import *
 
 ###############################################################################

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 6d91b46079d6f832328e73891b84dbd5cf75296a..a70a2e7811b9d8f10b9013efafa3c49867e415d5 100755 (executable)
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -19,8 +19,8 @@
 
 ################################################################################
 
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 import sys, os, re
 import apt_pkg, pg, ldap, email.Utils
 

diff --git a/dak/import_ldap_fingerprints.py b/dak/import_ldap_fingerprints.py
index 85cd7a223c6a983a2217252b5c930e3998ef8c2b..b568285357180b6d53a0dc690c3c922e207c6e92 100755 (executable)
--- a/dak/import_ldap_fingerprints.py
+++ b/dak/import_ldap_fingerprints.py
@@ -46,8 +46,8 @@
 
 import commands, ldap, pg, re, sys
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/import_users_from_passwd.py b/dak/import_users_from_passwd.py
index af9d12394477e9523e44015cf13d324f7adfd459..b182f604ea01e6875a468c85f88c28e8f47f2fd4 100755 (executable)
--- a/dak/import_users_from_passwd.py
+++ b/dak/import_users_from_passwd.py
@@ -31,7 +31,7 @@
 
 import pg, pwd, sys
 import apt_pkg
-import daklib.utils as utils
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/init_db.py b/dak/init_db.py
index 16a8d8bac7e1acfe91a1c1928a856a6b132b7a81..d40ad0c0aeb49cd6a95e1ad10d0d70181f056514 100755 (executable)
--- a/dak/init_db.py
+++ b/dak/init_db.py
@@ -21,8 +21,8 @@
 
 import pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/init_dirs.py b/dak/init_dirs.py
index f92515e251d71a21e872dd5382fd47a7e2160407..d095eeee986b7bdb6093861eb81cda6a32deb79e 100755 (executable)
--- a/dak/init_dirs.py
+++ b/dak/init_dirs.py
@@ -21,7 +21,7 @@
 
 import os, sys
 import apt_pkg
-import daklib.utils as utils
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/ls.py b/dak/ls.py
index 2b445d8202771a91c2251ce2c3bcc07a808111cd..baf137335739ea4fb313e07db41602e560a85c50 100755 (executable)
--- a/dak/ls.py
+++ b/dak/ls.py
@@ -28,8 +28,8 @@
 
 import os, pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/make_maintainers.py b/dak/make_maintainers.py
index c3905af933d51d77a5ebdf7e99abe01952cfb8f7..090b8d4337d1dfdc2a3039d34512cce0d54d1c88 100755 (executable)
--- a/dak/make_maintainers.py
+++ b/dak/make_maintainers.py
@@ -27,8 +27,8 @@
 
 import pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 77e7bb8c885049a562ca57374248b1845863c11b..1087ce286784d57110c1e51faef6450fd3ef8188 100755 (executable)
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -27,8 +27,8 @@
 
 import pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py
index ca4e036325e42caf4a9ef1c3ed81fad9769cd16e..7d10d42ba2942b91c9d15d67de58b4da7e01a21f 100755 (executable)
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -36,9 +36,9 @@
 import copy, os, pg, sys
 import apt_pkg
 import symlink_dists
-import daklib.database as database
-import daklib.logging as logging
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index ca119c8111613228d20b4b57ffe313c877b8b28b..4cfd2133a92676d948af481d462597c26535d036 100755 (executable)
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -20,10 +20,10 @@
 
 ################################################################################
 
-import daklib.queue as queue
-import daklib.logging as logging
-import daklib.utils as utils
-import daklib.database as database
+from daklib import queue
+from daklib import logging
+from daklib import utils
+from daklib import database
 import apt_pkg, os, sys, pwd, time, re, commands
 
 re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$");

diff --git a/dak/override.py b/dak/override.py
index ffa6ae9a2ce0fde0f31adcd73b0c8c3157195f3a..89bac5b90f8a665afcf058e6220dc37a3a23904b 100755 (executable)
--- a/dak/override.py
+++ b/dak/override.py
@@ -27,9 +27,9 @@
 
 import pg, sys
 import apt_pkg
-import daklib.logging as logging
-import daklib.database as database
-import daklib.utils as utils
+from daklib import logging
+from daklib import database
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index 605b5c23228eb998412db514a45eabed3bffd7c1..e99c35b359bdce6cec908225e32c1f20ce42ef5e 100755 (executable)
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -31,10 +31,10 @@
 
 import errno, fcntl, os, sys, time, re
 import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
 
 ###############################################################################
 

diff --git a/dak/process_new.py b/dak/process_new.py
index c13ff781051f28fa13c2ab1baf72211c1229dc9c..c0bc51f371bebe007c69441afc134e98678d8789 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -39,10 +39,10 @@
 import copy, errno, os, readline, stat, sys, time
 import apt_pkg, apt_inst
 import examine_package
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
 
 # Globals
 Cnf = None

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 11b480a072096674d6017c4f357af3a46837a633..34d1739f7665a025f26581a4a24c19a2d838a44e 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -30,10 +30,10 @@
 
 import commands, errno, fcntl, os, re, shutil, stat, sys, time, tempfile, traceback
 import apt_inst, apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
 from daklib.dak_exceptions import *
 
 from types import *

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 7f20ce58169e4d0d89fe70f2b0450733b2878b00..aa1c54da702bd7f2cbbde182a0ac7a10fa081ad9 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -36,8 +36,8 @@
 
 import copy, glob, os, stat, sys, time
 import apt_pkg
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import queue
+from daklib import utils
 from daklib.dak_exceptions import *
 
 Cnf = None

diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py
index 060ad51337754d69b866e1e488e71ddd0e15a492..ba6dc2265895d141b012449c49f36295110cbb8c 100644 (file)
--- a/dak/reject_proposed_updates.py
+++ b/dak/reject_proposed_updates.py
@@ -21,10 +21,10 @@
 
 import os, pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/rm.py b/dak/rm.py
index df11a53b83340186873326b7aefb3d35e47d485f..7bc6cceb42fc0c72aee4191a87df649061cd6795 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -41,8 +41,8 @@
 
 import commands, os, pg, re, sys
 import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 from daklib.dak_exceptions import *
 
 ################################################################################

diff --git a/dak/security_install.py b/dak/security_install.py
index 34efeb4c16b2a91d067020e8a53479419a016ee0..3aebedc1c587a8ee5aaad8271dbe7f781c76d5bf 100644 (file)
--- a/dak/security_install.py
+++ b/dak/security_install.py
@@ -32,7 +32,7 @@
 
 import commands, os, pwd, re, sys, time
 import apt_pkg
-import daklib.queue as queue
+from daklib import queue
 import daklib.utils
 
 ################################################################################

diff --git a/dak/show_new.py b/dak/show_new.py
index 87bea79630d124a163973bb127fbca33b84a6c87..4b485f2669ad7e0a642ff2d3712809f5a7b4b79f 100755 (executable)
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -28,9 +28,9 @@
 import copy, os, sys, time
 import apt_pkg
 import examine_package
-import daklib.database as database
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import queue
+from daklib import utils
 
 # Globals
 Cnf = None

diff --git a/dak/split_done.py b/dak/split_done.py
index 5502dcc52e521db67d077364841bdbce6603f44f..5f8faddaf8e4041e05fffdc1b0ef7915ed91547b 100755 (executable)
--- a/dak/split_done.py
+++ b/dak/split_done.py
@@ -19,7 +19,7 @@
 ################################################################################
 
 import glob, os, stat, time
-import daklib.utils as utils
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/stats.py b/dak/stats.py
index e1786c4a91c5005e501d7d2d6a05ce4d8d609fbe..20a02b55cac3c0d4345efe5f8d4017ed5a2f02e2 100755 (executable)
--- a/dak/stats.py
+++ b/dak/stats.py
@@ -32,7 +32,7 @@
 
 import pg, sys
 import apt_pkg
-import daklib.utils as utils
+from daklib import utils
 
 ################################################################################
 

diff --git a/dak/transitions.py b/dak/transitions.py
index 7a0da2e11dd5cc50cada96b75ba83e9898045aaa..5c81e03aca1829af9dbd933efc0bc2c277b35779 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -25,8 +25,8 @@
 
 import os, pg, sys, time, errno, fcntl, tempfile, pwd, re
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
 import syck
 
 # Globals