Skip to content
Snippets Groups Projects
Commit fc9ee590 authored by Hendrik Buschmeier's avatar Hendrik Buschmeier
Browse files

Fixed a python3-porting mistake.

parent 17fbdf2d
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# "Incremental Processing Architecture # "Incremental Processing Architecture
# for Artificial Conversational Agents". # for Artificial Conversational Agents".
# #
# Copyright (c) 2009-2015 Social Cognitive Systems Group # Copyright (c) 2009-2019 Social Cognitive Systems Group
# CITEC, Bielefeld University # CITEC, Bielefeld University
# #
# http://opensource.cit-ec.de/projects/ipaaca/ # http://opensource.cit-ec.de/projects/ipaaca/
...@@ -43,6 +43,7 @@ import uuid ...@@ -43,6 +43,7 @@ import uuid
import ipaaca import ipaaca
import ipaaca.misc import ipaaca.misc
import six
__all__ = [ __all__ = [
...@@ -124,7 +125,7 @@ def logger_set_log_level(level=LogLevel.DEBUG): ...@@ -124,7 +125,7 @@ def logger_set_log_level(level=LogLevel.DEBUG):
with LOGGER_LOCK: with LOGGER_LOCK:
if level in LogLevel._values: if level in LogLevel._values:
CURRENT_LOG_LEVEL = level CURRENT_LOG_LEVEL = level
elif isinstance(level, basestring) and level.upper() in LOG_LEVEL_FROM_STRING_DICT: elif isinstance(level, six.string_types) and level.upper() in LOG_LEVEL_FROM_STRING_DICT:
CURRENT_LOG_LEVEL = LOG_LEVEL_FROM_STRING_DICT[level.upper()] CURRENT_LOG_LEVEL = LOG_LEVEL_FROM_STRING_DICT[level.upper()]
else: else:
pass # leave previous setting untouched pass # leave previous setting untouched
...@@ -153,7 +154,7 @@ def LOG_IPAACA(lvl, text, now=0.0, fn='???', thread='???'): ...@@ -153,7 +154,7 @@ def LOG_IPAACA(lvl, text, now=0.0, fn='???', thread='???'):
def LOG_CONSOLE(lvlstr, msg, fn_markup='', msg_markup='', now=0.0, fn='???', thread='???'): def LOG_CONSOLE(lvlstr, msg, fn_markup='', msg_markup='', now=0.0, fn='???', thread='???'):
if isinstance(msg, basestring): if isinstance(msg, six.string_types):
lines = msg.split('\n') lines = msg.split('\n')
else: else:
lines = [msg] lines = [msg]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment