[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] Move "import utils" into function



This breaks a dependency cycle (as utils.py imports dbconn.py again) and allows
the tests to pass again.
---
 daklib/dbconn.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 80a1f23..c0801b4 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -75,7 +75,6 @@ from sqlalchemy.orm.exc import NoResultFound
 from config import Config
 from textutils import fix_maintainer
 from dak_exceptions import DBUpdateError, NoSourceFieldError, FileExistsError
-import utils
 
 # suppress some deprecation warnings in squeeze related to sqlalchemy
 import warnings
@@ -559,7 +558,7 @@ class DBBinary(ORMObject):
         @rtype: text
         @return: stanza text of the control section.
         '''
-        import apt_inst
+        import utils
         fullpath = self.poolfile.fullpath
         deb_file = open(fullpath, 'r')
         stanza = utils.deb_extract_control(deb_file)
-- 
1.7.2.5



Reply to: