mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00
Code Issues Releases Wiki Activity

merge (#222),

Browse Source 
remove trailing blanks
This commit is contained in:
Joel Bender 2019-01-21 22:39:16 -05:00
commit 6ce671262a
3 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
py25/bacpypes/debugging.py
View File

@ -10,20 +10,8 @@ import logging
import binascii import binascii
from cStringIO import StringIO from cStringIO import StringIO
# create a root logger
# set the level of the root logger root_logger = logging.getLogger('bacpypes')
_root = logging.getLogger()
_root.setLevel(1)
# add a stream handler for warnings and up
hdlr = logging.StreamHandler()
if ('--debugDebugging' in sys.argv):
hdlr.setLevel(logging.DEBUG)
else:
hdlr.setLevel(logging.WARNING)
hdlr.setFormatter(logging.Formatter(logging.BASIC_FORMAT, None))
_root.addHandler(hdlr)
del hdlr
def btox(data, sep=''): def btox(data, sep=''):
@ -68,12 +56,22 @@ def ModuleLogger(globs):
if not globs.has_key('_debug'): if not globs.has_key('_debug'):
raise RuntimeError("define _debug before creating a module logger") raise RuntimeError("define _debug before creating a module logger")
# logger name is the module name
logger_name = globs['__name__']
# create a logger to be assigned to _log # create a logger to be assigned to _log
logger = logging.getLogger(globs['__name__']) logger = logging.getLogger(logger_name)
# put in a reference to the module globals # put in a reference to the module globals
logger.globs = globs logger.globs = globs
# if this is a "root" logger add a default handler for warnings and up
if '.' not in logger_name:
hdlr = logging.StreamHandler()
hdlr.setLevel(logging.WARNING)
hdlr.setFormatter(logging.Formatter(logging.BASIC_FORMAT, None))
logger.addHandler(hdlr)
return logger return logger
# #

28
py27/bacpypes/debugging.py
View File

@ -10,20 +10,8 @@ import logging
import binascii import binascii
from cStringIO import StringIO from cStringIO import StringIO
# create a root logger
# set the level of the root logger root_logger = logging.getLogger('bacpypes')
_root = logging.getLogger()
_root.setLevel(1)
# add a stream handler for warnings and up
hdlr = logging.StreamHandler()
if ('--debugDebugging' in sys.argv):
hdlr.setLevel(logging.DEBUG)
else:
hdlr.setLevel(logging.WARNING)
hdlr.setFormatter(logging.Formatter(logging.BASIC_FORMAT, None))
_root.addHandler(hdlr)
del hdlr
def btox(data, sep=''): def btox(data, sep=''):
@ -68,12 +56,22 @@ def ModuleLogger(globs):
if '_debug' not in globs: if '_debug' not in globs:
raise RuntimeError("define _debug before creating a module logger") raise RuntimeError("define _debug before creating a module logger")
# logger name is the module name
logger_name = globs['__name__']
# create a logger to be assigned to _log # create a logger to be assigned to _log
logger = logging.getLogger(globs['__name__']) logger = logging.getLogger(logger_name)
# put in a reference to the module globals # put in a reference to the module globals
logger.globs = globs logger.globs = globs
# if this is a "root" logger add a default handler for warnings and up
if '.' not in logger_name:
hdlr = logging.StreamHandler()
hdlr.setLevel(logging.WARNING)
hdlr.setFormatter(logging.Formatter(logging.BASIC_FORMAT, None))
logger.addHandler(hdlr)
return logger return logger
# #

28
py34/bacpypes/debugging.py
View File

@ -10,20 +10,8 @@ import logging
import binascii import binascii
from io import StringIO from io import StringIO
# create a root logger
# set the level of the root logger root_logger = logging.getLogger('bacpypes')
_root = logging.getLogger()
_root.setLevel(1)
# add a stream handler for warnings and up
hdlr = logging.StreamHandler()
if ('--debugDebugging' in sys.argv):
hdlr.setLevel(logging.DEBUG)
else:
hdlr.setLevel(logging.WARNING)
hdlr.setFormatter(logging.Formatter(logging.BASIC_FORMAT, None))
_root.addHandler(hdlr)
del hdlr
def btox(data, sep=''): def btox(data, sep=''):
@ -68,12 +56,22 @@ def ModuleLogger(globs):
if '_debug' not in globs: if '_debug' not in globs:
raise RuntimeError("define _debug before creating a module logger") raise RuntimeError("define _debug before creating a module logger")
# logger name is the module name
logger_name = globs['__name__']
# create a logger to be assigned to _log # create a logger to be assigned to _log
logger = logging.getLogger(globs['__name__']) logger = logging.getLogger(logger_name)
# put in a reference to the module globals # put in a reference to the module globals
logger.globs = globs logger.globs = globs
# if this is a "root" logger add a default handler for warnings and up
if '.' not in logger_name:
hdlr = logging.StreamHandler()
hdlr.setLevel(logging.WARNING)
hdlr.setFormatter(logging.Formatter(logging.BASIC_FORMAT, None))
logger.addHandler(hdlr)
return logger return logger
# #