8000 now requires most revent version of traitlets · rmorshea/matplotlib@32dfec0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 32dfec0

Browse files
rmorshearmorshea
committed
now requires most revent version of traitlets
1 parent 5357b3e commit 32dfec0

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎lib/matplotlib/patches.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def get_data_transform(self):
209209
maps data coordinates to physical coordinates.
210210
"""
211211
trait = self.__class__.transform
212-
return trait.__base_get__(self,None)
212+
return trait.get(self, None)
213213

214214
def get_patch_transform(self):
215215
"""

‎lib/matplotlib/tests/test_quiver.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def test_quiver_memory_leak():
2727
Q.remove()
2828

2929
del Q
30-
print(sys.getrefcount(ttX))
30+
3131
assert sys.getrefcount(ttX) == 2
3232

3333

@@ -40,7 +40,7 @@ def test_quiver_key_memory_leak():
4040
qk = ax.quiverkey(Q, 0.5, 0.92, 2, r'$2 \frac{m}{s}$',
4141
labelpos='W',
4242
fontproperties={'weight': 'bold'})
43-
#assert sys.getrefcount(qk) == 3
43+
assert sys.getrefcount(qk) == 3
4444
qk.remove()
4545
assert sys.getrefcount(qk) == 2
4646

‎lib/matplotlib/traitlets.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
from __future__ import (absolute_import, division,
22
print_function, unicode_literals)
33

4-
try:
5-
# IPython4 imports
6-
from traitlets.config import Configurable, Config
7-
from traitlets import (TraitType, Int, Float, Bool,
8-
Dict, List, Instance, Union,
9-
Unicode, Tuple, TraitError,
10-
Undefined, BaseDescriptor,
11-
getargspec, observe, default,
12-
validate, EventHandler)
13-
except ImportError:
14-
# IPython3 imports
15-
from IPython.utils.traitlets.config import Configurable, Config
16-
from IPython.utils.traitlets import (TraitType, Int, Float, Bool,
17-
Dict, List, Instance, Union, Unicode,
18-
Tuple, TraitError, Undefined, BaseDescriptor,
19-
getargspec, observe, default, validate,
20-
EventHandler)
4+
# IPython4 imports
5+
from traitlets.config import Configurable, Config
6+
from traitlets import (TraitType, Int, Float, Bool,
7+
Dict, List, Instance, Union,
8+
Unicode, Tuple, TraitError,
9+
Undefined, BaseDescriptor,
10+
getargspec, observe, default,
11+
validate, EventHandler)
2112

2213
import re
2314
import types
@@ -68,6 +59,9 @@ def private(self, name, value=Undefined):
6859
self._notify_trait = _notify_trait
6960
self._cross_validation_lock = False
7061

62+
if isinstance(_notify_trait, types.MethodType):
63+
self.__dict__.pop('_notify_trait')
64+
7165
return trait.get(self, None)
7266

7367
def _retrieve_trait(self, name):
@@ -93,11 +87,17 @@ def __init__(self, name):
9387
def instance_init(self, inst):
9488
if not hasattr(inst, '_retrieve_handlers'):
9589
inst._retrieve_handlers = {}
96-
if self._name in inst._retrieve_handlers:
97-
raise TraitError("A retriever for the trait '%s' has "
98-
"already been registered" % self._name)
90+
handler = inst._retrieve_handlers.get(self._name)
91+
if handler and hasattr(handler, 'func'):
92+
raise TraitError("A retriever for the trait '%s' has "
93+
"already been registered" % self._name)
9994
inst._retrieve_handlers[self._name] = self
10095

96+
def __getstate__(self):
97+
d = self.__dict__.copy()
98+
d.pop('func', None)
99+
return d
100+
101101
class OnGetMixin(object):
102102

103103
def __get__(self, obj, cls=None):

0 commit comments

Comments
 (0)
0