Skip to content

FIX: Use trait_set instead of set #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdickinson merged 2 commits into from
Jan 25, 2019
Merged

FIX: Use trait_set instead of set #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e4660a
FIX: Use trait_set instead of set
larsoner Jan 23, 2019
c6de8f8
FIX: A few more
larsoner Jan 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apptools/preferences/preference_binding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def _set_trait(self, notify=True):
trait_value = self._get_value(self.trait_name, value)
traits = {self.trait_name : trait_value}

self.obj.set(trait_change_notify=notify, **traits)
self.obj.trait_set(trait_change_notify=notify, **traits)

return

Expand Down
2 changes: 1 addition & 1 deletion apptools/preferences/preferences_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def _initialize(self, preferences, notify=False):
value = self._get_value(trait_name, preferences.get(key))
traits_to_set[trait_name] = value

self.set(trait_change_notify=notify, **traits_to_set)
self.trait_set(trait_change_notify=notify, **traits_to_set)

# Listen for changes to the node's preferences.
preferences.add_preferences_listener(
Expand Down
2 changes: 1 addition & 1 deletion apptools/preferences/ui/widget_editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class WidgetEditor(EditorFactory):
def __call__ (self, *args, **traits):
""" Call the object. """

return self.set(**traits)
return self.trait_set(**traits)

###########################################################################
# 'EditorFactory' interface.
Expand Down
26 changes: 13 additions & 13 deletions apptools/template/test/scatter_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,19 +183,19 @@ def activate_template ( self ):

# Create the plot:
self.plot = plot = Plot( pd )
plot.plot( ( 'index', 'value' ),
type = 'scatter',
index_sort = 'ascending',
marker = self.marker,
color = self.color,
outline_color = self.outline_color,
marker_size = self.marker_size,
line_width = self.line_width,
bgcolor = 'white' )
plot.set( padding_left = 50,
padding_right = 0,
padding_top = 0,
padding_bottom = 20 )
plot.plot( ( 'index', 'value' ),
type = 'scatter',
index_sort = 'ascending',
marker = self.marker,
color = self.color,
outline_color = self.outline_color,
marker_size = self.marker_size,
line_width = self.line_width,
bgcolor = 'white' )
plot.trait_set( padding_left = 50,
padding_right = 0,
padding_top = 0,
padding_bottom = 20 )

# Attach some tools to the plot:
plot.tools.append( PanTool( plot, constrain_key = 'shift' ) )
Expand Down