rename logging module to not conflict with the python one

[dak.git] / dak / reject_proposed_updates.py

diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py
index 4510ee0e4747bed24c843d5f4ae4cbac6fb297ed..99dae8775ed5c01dbebb27f951bd73ec7b153f2d 100755 (executable)
--- a/dak/reject_proposed_updates.py
+++ b/dak/reject_proposed_updates.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Manually reject packages for proprosed-updates
+""" Manually reject packages for proprosed-updates """
 # Copyright (C) 2001, 2002, 2003, 2004, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -22,9 +22,10 @@
 import os, pg, sys
 import apt_pkg
 from daklib import database
-from daklib import logging
+from daklib import daklog
 from daklib import queue
 from daklib import utils
+from daklib.regexes import re_default_answer
 
 ################################################################################
 
@@ -71,7 +72,7 @@ def main():
     database.init(Cnf, projectB)
 
     Upload = queue.Upload(Cnf)
-    Logger = Upload.Logger = logging.Logger(Cnf, "reject-proposed-updates")
+    Logger = Upload.Logger = daklog.Logger(Cnf, "reject-proposed-updates")
 
     bcc = "X-DAK: dak rejected-proposed-updates\nX-Katie: lauren $Revision: 1.4 $"
     if Cnf.has_key("Dinstall::Bcc"):
@@ -97,7 +98,7 @@ def main():
 
             while prompt.find(answer) == -1:
                 answer = utils.our_raw_input(prompt)
-                m = queue.re_default_answer.search(prompt)
+                m = re_default_answer.search(prompt)
                 if answer == "":
                     answer = m.group(1)
                 answer = answer[:1].upper()
@@ -137,7 +138,7 @@ def reject (reject_message = ""):
             answer = "XXX"
             while prompt.find(answer) == -1:
                 answer = utils.our_raw_input(prompt)
-                m = queue.re_default_answer.search(prompt)
+                m = re_default_answer.search(prompt)
                 if answer == "":
                     answer = m.group(1)
                 answer = answer[:1].upper()