Dropped support for Python 2

docs/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Wand documentation build configuration file, created by
 # sphinx-quickstart on Wed Sep 28 18:27:30 2011.
 #
@@ -31,7 +29,7 @@
     except ImportError:
         pass
 
-    class Mock(object):
+    class Mock:
         def __init__(self, name):
             self.name = name
 

docs/guide/draw.rst

@@ -361,7 +361,7 @@ The following example will draw points following a math function across a given
     import math
     
     with Drawing() as draw:
-        for x in xrange(0, 100):
+        for x in range(0, 100):
             y = math.tan(x) * 4
             draw.point(x, y + 50)
         with Image(width=100, height=100, background=Color('lightblue')) as image:
@@ -491,12 +491,9 @@ exist to match there pop counterparts.
     from wand.color import Color
     from wand.image import Image
     from wand.drawing import Drawing
-    from wand.compat import nested
     from math import cos, pi, sin
 
-    with nested(Color('lightblue'),
-                Color('transparent'),
-                Drawing()) as (bg, fg, draw):
+    with Color('lightblue') as bg, Color('transparent') as fg, Drawing() as draw:
         draw.stroke_width = 3
         draw.fill_color = fg
         for degree in range(0, 360, 15):

docs/guide/install.rst

@@ -206,8 +206,7 @@ You can install it using :program:`dnf` command:
 
 .. code-block:: console
 
-   $ dnf install python-wand   # Python 2
-   $ dnf install python3-wand  # Python 3
+   $ dnf install python3-wand
 
 __ https://admin.fedoraproject.org/pkgdb/package/python-wand/
 

docs/guide/read.rst

@@ -23,7 +23,6 @@ The most frequently used way is just to open an image by its filename.
 :class:`~wand.image.Image`'s constructor can take the parameter named
 ``filename``::
 
-    from __future__ import print_function
     from wand.image import Image
 
     with Image(filename='pikachu.png') as img:
@@ -51,7 +50,6 @@ contained in :class:`~StringIO.StringIO`, read by :func:`urllib2.urlopen()`),
 it can be read by :class:`~wand.image.Image` constructor's ``file`` parameter.
 It takes all file-like objects which implements :meth:`~file.read()` method::
 
-    from __future__ import print_function
     from urllib2 import urlopen
     from wand.image import Image
 
@@ -73,13 +71,12 @@ so it also can be used as an input stream for a downloaded image.
 Read a blob
 -----------
 
-If you have just a binary string (:class:`str`) of the image, you can pass
+If you have just a binary string (:class:`bytes`) of the image, you can pass
 it into :class:`~wand.image.Image` constructor's ``blob`` parameter to read::
 
-    from __future__ import print_function
     from wand.image import Image
 
-    with open('pikachu.png') as f:
+    with open('pikachu.png', 'rb') as f:
         image_binary = f.read()
 
     with Image(blob=image_binary) as img:

docs/index.rst

@@ -61,9 +61,8 @@ are lacking something we need:
 Requirements
 ------------
 
-- Python 2.7 or higher
+- Python 3.3 or higher
 
-  - CPython 2.7 or higher
   - CPython 3.3 or higher
   - PyPy 1.5 or higher
 

docs/test.rst

@@ -73,7 +73,7 @@ Using tox_
 ----------
 
 Wand should be compatible with various Python implementations including
-CPython 2.7, 3.3, PyPy.  tox_ is a testing software that helps Python
+CPython 3.3, PyPy.  tox_ is a testing software that helps Python
 packages to test on various Python implementations at a time.
 
 It can be installed using :program:`pip`:
@@ -89,10 +89,10 @@ on multiple Python interpreters:
 
    $ tox
    GLOB sdist-make: /Users/emcconville/Desktop/wand/setup.py
-   py26 create: /Users/emcconville/Desktop/wand/.tox/py26
-   py26 installdeps: pytest
-   py26 sdist-inst: /Users/emcconville/Desktop/wand/.tox/dist/Wand-0.2.2.zip
-   py26 runtests: commands[0]
+   py37 create: /Users/emcconville/Desktop/wand/.tox/py37
+   py37 installdeps: pytest
+   py37 sdist-inst: /Users/emcconville/Desktop/wand/.tox/dist/Wand-0.2.2.zip
+   py37 runtests: commands[0]
    ...
 
 You can use a double ``--`` to pass options to pytest:

docs/whatsnew/0.3.rst

@@ -89,7 +89,6 @@ EXIF
 Wand now can read EXIF metadata from images through :attr:`metadata
 <wand.image.Image>` property which is a mapping:
 
->>> from __future__ import print_function
 >>> url = 'http://farm9.staticflickr.com/8282/7874109806_3fe0080ae4_o_d.jpg'
 >>> with Image(file=urllib2.urlopen(url)) as i:
 ...     for key, value in i.metadata.items():

setup.py

@@ -1,9 +1,6 @@
 import os
 import os.path
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from setuptools import setup
 
 from wand.version import VERSION
 
@@ -59,8 +56,6 @@ def run_tests(self):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',

tests/color_test.py

@@ -8,7 +8,6 @@
 from pytest import mark, raises
 
 from wand.color import Color
-from wand.compat import xrange
 from wand.version import QUANTUM_DEPTH, MAGICK_VERSION_INFO  # noqa
 
 
@@ -307,7 +306,7 @@ def test_hsl():
 
 
 def color_memory_leak():
-    for _ in xrange(5000):
+    for _ in range(5000):
         with Color('orange'):
             pass
     time.sleep(0.02)

tests/image_methods_test.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # These test cover the Image methods that directly map to C-API function calls.
 #

tests/image_properties_test.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # These test cover the Image attributes that directly map to C-API functions.
 #
@@ -8,7 +7,6 @@
 from pytest import mark, raises
 
 from wand.color import Color
-from wand.compat import string_type
 from wand.exceptions import DelegateError
 from wand.font import Font
 from wand.image import Image
@@ -372,7 +370,7 @@ def test_metadata(fx_asset):
     with Image(filename=str(fx_asset.join('beach.jpg'))) as img:
         assert 52 <= len(img.metadata) <= 55
         for key in img.metadata:
-            assert isinstance(key, string_type)
+            assert isinstance(key, str)
         assert 'exif:ApertureValue' in img.metadata
         assert 'exif:UnknownValue' not in img.metadata
         assert img.metadata['exif:ApertureValue'] == '192/32'

tests/image_test.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # These tests cover the basic I/O & pythonic interfaces of the Image class.
 #
@@ -15,7 +14,6 @@
 
 from wand.image import ClosedImageError, Image
 from wand.color import Color
-from wand.compat import PY3, text, text_type
 
 try:
     filesystem_encoding = sys.getfilesystemencoding()
@@ -120,12 +118,10 @@ def test_read_from_filename(fx_asset):
 def test_read_from_unicode_filename(fx_asset, tmpdir):
     """https://github.com/emcconville/wand/issues/122"""
     filename = '모나리자.jpg'
-    if not PY3:
-        filename = filename.decode('utf-8')
-    path = os.path.join(text_type(tmpdir), filename)  # workaround py.path bug
+    path = os.path.join(str(tmpdir), filename)  # workaround py.path bug
     shutil.copyfile(str(fx_asset.join('mona-lisa.jpg')), path)
     with Image() as img:
-        img.read(filename=text(path))
+        img.read(filename=path)
         assert img.width == 402
 
 
@@ -172,11 +168,9 @@ def test_new_from_filename(fx_asset):
 def test_new_from_unicode_filename(fx_asset, tmpdir):
     """https://github.com/emcconville/wand/issues/122"""
     filename = '모나리자.jpg'
-    if not PY3:
-        filename = filename.decode('utf-8')
-    path = os.path.join(text_type(tmpdir), filename)  # workaround py.path bug
+    path = os.path.join(str(tmpdir), filename)  # workaround py.path bug
     shutil.copyfile(str(fx_asset.join('mona-lisa.jpg')), path)
-    with Image(filename=text(path)) as img:
+    with Image(filename=path) as img:
         assert img.width == 402
 
 
@@ -255,9 +249,7 @@ def test_save_to_filename(fx_asset):
              reason='Unicode filesystem encoding needed')
 def test_save_to_unicode_filename(fx_asset, tmpdir):
     filename = '모나리자.jpg'
-    if not PY3:
-        filename = filename.decode('utf-8')
-    path = os.path.join(text_type(tmpdir), filename)  # workaround py.path bug
+    path = os.path.join(str(tmpdir), filename)  # workaround py.path bug
     with Image(filename=str(fx_asset.join('mona-lisa.jpg'))) as orig:
         orig.save(filename=path)
     with Image(filename=path) as img:

tests/sequence_test.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 from pytest import mark, raises
 
 from wand.api import library

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py38
+envlist = py38
 
 [testenv]
 deps =

wand/assertions.py

@@ -8,12 +8,7 @@
 """
 
 import numbers
-try:
-    from collections.abc import Sequence
-except ImportError:
-    from collections import Sequence
-
-from .compat import string_type
+from collections.abc import Sequence
 
 
 def assert_bool(**kwargs):
@@ -132,7 +127,7 @@ def assert_coordinate(**kwargs):
 
 def assert_string(**kwargs):
     for label, subject in kwargs.items():
-        if not isinstance(subject, string_type):
+        if not isinstance(subject, str):
             fmt = "{0} must be a string, not {1}"
             msg = fmt.format(label, repr(subject))
             raise TypeError(msg)

wand/color.py

@@ -37,7 +37,7 @@ class Color(Resource):
     :param string: a color name string e.g. ``'rgb(255, 255, 255)'``,
                    ``'#fff'``, ``'white'``. see `ImageMagick Color Names`_
                    doc also
-    :type string: :class:`basestring`
+    :type string: :class:`str`
 
     .. versionchanged:: 0.3.0
        :class:`Color` objects become hashable.
@@ -605,7 +605,7 @@ def magenta_quantum(self, value):
 
     @property
     def normalized_string(self):
-        """(:class:`basestring`) The normalized string representation of
+        """(:class:`str`) The normalized string representation of
         the color.  The same color is always represented to the same
         string.
 
@@ -664,7 +664,7 @@ def red_quantum(self, value):
 
     @property
     def string(self):
-        """(:class:`basestring`) The string representation of the color."""
+        """(:class:`str`) The string representation of the color."""
         with self:
             color_string = library.PixelGetColorAsString(self.resource)
             return text(color_string.value)