merge from master

.gitignore

@@ -1,11 +1,56 @@
-*.pyc
+# Byte-compiled / optimized / DLL files
-*.egg-info
+__pycache__/
-build
+*.py[cod]
-dist
+
-.tox
+# C extensions
 *.so
-docs/_build
+
-*~
+# Distribution / packaging
+.Python
+env/
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# Rope
+.ropeproject
+
+# Django stuff:
+*.log
+*.pot
+
+# Sphinx documentation
+docs/_build/
 
 # Vim cruft
 .*.swp

.travis.yml

@@ -17,6 +17,7 @@ python:
 install:
   - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev cmake"
   - "pip install cffi"
+  - "pip install coveralls"
 
   # webp
   - pushd depends && ./install_webp.sh && popd
@@ -25,10 +26,18 @@ install:
   - pushd depends && ./install_openjpeg.sh && popd
 
 script:
+  - coverage erase
   - python setup.py clean
   - python setup.py build_ext --inplace
-  - python selftest.py
+  - coverage run --append --include=PIL/* selftest.py
-  - python Tests/run.py
+  - python Tests/run.py --coverage
+
+after_success:
+  - coverage report
+  - coveralls
+  - pip install pep8 pyflakes
+  - pep8 PIL/*.py
+  - pyflakes PIL/*.py
 
 matrix:
   allow_failures:

CHANGES.rst

@@ -1,6 +1,15 @@
 Changelog (Pillow)
 ==================
 
+2.5.0 (unreleased)
+------------------
+
+- Have the tempfile use a suffix with a dot
+  [wiredfool]
+
+- Fix variable name used for transparency manipulations
+  [nijel]
+
 2.4.0 (2014-04-01)
 ------------------
 

PIL/Image.py

@@ -505,15 +505,18 @@ class Image:
 
     def _dump(self, file=None, format=None):
         import tempfile, os
+        suffix = ''
+        if format:
+            suffix = '.'+format
         if not file:
-            f, file = tempfile.mkstemp(format or '')
+            f, file = tempfile.mkstemp(suffix)
             os.close(f)
             
         self.load()
         if not format or format == "PPM":
             self.im.save_ppm(file)
         else:
-            if file.endswith(format):
+            if not file.endswith(format):
                 file = file + "." + format
             self.save(file, format)
         return file
@@ -807,7 +810,7 @@ class Image:
         new_im = self._new(im)
         if delete_trns:
             #crash fail if we leave a bytes transparency in an rgb/l mode.
-            del(new.info['transparency'])
+            del(new_im.info['transparency'])
         if trns is not None:
             if new_im.mode == 'P':
                 try:

README.rst

@@ -5,8 +5,9 @@ Pillow
 
 Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
 
-.. image:: https://travis-ci.org/python-imaging/Pillow.png
+.. image:: https://travis-ci.org/python-imaging/Pillow.svg?branch=master
    :target: https://travis-ci.org/python-imaging/Pillow
+   :alt: Travis CI build status
 
 .. image:: https://pypip.in/v/Pillow/badge.png
     :target: https://pypi.python.org/pypi/Pillow/
@@ -16,4 +17,7 @@ Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Pyt
     :target: https://pypi.python.org/pypi/Pillow/
     :alt: Number of PyPI downloads
 
+.. image:: https://coveralls.io/repos/python-imaging/Pillow/badge.png?branch=master
+  :target: https://coveralls.io/r/python-imaging/Pillow?branch=master
+
 The documentation is hosted at http://pillow.readthedocs.org/. It contains installation instructions, tutorials, reference, compatibility details, and more.

Tests/run.py

@@ -2,7 +2,12 @@ from __future__ import print_function
 
 # minimal test runner
 
-import glob, os, os.path, sys, tempfile, re
+import glob
+import os
+import os.path
+import re
+import sys
+import tempfile
 
 try:
     root = os.path.dirname(__file__)
@@ -34,6 +39,7 @@ files.sort()
 success = failure = 0
 include = [x for x in sys.argv[1:] if x[:2] != "--"]
 skipped = []
+failed = []
 
 python_options = " ".join(python_options)
 tester_options = " ".join(tester_options)
@@ -91,7 +97,7 @@ for file in files:
                 # if there's an ok at the end, it's not really ok
                 result = result[:-3]
             print(result)
-        failure = failure + 1
+        failed.append(test)
     else:
         success = success + 1
 
@@ -105,6 +111,7 @@ if tempfiles:
         print(file)
     print("-"*68)
 
+
 def tests(n):
     if n == 1:
         return "1 test"
@@ -112,10 +119,12 @@ def tests(n):
         return "%d tests" % n
 
 if skipped:
-    print("---", tests(len(skipped)), "skipped.")
+    print("---", tests(len(skipped)), "skipped:")
-    print(skipped)
+    print(", ".join(skipped))
-if failure:
+if failed:
-    print("***", tests(failure), "of", (success + failure), "failed.")
+    failure = len(failed)
+    print("***", tests(failure), "of", (success + failure), "failed:")
+    print(", ".join(failed))
     sys.exit(1)
 else:
     print(tests(success), "passed.")

Tests/test_mode_i16.py

@@ -2,6 +2,7 @@ from tester import *
 
 from PIL import Image
 
+
 def verify(im1):
     im2 = lena("I")
     assert_equal(im1.size, im2.size)
@@ -18,6 +19,7 @@ def verify(im1):
                 return
     success()
 
+
 def test_basic():
     # PIL 1.1 has limited support for 16-bit image data.  Check that
     # create/copy/transform and save works as expected.

Tests/tester.py

@@ -11,8 +11,6 @@ except NameError:
     # we expect a NameError on py2.x, since it doesn't have ResourceWarnings.
     pass
 
-
-
 import sys
 py3 = (sys.version_info >= (3, 0))
 
@@ -22,6 +20,7 @@ _target = None
 _tempfiles = []
 _logfile = None
 
+
 def success():
     import sys
     success.count += 1
@@ -29,8 +28,10 @@ def success():
         print(sys.argv[0], success.count, failure.count, file=_logfile)
     return True
 
+
 def failure(msg=None, frame=None):
-    import sys, linecache
+    import sys
+    import linecache
     failure.count += 1
     if _target:
         if frame is None:
@@ -49,6 +50,7 @@ def failure(msg=None, frame=None):
 
 success.count = failure.count = 0
 
+
 # predicates
 
 def assert_true(v, msg=None):
@@ -57,24 +59,28 @@ def assert_true(v, msg=None):
     else:
         failure(msg or "got %r, expected true value" % v)
 
+
 def assert_false(v, msg=None):
     if v:
         failure(msg or "got %r, expected false value" % v)
     else:
         success()
 
+
 def assert_equal(a, b, msg=None):
     if a == b:
         success()
     else:
         failure(msg or "got %r, expected %r" % (a, b))
 
+
 def assert_almost_equal(a, b, msg=None, eps=1e-6):
     if abs(a-b) < eps:
         success()
     else:
         failure(msg or "got %r, expected %r" % (a, b))
 
+
 def assert_deep_equal(a, b, msg=None):
     try:
         if len(a) == len(b):
@@ -95,8 +101,10 @@ def assert_match(v, pattern, msg=None):
     else:
         failure(msg or "got %r, doesn't match pattern %r" % (v, pattern))
 
+
 def assert_exception(exc_class, func):
-    import sys, traceback
+    import sys
+    import traceback
     try:
         func()
     except exc_class:
@@ -108,8 +116,10 @@ def assert_exception(exc_class, func):
     else:
         failure("expected %r exception, got no exception" % exc_class.__name__)
 
+
 def assert_no_exception(func):
-    import sys, traceback
+    import sys
+    import traceback
     try:
         func()
     except:
@@ -118,11 +128,14 @@ def assert_no_exception(func):
     else:
         success()
 
+
 def assert_warning(warn_class, func):
     # note: this assert calls func three times!
     import warnings
+
     def warn_error(message, category=UserWarning, **options):
         raise category(message)
+
     def warn_ignore(message, category=UserWarning, **options):
         pass
     warn = warnings.warn
@@ -141,15 +154,18 @@ def assert_warning(warn_class, func):
 
 from io import BytesIO
 
+
 def fromstring(data):
     from PIL import Image
     return Image.open(BytesIO(data))
 
+
 def tostring(im, format, **options):
     out = BytesIO()
     im.save(out, format, **options)
     return out.getvalue()
 
+
 def lena(mode="RGB", cache={}):
     from PIL import Image
     im = cache.get(mode)
@@ -165,6 +181,7 @@ def lena(mode="RGB", cache={}):
     cache[mode] = im
     return im
 
+
 def assert_image(im, mode, size, msg=None):
     if mode is not None and im.mode != mode:
         failure(msg or "got mode %r, expected %r" % (im.mode, mode))
@@ -173,6 +190,7 @@ def assert_image(im, mode, size, msg=None):
     else:
         success()
 
+
 def assert_image_equal(a, b, msg=None):
     if a.mode != b.mode:
         failure(msg or "got mode %r, expected %r" % (a.mode, b.mode))
@@ -184,6 +202,7 @@ def assert_image_equal(a, b, msg=None):
     else:
         success()
 
+
 def assert_image_similar(a, b, epsilon, msg=None):
     epsilon = float(epsilon)
     if a.mode != b.mode:
@@ -200,12 +219,18 @@ def assert_image_similar(a, b, epsilon, msg=None):
             diff += abs(abyte-bbyte)
     ave_diff = float(diff)/(a.size[0]*a.size[1])
     if epsilon < ave_diff:
-        return failure(msg or "average pixel value difference %.4f > epsilon %.4f" %(ave_diff, epsilon))
+        return failure(
+            msg or "average pixel value difference %.4f > epsilon %.4f" % (
+                ave_diff, epsilon))
     else:
         return success()
 
+
 def tempfile(template, *extra):
-    import os, os.path, sys, tempfile
+    import os
+    import os.path
+    import sys
+    import tempfile
     files = []
     root = os.path.join(tempfile.gettempdir(), 'pillow-tests')
     try:
@@ -222,11 +247,13 @@ def tempfile(template, *extra):
     _tempfiles.extend(files)
     return files[0]
 
+
 # test runner
 
 def run():
     global _target, _tests, run
-    import sys, traceback
+    import sys
+    import traceback
     _target = sys.modules["__main__"]
     run = None  # no need to run twice
     tests = []
@@ -251,29 +278,42 @@ def run():
                     sys.argv[0], lineno, v))
                 failure.count += 1
 
+
 def yield_test(function, *args):
     # collect delayed/generated tests
     _tests.append((function, args))
 
+
 def skip(msg=None):
     import os
     print("skip")
     os._exit(0)  # don't run exit handlers
 
+
 def ignore(pattern):
     """Tells the driver to ignore messages matching the pattern, for the
     duration of the current test."""
     print('ignore: %s' % pattern)
 
+
 def _setup():
     global _logfile
+
+    import sys
+    if "--coverage" in sys.argv:
+        import coverage
+        cov = coverage.coverage(auto_data=True, include="PIL/*")
+        cov.start()
+
     def report():
         if run:
             run()
         if success.count and not failure.count:
             print("ok")
             # only clean out tempfiles if test passed
-            import os, os.path, tempfile
+            import os
+            import os.path
+            import tempfile
             for file in _tempfiles:
                 try:
                     os.remove(file)
@@ -285,18 +325,9 @@ def _setup():
             except OSError:
                 pass
 
-        if "--coverage" in sys.argv:
+    import atexit
-            import coverage
-            coverage.stop()
-            # The coverage module messes up when used from inside an
-            # atexit handler.  Do an explicit save to make sure that
-            # we actually flush the coverage cache.
-            coverage.the_coverage.save()
-    import atexit, sys
     atexit.register(report)
-    if "--coverage" in sys.argv:
+
-        import coverage
-        coverage.start()
     if "--log" in sys.argv:
         _logfile = open("test.log", "a")
 

docs/index.rst

@@ -4,8 +4,9 @@ Pillow
 Pillow is the 'friendly' PIL fork by Alex Clark and Contributors. PIL is the
 Python Imaging Library by Fredrik Lundh and Contributors.
 
-.. image:: https://travis-ci.org/python-imaging/Pillow.png
+.. image:: https://travis-ci.org/python-imaging/Pillow.svg?branch=master
    :target: https://travis-ci.org/python-imaging/Pillow
+   :alt: Travis CI build status
 
 .. image:: https://pypip.in/v/Pillow/badge.png
     :target: https://pypi.python.org/pypi/Pillow/
@@ -15,6 +16,10 @@ Python Imaging Library by Fredrik Lundh and Contributors.
     :target: https://pypi.python.org/pypi/Pillow/
     :alt: Number of PyPI downloads
 
+.. image:: https://coveralls.io/repos/python-imaging/Pillow/badge.png?branch=master
+    :target: https://coveralls.io/r/python-imaging/Pillow?branch=master
+    :alt: Test coverage
+
 To start using Pillow, please read the :doc:`installation
 instructions <installation>`.