Changed to use lsst.log

python/lsst/db/utils.py

@@ -31,7 +31,6 @@
 
 # standard library
 import ConfigParser
-import logging
 import os.path
 import sys
 

tests/testUtils.py

@@ -2,22 +2,22 @@
 
 # LSST Data Management System
 # Copyright 2014 LSST Corporation.
-# 
+#
 # This product includes software developed by the
 # LSST Project (http://www.lsst.org/).
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
-# You should have received a copy of the LSST License Statement and 
-# the GNU General Public License along with this program.  If not, 
+#
+# You should have received a copy of the LSST License Statement and
+# the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 
 """
@@ -30,14 +30,15 @@
 """
 
 import ConfigParser
-import logging
 import os
 import tempfile
 import time
 import unittest
 
+import lsst.log as log
 from lsst.db.utils import readCredentialFile
 
+
 class TestUtils(unittest.TestCase):
     def testReadCredF(self):
         f, fN = tempfile.mkstemp(suffix=".cnf", dir="/tmp", text="True")
@@ -51,7 +52,7 @@ def testReadCredF(self):
 socket = /tmp/my/socket.sock
 """)
         f.close()
-        dict = readCredentialFile(fN, logging.getLogger("lsst.db.testDbLocal"))
+        dict = readCredentialFile(fN, log)
         assert(dict["host"] == "localhost")
         assert(dict["port"] == "3455")
         assert(dict["user"] == "dummyX")
@@ -61,11 +62,6 @@ def testReadCredF(self):
 
 ####################################################################################
 def main():
-    logging.basicConfig(
-        format='%(asctime)s %(name)s %(levelname)s: %(message)s', 
-        datefmt='%m/%d/%Y %I:%M:%S', 
-        level=logging.DEBUG)
-
     unittest.main()
 
 if __name__ == "__main__":