Skip to content

Commit f11572a

Browse files
authored
Merge pull request #338 from vidartf/traitlets5
fix traitlets5 compat
2 parents 4c40956 + 2d83059 commit f11572a

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
language: python
22
python:
3+
- 3.9
4+
- 3.8
35
- 3.7
46
- 3.6
5-
- 3.5
6-
- 2.7
77
sudo: false
88
dist: xenial
99
env:
1010
matrix:
1111
- GROUP=python
1212
matrix:
1313
include:
14-
- python: 3.5
14+
- python: 3.9
1515
env: GROUP=docs
1616
addons:
1717
apt:

docs/sphinxext/autodoc_traits.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def format_name(self):
7878
return self.objpath[-1]
7979

8080
def add_directive_header(self, sig):
81-
default = self.object.get_default_value()
81+
default = self.object.default_value
8282
if default is Undefined:
8383
default_s = ''
8484
else:

pythreejs/traits.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
4545
trait = CFloat()
4646
if default_value is Undefined:
4747
default_value = self.default_value
48+
else:
49+
self.default_value = default_value
4850
super(Vector2, self).__init__(*(trait, trait), default_value=default_value, **kwargs)
4951

5052

@@ -60,6 +62,8 @@ def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
6062
trait = CFloat()
6163
if default_value is Undefined:
6264
default_value = self.default_value
65+
else:
66+
self.default_value = default_value
6367
super(Vector3, self).__init__(*(trait, trait, trait), default_value=default_value, **kwargs)
6468

6569

@@ -75,6 +79,8 @@ def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
7579
trait = CFloat()
7680
if default_value is Undefined:
7781
default_value = self.default_value
82+
else:
83+
self.default_value = default_value
7884
super(Vector4, self).__init__(*(trait, trait, trait, trait), default_value=default_value, **kwargs)
7985

8086

@@ -94,6 +100,8 @@ def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
94100
trait = CFloat()
95101
if default_value is Undefined:
96102
default_value = self.default_value
103+
else:
104+
self.default_value = default_value
97105
super(Matrix3, self).__init__(*((trait,) * 9), default_value=default_value, **kwargs)
98106

99107

@@ -114,6 +122,8 @@ def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
114122
trait = CFloat()
115123
if default_value is Undefined:
116124
default_value = self.default_value
125+
else:
126+
self.default_value = default_value
117127
super(Matrix4, self).__init__(*((trait,) * 16), default_value=default_value, **kwargs)
118128

119129

@@ -161,6 +171,8 @@ class Euler(Tuple):
161171
def __init__(self, default_value=Undefined, **kwargs):
162172
if default_value is Undefined:
163173
default_value = self.default_value
174+
else:
175+
self.default_value = default_value
164176
super(Euler, self).__init__(
165177
CFloat(), CFloat(), CFloat(),
166178
Enum(self._accepted_orders, self._accepted_orders[0]),

0 commit comments

Comments
 (0)