Skip to content

Commit

Permalink
No longer shadow built-in "format" in private functions
Browse files Browse the repository at this point in the history
  • Loading branch information
Delgan committed Oct 29, 2017
1 parent b544d8e commit 4733e3f
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions loguru/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,36 +82,29 @@ class StrRecord(str):

class Handler:

def __init__(self, *, writter, level, format, filter, colored, better_exceptions):
def __init__(self, *, writter, level, format_, filter, colored, better_exceptions):
self.writter = writter
self.level = level
self.format = format
self.format = format_
self.filter = filter
self.colored = colored
self.better_exceptions = better_exceptions

self.formats_per_level = self.generate_formats(format, colored)
self.formats_per_level = self.generate_formats(format_, colored)
self.exception_formatter = ExceptionFormatter(colored=colored)

@staticmethod
def generate_formats(format, colored):
def generate_formats(format_, colored):
formats_per_level = {}

for level_name, level_color in LEVELS_COLORS.items():
color = ansimarkup.parse(level_color)
custom_markup = dict(level=color, lvl=color)
am = ansimarkup.AnsiMarkup(tags=custom_markup)
formats_per_level[level_name] = am.parse(format) if colored else am.strip(format)
formats_per_level[level_name] = am.parse(format_) if colored else am.strip(format_)

return formats_per_level

# def format_exception(self, type, value, tb):
# ...

# def handle(self, record):
# loguru_record = RecordUtils.to_loguru_record(record)
# self.emit(loguru_record)

def emit(self, record):
level = record['level']
if self.level > level.no:
Expand Down Expand Up @@ -513,7 +506,7 @@ def log_to(self, sink, *, level=DEBUG, format=VERBOSE_FORMAT, filter=None, color
handler = Handler(
writter=writter,
level=level,
format=format,
format_=format,
filter=filter,
colored=colored,
better_exceptions=better_exceptions,
Expand Down

0 comments on commit 4733e3f

Please sign in to comment.