python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-13 00:34:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 937bf7807b into 3b3b559d9e

Browse Source
This commit is contained in:
Andrew Murray 2015-12-09 09:31:45 +00:00
commit 5ca316ed28
7 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PIL/Image.py
View File

@ -28,10 +28,17 @@ from __future__ import print_function
from PIL import VERSION, PILLOW_VERSION, _plugins from PIL import VERSION, PILLOW_VERSION, _plugins
import sys
import logging import logging
if sys.version_info < (2, 7):
class NullHandler(logging.Handler):
def emit(self, record):
pass
logging.NullHandler = NullHandler
import warnings import warnings
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.addHandler(logging.NullHandler())
class DecompressionBombWarning(RuntimeWarning): class DecompressionBombWarning(RuntimeWarning):
@ -111,7 +118,6 @@ from PIL._util import isStringType
from PIL._util import deferred_error from PIL._util import deferred_error
import os import os
import sys
import io import io
import struct import struct

3
PIL/ImageFile.py
View File

@ -36,6 +36,9 @@ import sys
import struct import struct
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
if sys.version_info < (2, 7):
logging.NullHandler = Image.NullHandler
logger.addHandler(logging.NullHandler())
MAXBLOCK = 65536 MAXBLOCK = 65536

4
PIL/PcxImagePlugin.py
View File

@ -27,10 +27,14 @@
from __future__ import print_function from __future__ import print_function
import sys
import logging import logging
from PIL import Image, ImageFile, ImagePalette, _binary from PIL import Image, ImageFile, ImagePalette, _binary
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
if sys.version_info < (2, 7):
logging.NullHandler = Image.NullHandler
logger.addHandler(logging.NullHandler())
i8 = _binary.i8 i8 = _binary.i8
i16 = _binary.i16le i16 = _binary.i16le

4
PIL/PngImagePlugin.py
View File

@ -33,6 +33,7 @@
from __future__ import print_function from __future__ import print_function
import sys
import logging import logging
import re import re
import zlib import zlib
@ -42,6 +43,9 @@ from PIL import Image, ImageFile, ImagePalette, _binary
__version__ = "0.9" __version__ = "0.9"
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
if sys.version_info < (2, 7):
logging.NullHandler = Image.NullHandler
logger.addHandler(logging.NullHandler())
i8 = _binary.i8 i8 = _binary.i8
i16 = _binary.i16be i16 = _binary.i16be

4
PIL/PyAccess.py
View File

@ -29,6 +29,10 @@ from cffi import FFI
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
if sys.version_info < (2, 7):
from PIL import Image
logging.NullHandler = Image.NullHandler
logger.addHandler(logging.NullHandler())
defs = """ defs = """

4
Tests/test_file_libtiff.py
View File

@ -3,6 +3,7 @@ from helper import unittest, PillowTestCase, hopper, py3
from ctypes import c_float from ctypes import c_float
import io import io
import sys
import logging import logging
import itertools import itertools
import os import os
@ -10,6 +11,9 @@ import os
from PIL import Image, TiffImagePlugin from PIL import Image, TiffImagePlugin
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
if sys.version_info < (2, 7):
logging.NullHandler = Image.NullHandler
logger.addHandler(logging.NullHandler())
class LibTiffTestCase(PillowTestCase): class LibTiffTestCase(PillowTestCase):

4
Tests/test_file_tiff.py
View File

@ -1,4 +1,5 @@
from __future__ import print_function from __future__ import print_function
import sys
import logging import logging
import struct import struct
@ -7,6 +8,9 @@ from helper import unittest, PillowTestCase, hopper, py3
from PIL import Image, TiffImagePlugin from PIL import Image, TiffImagePlugin
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
if sys.version_info < (2, 7):
logging.NullHandler = Image.NullHandler
logger.addHandler(logging.NullHandler())
class TestFileTiff(PillowTestCase): class TestFileTiff(PillowTestCase):