Show More
@@ -341,7 +341,7 b' class Kernel(Configurable):' | |||||
341 |
|
341 | |||
342 | try: |
|
342 | try: | |
343 | content = parent[u'content'] |
|
343 | content = parent[u'content'] | |
344 | code = content[u'code'] |
|
344 | code = py3compat.cast_unicode_py2(content[u'code']) | |
345 | silent = content[u'silent'] |
|
345 | silent = content[u'silent'] | |
346 | store_history = content.get(u'store_history', not silent) |
|
346 | store_history = content.get(u'store_history', not silent) | |
347 | except: |
|
347 | except: |
@@ -83,6 +83,7 b' if sys.version_info[0] >= 3:' | |||||
83 | str_to_bytes = encode |
|
83 | str_to_bytes = encode | |
84 | bytes_to_str = decode |
|
84 | bytes_to_str = decode | |
85 | cast_bytes_py2 = no_code |
|
85 | cast_bytes_py2 = no_code | |
|
86 | cast_unicode_py2 = no_code | |||
86 |
|
87 | |||
87 | string_types = (str,) |
|
88 | string_types = (str,) | |
88 | unicode_type = str |
|
89 | unicode_type = str | |
@@ -139,6 +140,7 b' else:' | |||||
139 | str_to_bytes = no_code |
|
140 | str_to_bytes = no_code | |
140 | bytes_to_str = no_code |
|
141 | bytes_to_str = no_code | |
141 | cast_bytes_py2 = cast_bytes |
|
142 | cast_bytes_py2 = cast_bytes | |
|
143 | cast_unicode_py2 = cast_unicode | |||
142 |
|
144 | |||
143 | string_types = (str, unicode) |
|
145 | string_types = (str, unicode) | |
144 | unicode_type = unicode |
|
146 | unicode_type = unicode |
General Comments 0
You need to be logged in to leave comments.
Login now