Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion PIL/Image.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,17 @@

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):
Expand Down Expand Up @@ -111,7 +118,6 @@ def __getattr__(self, id):
from PIL._util import deferred_error

import os
import sys
import io
import struct

Expand Down
3 changes: 3 additions & 0 deletions PIL/ImageFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
import struct

logger = logging.getLogger(__name__)
if sys.version_info < (2, 7):
logging.NullHandler = Image.NullHandler
logger.addHandler(logging.NullHandler())

MAXBLOCK = 65536

Expand Down
4 changes: 4 additions & 0 deletions PIL/PcxImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions PIL/PngImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

from __future__ import print_function

import sys
import logging
import re
import zlib
Expand All @@ -42,6 +43,9 @@
__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
Expand Down
4 changes: 4 additions & 0 deletions PIL/PyAccess.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@


logger = logging.getLogger(__name__)
if sys.version_info < (2, 7):
from PIL import Image
logging.NullHandler = Image.NullHandler
logger.addHandler(logging.NullHandler())


defs = """
Expand Down
4 changes: 4 additions & 0 deletions Tests/test_file_libtiff.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@

from ctypes import c_float
import io
import sys
import logging
import itertools
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):
Expand Down
4 changes: 4 additions & 0 deletions Tests/test_file_tiff.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from __future__ import print_function
import sys
import logging
import struct

Expand All @@ -7,6 +8,9 @@
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):
Expand Down