Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2

[sfa.git] / sfa / client / sfadump.py

diff --git a/sfa/client/sfadump.py b/sfa/client/sfadump.py
index b1169b9..52a9105 100755 (executable)
--- a/sfa/client/sfadump.py
+++ b/sfa/client/sfadump.py
@@ -12,8 +12,7 @@ from sfa.trust.certificate import Certificate
 from sfa.trust.credential import Credential
 from sfa.trust.gid import GID
 from sfa.util.record import SfaRecord
-from sfa.util.rspec import RSpec
-from sfa.util.sfalogging import sfa_logger, sfa_logger_goes_to_console
+from sfa.util.sfalogging import logger
 
 def determine_sfa_filekind(fn):
 
@@ -100,7 +99,6 @@ def handle_input_kind (filename, options, kind):
         print "%s: unknown filekind '%s'"% (filename,kind)
 
 def main():
-    sfa_logger_goes_to_console()
     usage = """%prog file1 [ .. filen]
 display info on input files"""
     parser = OptionParser(usage=usage)
@@ -111,7 +109,7 @@ display info on input files"""
     parser.add_option("-v", "--verbose", action='count', dest='verbose', default=0)
     (options, args) = parser.parse_args()
 
-    sfa_logger().setLevelFromOptVerbose(options.verbose)
+    logger.setLevelFromOptVerbose(options.verbose)
     if len(args) <= 0:
         parser.print_help()
         sys.exit(1)