Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
02b00585
Commit
02b00585
authored
Feb 18, 2017
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated wand (#116)
parent
eaccc3f4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
23 deletions
+46
-23
api.py
vendor/wand/api.py
+4
-4
drawing.py
vendor/wand/drawing.py
+1
-1
exceptions.py
vendor/wand/exceptions.py
+21
-9
image.py
vendor/wand/image.py
+11
-0
version.py
vendor/wand/version.py
+9
-9
No files found.
vendor/wand/api.py
View file @
02b00585
...
...
@@ -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 can
no
t 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
View file @
02b00585
...
...
@@ -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:`st
r
oke_color`,
:attr:`stroke_width`, and :attr:`fill_color`.
.. sourcecode:: text
...
...
vendor/wand/exceptions.py
View file @
02b00585
...
...
@@ -18,16 +18,28 @@ class WandException(Exception):
"""All Wand-related exceptions are derived from this class."""
class
Wand
Warning
(
WandException
,
Warning
):
"""Base class for Wand-related warnings.
"""
class
Base
Warning
(
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
=
[
(
Wand
Warning
,
'Warning'
),
(
Wand
Error
,
'Error'
),
(
Wand
FatalError
,
'FatalError'
)
(
Base
Warning
,
'Warning'
),
(
Base
Error
,
'Error'
),
(
Base
FatalError
,
'FatalError'
)
]
...
...
vendor/wand/image.py
View file @
02b00585
...
...
@@ -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
View file @
02b00585
...
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment