Skip to content

Commit

Permalink
Merge pull request #141 from psd-tools/v1.8.28
Browse files Browse the repository at this point in the history
v1.8.28
  • Loading branch information
kyamagu committed Sep 9, 2019
2 parents 5996e0a + 151ff56 commit 79c0e32
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
1.8.28 (2019-09-09)
-------------------

- [api] fix `Effects.__repr__()` when data is empty.

1.8.27 (2019-08-29)
-------------------

Expand Down
11 changes: 6 additions & 5 deletions src/psd_tools/api/effects.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ def __init__(self, layer):
@property
def scale(self):
"""Scale value."""
return self._data.get(Key.Scale).value
return self._data.get(Key.Scale).value if self._data else None

@property
def enabled(self):
"""Whether if all the effects are enabled.
:rtype: bool
"""
return bool(self._data.get(b'masterFXSwitch'))
return bool(self._data.get(b'masterFXSwitch')) if self._data else False

@property
def items(self):
Expand All @@ -78,9 +78,10 @@ def __getitem__(self, key):
# return self._items.__delitem__(key)

def __repr__(self):
return '%s(%s%s)' % (
self.__class__.__name__, '' if self.enabled else 'disabled ',
' '.join(x.__class__.__name__.lower() for x in self)
return '%s(%s)' % (
self.__class__.__name__,
' '.join(x.__class__.__name__.lower()
for x in self) if self._data else ''
)


Expand Down
2 changes: 1 addition & 1 deletion src/psd_tools/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.8.27'
__version__ = '1.8.28'
2 changes: 2 additions & 0 deletions tests/psd_tools/api/test_effects.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ def fixture():
def test_effects(fixture):
assert isinstance(fixture[0].effects.scale, float)
assert fixture[0].effects.enabled is True
for layer in fixture:
assert layer.__repr__()
for effect in fixture[0].effects:
assert effect.enabled is True

Expand Down

0 comments on commit 79c0e32

Please sign in to comment.