@@ -158,25 +158,25 @@ def _query_and_transform(self, renderer, *, xunits: List[str], yunits: List[str]
158
158
self ._cache [cache_key ] = transformed_data
159
159
return transformed_data
160
160
161
- def __init__ (self , data , nus , ** kwargs ):
161
+ def __init__ (self , data , converters , ** kwargs ):
162
162
super ().__init__ (** kwargs )
163
163
self .data = data
164
164
self ._cache = LFUCache (64 )
165
165
# TODO make sure mutating this will invalidate the cache!
166
- self ._nus = nus or {}
166
+ self ._converters = converters or {}
167
167
for k in self .required_keys :
168
- self ._nus .setdefault (k , _make_identity (k ))
168
+ self ._converters .setdefault (k , _make_identity (k ))
169
169
desc = data .describe ()
170
170
for k in self .expected_keys :
171
171
if k in desc :
172
- self ._nus .setdefault (k , _make_identity (k ))
173
- self ._sigs = {k : (nu , inspect .signature (nu )) for k , nu in self ._nus .items ()}
172
+ self ._converters .setdefault (k , _make_identity (k ))
173
+ self ._sigs = {k : (nu , inspect .signature (nu )) for k , nu in self ._converters .items ()}
174
174
self .stale = True
175
175
176
176
# TODO add a setter
177
177
@property
178
- def nus (self ):
179
- return dict (self ._nus )
178
+ def converters (self ):
179
+ return dict (self ._converters )
180
180
181
181
182
182
class ProxyWrapper (ProxyWrapperBase ):
@@ -192,7 +192,7 @@ def __getattr__(self, key):
192
192
return getattr (self ._wrapped_instance , key )
193
193
194
194
def __setattr__ (self , key , value ):
195
- if key in ("_wrapped_instance" , "data" , "_cache" , "_nus " , "stale" , "_sigs" ):
195
+ if key in ("_wrapped_instance" , "data" , "_cache" , "_converters " , "stale" , "_sigs" ):
196
196
super ().__setattr__ (key , value )
197
197
elif hasattr (self , "_wrapped_instance" ) and hasattr (self ._wrapped_instance , key ):
198
198
setattr (self ._wrapped_instance , key , value )
@@ -205,8 +205,8 @@ class LineWrapper(ProxyWrapper):
205
205
_privtized_methods = ("set_xdata" , "set_ydata" , "set_data" , "get_xdata" , "get_ydata" , "get_data" )
206
206
required_keys = {"x" , "y" }
207
207
208
- def __init__ (self , data : DataContainer , nus = None , / , ** kwargs ):
209
- super ().__init__ (data , nus )
208
+ def __init__ (self , data : DataContainer , converters = None , / , ** kwargs ):
209
+ super ().__init__ (data , converters )
210
210
self ._wrapped_instance = self ._wrapped_class (np .array ([]), np .array ([]), ** kwargs )
211
211
212
212
@_stale_wrapper
@@ -238,8 +238,8 @@ class PathCollectionWrapper(ProxyWrapper):
238
238
"get_paths" ,
239
239
)
240
240
241
- def __init__ (self , data : DataContainer , nus = None , / , ** kwargs ):
242
- super ().__init__ (data , nus )
241
+ def __init__ (self , data : DataContainer , converters = None , / , ** kwargs ):
242
+ super ().__init__ (data , converters )
243
243
self ._wrapped_instance = self ._wrapped_class ([], ** kwargs )
244
244
self ._wrapped_instance .set_transform (mtransforms .IdentityTransform ())
245
245
@@ -262,17 +262,17 @@ class ImageWrapper(ProxyWrapper):
262
262
_wrapped_class = _AxesImage
263
263
required_keys = {"xextent" , "yextent" , "image" }
264
264
265
- def __init__ (self , data : DataContainer , nus = None , / , cmap = None , norm = None , ** kwargs ):
266
- nus = dict (nus or {})
265
+ def __init__ (self , data : DataContainer , converters = None , / , cmap = None , norm = None , ** kwargs ):
266
+ converters = dict (converters or {})
267
267
if cmap is not None or norm is not None :
268
- if nus is not None and "image" in nus :
268
+ if converters is not None and "image" in converters :
269
269
raise ValueError ("Conflicting input" )
270
270
if cmap is None :
271
271
cmap = mpl .colormaps ["viridis" ]
272
272
if norm is None :
273
273
raise ValueError ("not sure how to do autoscaling yet" )
274
- nus ["image" ] = lambda image : cmap (norm (image ))
275
- super ().__init__ (data , nus )
274
+ converters ["image" ] = lambda image : cmap (norm (image ))
275
+ super ().__init__ (data , converters )
276
276
kwargs .setdefault ("origin" , "lower" )
277
277
self ._wrapped_instance = self ._wrapped_class (None , ** kwargs )
278
278
@@ -293,8 +293,8 @@ class StepWrapper(ProxyWrapper):
293
293
_privtized_methods = () # ("set_data", "get_data")
294
294
required_keys = {"edges" , "density" }
295
295
296
- def __init__ (self , data : DataContainer , nus = None , / , ** kwargs ):
297
- super ().__init__ (data , nus )
296
+ def __init__ (self , data : DataContainer , converters = None , / , ** kwargs ):
297
+ super ().__init__ (data , converters )
298
298
self ._wrapped_instance = self ._wrapped_class ([], [1 ], ** kwargs )
299
299
300
300
@_stale_wrapper
@@ -312,8 +312,8 @@ class FormatedText(ProxyWrapper):
312
312
_wrapped_class = _Text
313
313
_privtized_methods = ("set_text" ,)
314
314
315
- def __init__ (self , data : DataContainer , nus = None , / , ** kwargs ):
316
- super ().__init__ (data , nus )
315
+ def __init__ (self , data : DataContainer , converters = None , / , ** kwargs ):
316
+ super ().__init__ (data , converters )
317
317
self ._wrapped_instance = self ._wrapped_class (text = "" , ** kwargs )
318
318
319
319
@_stale_wrapper
@@ -368,8 +368,8 @@ class ErrorbarWrapper(MultiProxyWrapper):
368
368
required_keys = {"x" , "y" }
369
369
expected_keys = {f"{ axis } { dirc } " for axis in ["x" , "y" ] for dirc in ["upper" , "lower" ]}
370
370
371
- def __init__ (self , data : DataContainer , nus = None , / , ** kwargs ):
372
- super ().__init__ (data , nus )
371
+ def __init__ (self , data : DataContainer , converters = None , / , ** kwargs ):
372
+ super ().__init__ (data , converters )
373
373
# TODO all of the kwarg teasing apart that is needed
374
374
color = kwargs .pop ("color" , "k" )
375
375
lw = kwargs .pop ("lw" , 2 )
0 commit comments