Skip to content

Commit

Permalink
really tired of formatting errors. blacking everything
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaslima committed Feb 18, 2020
1 parent d03f2c6 commit a093e21
Show file tree
Hide file tree
Showing 63 changed files with 3,281 additions and 2,462 deletions.
16 changes: 11 additions & 5 deletions lightlab/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import logging
logger = logging.getLogger('lightlab')
visalogger = logging.getLogger('lightlab.visa') # This is a child of logger.

logger = logging.getLogger("lightlab")
visalogger = logging.getLogger("lightlab.visa") # This is a child of logger.

# logging levels, increasing in order of severity.
NOTSET = logging.NOTSET
Expand All @@ -14,16 +15,21 @@
def log_to_screen(level=INFO):
logger.setLevel(level)

stream_handlers = [handler for handler in logger.handlers if isinstance(
handler, logging.StreamHandler)]
stream_handlers = [
handler
for handler in logger.handlers
if isinstance(handler, logging.StreamHandler)
]

if len(stream_handlers) <= 0:
ch = logging.StreamHandler()
logger.addHandler(ch)
else:
ch = stream_handlers[0]
ch.setLevel(NOTSET) # Print all events
formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(name)s:\n\t%(message)s')
formatter = logging.Formatter(
"%(asctime)s - %(levelname)s - %(name)s:\n\t%(message)s"
)
ch.setFormatter(formatter)


Expand Down
24 changes: 15 additions & 9 deletions lightlab/command_line.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
import argparse
from lightlab.util.config import config_main

version = '1.0.6'
version = "1.0.6"

parser = argparse.ArgumentParser(description="lightlab configuration tool")
parser.add_argument('command', type=str, choices=['labstate', 'config'],
metavar='<command>', help='config, labstate')
parser.add_argument('args', nargs=argparse.REMAINDER)
parser.add_argument('-v', '--version', action='version', version=f'%(prog)s v{version}')
parser.add_argument(
"command",
type=str,
choices=["labstate", "config"],
metavar="<command>",
help="config, labstate",
)
parser.add_argument("args", nargs=argparse.REMAINDER)
parser.add_argument("-v", "--version", action="version", version=f"%(prog)s v{version}")


def main():
args = parser.parse_args()
if args.command == 'labstate':
if args.command == "labstate":
labstate_main(args.args)
elif args.command == 'config':
elif args.command == "config":
config_main(args.args)


labstate_parser = argparse.ArgumentParser()
labstate_parser.add_argument('--show', action='store_true',
help="show current labstate information")
labstate_parser.add_argument(
"--show", action="store_true", help="show current labstate information"
)


def labstate_main(args):
Expand Down
Loading

0 comments on commit a093e21

Please sign in to comment.