psd-tools · kyamagu · Apr 5, 2019 · Apr 5, 2019 · Apr 5, 2019 · Apr 5, 2019
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,10 @@
+1.8.13 (2019-04-05)
+-------------------
+
+- fix engine_data unknown tag format;
+- fix compose for extra alpha channels;
+- workaround for pillow 6.0.0 bug.
+
 1.8.12 (2019-03-25)
 -------------------
 

diff --git a/setup.py b/setup.py
@@ -28,10 +28,10 @@ def get_version():
     ),
     license='MIT License',
     install_requires=[
-        'docopt >= 0.5',
+        'docopt>=0.5',
         'packbits',
         'attrs',
-        'Pillow',
+        'Pillow!=6.0.0',
         'enum34;python_version<"3.4"',
     ],
     keywords="photoshop psd pil pillow",

diff --git a/src/psd_tools/api/pil_io.py b/src/psd_tools/api/pil_io.py
@@ -32,14 +32,29 @@ def get_pil_mode(value, alpha=False):
     return name
 
 
-def extract_pil_mode(psd):
-    """Extract PIL mode from PSD."""
-    alpha = _get_alpha_use(psd)
-    return get_pil_mode(psd.header.color_mode, alpha)
+def get_pil_channels(pil_mode):
+    """Get the number of channels for PIL modes."""
+    return {
+        '1': 1,
+        'L': 1,
+        'P': 1,
+        'P': 1,
+        'RGB': 3,
+        'CMYK': 4,
+        'YCbCr': 3,
+        'LAB': 3,
+        'HSV': 3,
+        'I': 1,
+        'F': 1,
+    }.get(pil_mode, 3)
 
 
 def convert_image_data_to_pil(psd, apply_icc=True, **kwargs):
-    """Convert ImageData to PIL Image."""
+    """Convert ImageData to PIL Image.
+
+    .. note:: Image resources contain extra alpha channels in these keys:
+        `ALPHA_NAMES_UNICODE`, `ALPHA_NAMES_PASCAL`, `ALPHA_IDENTIFIERS`.
+    """
     from PIL import Image, ImageOps
     header = psd.header
     size = (header.width, header.height)
@@ -49,12 +64,12 @@ def convert_image_data_to_pil(psd, apply_icc=True, **kwargs):
     alpha = _get_alpha_use(psd)
     mode = get_pil_mode(header.color_mode.name)
     if mode == 'P':
-        image = Image.merge('L', channels[:(len(channels) - alpha)])
+        image = Image.merge('L', channels[:get_pil_channels(mode)])
         image.putpalette(psd.color_mode_data.interleave())
     elif mode == 'MULTICHANNEL':
         image = channels[0]  # Multi-channel mode is a collection of alpha.
     else:
-        image = Image.merge(mode, channels[:(len(channels) - alpha)])
+        image = Image.merge(mode, channels[:get_pil_channels(mode)])
     if mode == 'CMYK':
         image = image.point(lambda x: 255 - x)
     if apply_icc and 'ICC_PROFILE' in psd.image_resources:

diff --git a/src/psd_tools/psd/engine_data.py b/src/psd_tools/psd/engine_data.py
@@ -66,7 +66,7 @@ class EngineToken(Enum):
     PROPERTY = compile_re(r'^\/[a-zA-Z0-9]+$')
     STRING = compile_re(r'^\((\xfe\xff([^\)]|\\\))*)\)$')
     # Unknown tags: b'(hwid)', b'(fwid)', b'(aalt)'
-    UNKNOWN_TAG = compile_re(r'^\([a-zA-Z0-9]+\)$')
+    UNKNOWN_TAG = compile_re(r'^\([a-zA-Z0-9]*\)$')
 
 
 class Tokenizer(object):

diff --git a/src/psd_tools/psd/header.py b/src/psd_tools/psd/header.py
@@ -35,7 +35,8 @@ class FileHeader(BaseElement):
 
     .. py:attribute:: channels
 
-        The number of channels in the image, including any alpha channels.
+        The number of channels in the image, including any user-defined alpha
+        channel.
 
     .. py:attribute:: height
 

diff --git a/src/psd_tools/version.py b/src/psd_tools/version.py
@@ -1 +1 @@
-__version__ = '1.8.12'
+__version__ = '1.8.13'
diff --git a/tests/engine_data/Txt2_3.dat b/tests/engine_data/Txt2_3.dat
diff --git a/tests/psd_files/colormodes/4x4_8bit_rgba.psd b/tests/psd_files/colormodes/4x4_8bit_rgba.psd
diff --git a/tests/psd_tools/api/test_composer.py b/tests/psd_tools/api/test_composer.py
@@ -60,6 +60,7 @@ def test_compose_minimal(filename):
     ('grayscale', 8),
     ('index_color', 8),
     ('rgb', 8),
+    ('rgba', 8),
     ('lab', 8),
     ('cmyk', 16),
     ('grayscale', 16),

diff --git a/tests/psd_tools/psd/test_engine_data.py b/tests/psd_tools/psd/test_engine_data.py
@@ -32,6 +32,7 @@ def test_tokenizer_item(fixture, token_type):
     ('TySh_1.dat', 0, True),
     ('Txt2_1.dat', None, False),
     ('Txt2_2.dat', None, False),
+    ('Txt2_3.dat', None, False),
 ])
 def test_engine_data(filename, indent, write):
     filepath = os.path.join(TEST_ROOT, 'engine_data', filename)