Skip to content

Commit 9bbf934

Browse files
mmaterarocky
andauthored
Definitions.get_ownvalue now returns a BaseElement. (#88)
* Definitions.get_ownvalue now returns a BaseElement. * Changes to make --prompt={GNU,none} work again (#89) --------- Co-authored-by: R. Bernstein <[email protected]>
1 parent a7d0cc3 commit 9bbf934

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

mathicsscript/__main__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ def fmt_fun(query: Any) -> Any:
162162

163163
full_form = definitions.get_ownvalue(
164164
"Settings`$ShowFullFormInput"
165-
).replace.to_python()
165+
).to_python()
166166
style = definitions.get_ownvalue("Settings`$PygmentsStyle")
167167
fmt = identity
168168
if style:
169-
style = style.replace.get_string_value()
169+
style = style.get_string_value()
170170
if shell.terminal_formatter:
171171
fmt = fmt_fun
172172

mathicsscript/termshell.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,15 @@ def __init__(
119119

120120
self.pygments_style = style
121121
self.definitions = definitions
122-
set_settings_value(
123-
self.definitions, "Settings`$PygmentsShowTokens", from_python(False)
122+
self.definitions.set_ownvalue(
123+
"Settings`$PygmentsShowTokens", from_python(False)
124124
)
125-
set_settings_value(
126-
self.definitions, "Settings`$UseUnicode", from_python(use_unicode)
127-
)
128-
set_settings_value(
129-
self.definitions,
130-
"Settings`PygmentsStylesAvailable",
131-
from_python(ALL_PYGMENTS_STYLES),
125+
self.definitions.set_ownvalue("Settings`$PygmentsStyle", from_python(style))
126+
self.definitions.set_ownvalue("Settings`$UseUnicode", from_python(use_unicode))
127+
self.definitions.set_ownvalue(
128+
"Settings`PygmentsStylesAvailable", from_python(ALL_PYGMENTS_STYLES)
132129
)
130+
133131
self.definitions.add_message(
134132
"Settings`PygmentsStylesAvailable",
135133
Rule(

mathicsscript/termshell_prompt.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def bottom_toolbar(self):
167167
if self.definitions.get_ownvalue("Settings`$GroupAutocomplete"):
168168
app.group_autocomplete = self.definitions.get_ownvalue(
169169
"Settings`$GroupAutocomplete"
170-
).replace.to_python()
170+
).to_python()
171171

172172
edit_mode = "Vi" if app.editing_mode == EditingMode.VI else "Emacs"
173173
return HTML(
@@ -224,10 +224,10 @@ def print_result(
224224
elif self.terminal_formatter: # pygmentize
225225
show_pygments_tokens = self.definitions.get_ownvalue(
226226
"Settings`$PygmentsShowTokens"
227-
).replace.to_python()
227+
).to_python()
228228
pygments_style = self.definitions.get_ownvalue(
229229
"Settings`$PygmentsStyle"
230-
).replace.get_string_value()
230+
).get_string_value()
231231
if pygments_style != self.pygments_style:
232232
if not self.change_pygments_style(pygments_style):
233233
self.definitions.set_ownvalue(

0 commit comments

Comments
 (0)