Updated wand (#116)

vendor/wand/api.py

@@ -180,8 +180,8 @@ try:
     libraries = load_library()
 except (OSError, IOError):
     msg = 'http://docs.wand-py.org/en/latest/guide/install.html'
-    if sys.platform.startswith('freebsd'):
-        msg = 'pkg_add -r'
+    if sys.platform.startswith(('dragonfly', 'freebsd')):
+        msg = 'pkg install'
     elif sys.platform == 'win32':
         msg += '#install-imagemagick-on-windows'
     elif sys.platform == 'darwin':
@@ -1397,7 +1397,7 @@ try:
     library.MagickAutoOrientImage.argtypes = [ctypes.c_void_p]
 except AttributeError:
     # MagickAutoOrientImage was added in 6.8.9+, we have a fallback function
-    # so we pass silently if we cant import it
+    # so we pass silently if we cannot import it
     pass
 
 
@@ -1418,7 +1418,7 @@ else:
         except OSError:
             # In case of El Capitan SIP
             libc = ctypes.cdll.LoadLibrary('/usr/lib/libc.dylib')
-    elif platform.system() == 'FreeBSD':
+    elif sys.platform.startswith(('dragonfly', 'freebsd')):
         libc = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c'))
     else:
         libc = ctypes.cdll.LoadLibrary('libc.so.6')

vendor/wand/drawing.py

@@ -1573,7 +1573,7 @@ class Drawing(Resource):
     def rectangle(self, left=None, top=None, right=None, bottom=None,
                   width=None, height=None, radius=None, xradius=None,
                   yradius=None):
-        """Draws a rectangle using the current :attr:`stoke_color`,
+        """Draws a rectangle using the current :attr:`stroke_color`,
         :attr:`stroke_width`, and :attr:`fill_color`.
 
         .. sourcecode:: text

vendor/wand/exceptions.py

@@ -18,16 +18,28 @@ class WandException(Exception):
     """All Wand-related exceptions are derived from this class."""
 
 
-class WandWarning(WandException, Warning):
-    """Base class for Wand-related warnings."""
+class BaseWarning(WandException, Warning):
+    """Base class for Wand-related warnings.
 
+    .. versionadded:: 0.4.4
 
-class WandError(WandException):
-    """Base class for Wand-related errors."""
+    """
+
+
+class BaseError(WandException):
+    """Base class for Wand-related errors.
 
+    .. versionadded:: 0.4.4
+
+    """
 
-class WandFatalError(WandException):
-    """Base class for Wand-related fatal errors."""
+
+class BaseFatalError(WandException):
+    """Base class for Wand-related fatal errors.
+
+    .. versionadded:: 0.4.4
+
+    """
 
 
 class WandLibraryVersionError(WandException):
@@ -91,9 +103,9 @@ DOMAIN_MAP = [
 #: (:class:`list`) The list of (base_class, suffix) pairs (for each code).
 #: It would be zipped with :const:`DOMAIN_MAP` pairs' last element.
 CODE_MAP = [
-    (WandWarning, 'Warning'),
-    (WandError, 'Error'),
-    (WandFatalError, 'FatalError')
+    (BaseWarning, 'Warning'),
+    (BaseError, 'Error'),
+    (BaseFatalError, 'FatalError')
 ]
 
 

vendor/wand/image.py

@@ -2757,6 +2757,17 @@ class Image(BaseImage):
             self.sequence = Sequence(self)
         self.raise_exception()
 
+    def destroy(self):
+        """Manually remove :class:`~.sequence.SingleImage`'s in
+        the :class:`~.sequence.Sequence`, allowing it to
+        be properly garbage collected after using a ``with Image()`` context
+        manager.
+
+        """
+        for i in range(0, len(self.sequence)):
+            self.sequence.pop()
+        super(Image, self).destroy()
+
     def read(self, file=None, filename=None, blob=None, resolution=None):
         """Read new image into Image() object.
 

vendor/wand/version.py

@@ -57,7 +57,7 @@ __all__ = ('VERSION', 'VERSION_INFO', 'MAGICK_VERSION',
 #:
 #: .. versionchanged:: 0.1.9
 #:    Becomes :class:`tuple`.  (It was string before.)
-VERSION_INFO = (0, 4, 3)
+VERSION_INFO = (0, 4, 4)
 
 #: (:class:`basestring`) The version string e.g. ``'0.1.2'``.
 #:
@@ -94,20 +94,20 @@ if libmagick:
     #: .. versionadded:: 0.2.1
     MAGICK_VERSION_INFO = tuple(int(v or 0) for v in _match.groups())
 
-    #: (:class:`datetime.date`) The release date of the linked ImageMagick
-    #: library.  The same to the result of :c:func:`GetMagickReleaseDate`
-    #: function.
+    #: (:class:`basestring`) The date string e.g. ``'2012-06-03'`` of
+    #: :const:`MAGICK_RELEASE_DATE_STRING`.  This value is the exactly same
+    #: string to the result of :c:func:`GetMagickReleaseDate` function.
     #:
     #: .. versionadded:: 0.2.1
     MAGICK_RELEASE_DATE_STRING = text(libmagick.GetMagickReleaseDate())
 
-    #: (:class:`basestring`) The date string e.g. ``'2012-06-03'`` of
-    #: :const:`MAGICK_RELEASE_DATE_STRING`.  This value is the exactly same
-    #: string to the result of :c:func:`GetMagickReleaseDate` function.
+    _match = re.match(r'^(\d{4})-?(\d\d)-?(\d\d)$', MAGICK_RELEASE_DATE_STRING)
+    #: (:class:`datetime.date`) The release date of the linked ImageMagick
+    #: library.  Equivalent to the result of :c:func:`GetMagickReleaseDate`
+    #: function.
     #:
     #: .. versionadded:: 0.2.1
-    MAGICK_RELEASE_DATE = datetime.date(
-        *map(int, MAGICK_RELEASE_DATE_STRING.split('-')))
+    MAGICK_RELEASE_DATE = datetime.date(*map(int, _match.groups()))
 
     c_quantum_depth = ctypes.c_size_t()
     libmagick.GetMagickQuantumDepth(ctypes.byref(c_quantum_depth))