mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-08-10 15:24:45 +03:00
Merge 937bf7807b
into 3b3b559d9e
This commit is contained in:
commit
5ca316ed28
|
@ -28,10 +28,17 @@ from __future__ import print_function
|
|||
|
||||
from PIL import VERSION, PILLOW_VERSION, _plugins
|
||||
|
||||
import sys
|
||||
import logging
|
||||
if sys.version_info < (2, 7):
|
||||
class NullHandler(logging.Handler):
|
||||
def emit(self, record):
|
||||
pass
|
||||
logging.NullHandler = NullHandler
|
||||
import warnings
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.addHandler(logging.NullHandler())
|
||||
|
||||
|
||||
class DecompressionBombWarning(RuntimeWarning):
|
||||
|
@ -111,7 +118,6 @@ from PIL._util import isStringType
|
|||
from PIL._util import deferred_error
|
||||
|
||||
import os
|
||||
import sys
|
||||
import io
|
||||
import struct
|
||||
|
||||
|
|
|
@ -36,6 +36,9 @@ import sys
|
|||
import struct
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
if sys.version_info < (2, 7):
|
||||
logging.NullHandler = Image.NullHandler
|
||||
logger.addHandler(logging.NullHandler())
|
||||
|
||||
MAXBLOCK = 65536
|
||||
|
||||
|
|
|
@ -27,10 +27,14 @@
|
|||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import logging
|
||||
from PIL import Image, ImageFile, ImagePalette, _binary
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
if sys.version_info < (2, 7):
|
||||
logging.NullHandler = Image.NullHandler
|
||||
logger.addHandler(logging.NullHandler())
|
||||
|
||||
i8 = _binary.i8
|
||||
i16 = _binary.i16le
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import logging
|
||||
import re
|
||||
import zlib
|
||||
|
@ -42,6 +43,9 @@ from PIL import Image, ImageFile, ImagePalette, _binary
|
|||
__version__ = "0.9"
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
if sys.version_info < (2, 7):
|
||||
logging.NullHandler = Image.NullHandler
|
||||
logger.addHandler(logging.NullHandler())
|
||||
|
||||
i8 = _binary.i8
|
||||
i16 = _binary.i16be
|
||||
|
|
|
@ -29,6 +29,10 @@ from cffi import FFI
|
|||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
if sys.version_info < (2, 7):
|
||||
from PIL import Image
|
||||
logging.NullHandler = Image.NullHandler
|
||||
logger.addHandler(logging.NullHandler())
|
||||
|
||||
|
||||
defs = """
|
||||
|
|
|
@ -3,6 +3,7 @@ from helper import unittest, PillowTestCase, hopper, py3
|
|||
|
||||
from ctypes import c_float
|
||||
import io
|
||||
import sys
|
||||
import logging
|
||||
import itertools
|
||||
import os
|
||||
|
@ -10,6 +11,9 @@ import os
|
|||
from PIL import Image, TiffImagePlugin
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
if sys.version_info < (2, 7):
|
||||
logging.NullHandler = Image.NullHandler
|
||||
logger.addHandler(logging.NullHandler())
|
||||
|
||||
|
||||
class LibTiffTestCase(PillowTestCase):
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
from __future__ import print_function
|
||||
import sys
|
||||
import logging
|
||||
import struct
|
||||
|
||||
|
@ -7,6 +8,9 @@ from helper import unittest, PillowTestCase, hopper, py3
|
|||
from PIL import Image, TiffImagePlugin
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
if sys.version_info < (2, 7):
|
||||
logging.NullHandler = Image.NullHandler
|
||||
logger.addHandler(logging.NullHandler())
|
||||
|
||||
|
||||
class TestFileTiff(PillowTestCase):
|
||||
|
|
Loading…
Reference in New Issue
Block a user