re-add logger version output: INFO for interactive session, DEBUG for… · RDFLib/rdflib@4bb4362 (original) (raw)

Original file line number Diff line number Diff line change
@@ -70,20 +70,30 @@
70 70
71 71 import sys
72 72 assert sys.version_info >= (2, 5, 0), "rdflib requires Python 2.5 or higher"
73 -del sys
74 73
75 74 import logging
75 +_interactive_mode = False
76 76 try:
77 77 import __main__
78 -if not hasattr(__main__, '__file__'):
78 +if not hasattr(__main__, '__file__') and sys.stdout.isatty():
79 79 # show log messages in interactive mode
80 +_interactive_mode = True
80 81 logging.basicConfig(level=logging.INFO)
82 +del __main__
81 83 except ImportError:
82 84 #Main already imported from elsewhere
83 85 import warnings
84 86 warnings.warn('__main__ already imported', ImportWarning)
85 87 del warnings
86 88
89 +logger = logging.getLogger(__name__)
90 +if _interactive_mode:
91 +logger.info("RDFLib Version: %s" % __version__)
92 +else:
93 +logger.debug("RDFLib Version: %s" % __version__)
94 +del _interactive_mode
95 +del sys
96 +
87 97
88 98 try:
89 99 unichr(0x10FFFF)