python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-05 14:10:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

py3k: Use relative imports

Browse Source 
In py3k, imports are absolute unless using the "from . import" syntax.

This commit also solves a recursive import between Image, ImageColor, and
ImagePalette by delay-importing ImagePalette in Image.

I'm not too keen on this commit because the syntax is ugly. I might go back
and prefer the prettier "from PIL import".
This commit is contained in:
Brian Crowell 2012-10-15 21:49:13 -05:00 committed by Brian Crowell
parent abd215e457
commit 83ff0b3b31
68 changed files with 104 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PIL/ArgImagePlugin.py
View File

@ -22,9 +22,9 @@ from __future__ import print_function
__version__ = "0.4" __version__ = "0.4"
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
from PngImagePlugin import i16, i32, ChunkStream, _MODES from .PngImagePlugin import i16, i32, ChunkStream, _MODES
MAGIC = "\212ARG\r\n\032\n" MAGIC = "\212ARG\r\n\032\n"

4
PIL/BdfFontFile.py
View File

@ -17,8 +17,8 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
import FontFile from . import FontFile
# -------------------------------------------------------------------- # --------------------------------------------------------------------

2
PIL/BmpImagePlugin.py
View File

@ -27,7 +27,7 @@
__version__ = "0.7" __version__ = "0.7"
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
# #

2
PIL/BufrStubImagePlugin.py
View File

@ -9,7 +9,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image, ImageFile from . import Image, ImageFile
_handler = None _handler = None

2
PIL/CurImagePlugin.py
View File

@ -19,7 +19,7 @@
__version__ = "0.1" __version__ = "0.1"
import Image, BmpImagePlugin from . import Image, BmpImagePlugin
# #

4
PIL/DcxImagePlugin.py
View File

@ -23,9 +23,9 @@
__version__ = "0.2" __version__ = "0.2"
import Image from . import Image
from PcxImagePlugin import PcxImageFile from .PcxImagePlugin import PcxImageFile
MAGIC = 0x3ADE68B1 # QUIZ: what's this value, then? MAGIC = 0x3ADE68B1 # QUIZ: what's this value, then?

2
PIL/EpsImagePlugin.py
View File

@ -21,7 +21,7 @@
__version__ = "0.5" __version__ = "0.5"
import re import re
import Image, ImageFile from . import Image, ImageFile
# #
# -------------------------------------------------------------------- # --------------------------------------------------------------------

2
PIL/FitsStubImagePlugin.py
View File

@ -9,7 +9,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image, ImageFile from . import Image, ImageFile
_handler = None _handler = None

2
PIL/FliImagePlugin.py
View File

@ -18,7 +18,7 @@
__version__ = "0.2" __version__ = "0.2"
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
def i16(c): def i16(c):

2
PIL/FontFile.py
View File

@ -15,7 +15,7 @@
# #
import os import os
import Image from . import Image
import marshal import marshal

4
PIL/FpxImagePlugin.py
View File

@ -19,8 +19,8 @@
__version__ = "0.1" __version__ = "0.1"
import Image, ImageFile from . import Image, ImageFile
from OleFileIO import * from .OleFileIO import *
# we map from colour field tuples to (mode, rawmode) descriptors # we map from colour field tuples to (mode, rawmode) descriptors

2
PIL/GbrImagePlugin.py
View File

@ -13,7 +13,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image, ImageFile from . import Image, ImageFile
def i32(c): def i32(c):
return ord(c[3]) + (ord(c[2])<<8) + (ord(c[1])<<16) + (ord(c[0])<<24L) return ord(c[3]) + (ord(c[2])<<8) + (ord(c[1])<<16) + (ord(c[0])<<24L)

2
PIL/GdImageFile.py
View File

@ -25,7 +25,7 @@
__version__ = "0.1" __version__ = "0.1"
import ImageFile, ImagePalette from . import ImageFile, ImagePalette
def i16(c): def i16(c):
return ord(c[1]) + (ord(c[0])<<8) return ord(c[1]) + (ord(c[0])<<8)

2
PIL/GifImagePlugin.py
View File

@ -28,7 +28,7 @@
__version__ = "0.9" __version__ = "0.9"
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
# -------------------------------------------------------------------- # --------------------------------------------------------------------

2
PIL/GribStubImagePlugin.py
View File

@ -9,7 +9,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image, ImageFile from . import Image, ImageFile
_handler = None _handler = None

2
PIL/Hdf5StubImagePlugin.py
View File

@ -9,7 +9,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image, ImageFile from . import Image, ImageFile
_handler = None _handler = None

2
PIL/IcnsImagePlugin.py
View File

@ -14,7 +14,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image, ImageFile from . import Image, ImageFile
import struct import struct
HEADERSIZE = 8 HEADERSIZE = 8

2
PIL/IcoImagePlugin.py
View File

@ -19,7 +19,7 @@
__version__ = "0.1" __version__ = "0.1"
import Image, BmpImagePlugin from . import Image, BmpImagePlugin
# #

2
PIL/ImImagePlugin.py
View File

@ -29,7 +29,7 @@
__version__ = "0.7" __version__ = "0.7"
import re import re
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
# -------------------------------------------------------------------- # --------------------------------------------------------------------

23
PIL/Image.py
View File

@ -66,8 +66,7 @@ except ImportError as v:
RuntimeWarning RuntimeWarning
) )
import ImageMode from . import ImageMode
import ImagePalette
import os, sys import os, sys
@ -295,23 +294,23 @@ def preinit():
return return
try: try:
import BmpImagePlugin from . import BmpImagePlugin
except ImportError: except ImportError:
pass pass
try: try:
import GifImagePlugin from . import GifImagePlugin
except ImportError: except ImportError:
pass pass
try: try:
import JpegImagePlugin from . import JpegImagePlugin
except ImportError: except ImportError:
pass pass
try: try:
import PpmImagePlugin from . import PpmImagePlugin
except ImportError: except ImportError:
pass pass
try: try:
import PngImagePlugin from . import PngImagePlugin
except ImportError: except ImportError:
pass pass
# try: # try:
@ -464,6 +463,7 @@ class Image:
new.size = im.size new.size = im.size
new.palette = self.palette new.palette = self.palette
if im.mode == "P": if im.mode == "P":
from . import ImagePalette
new.palette = ImagePalette.ImagePalette() new.palette = ImagePalette.ImagePalette()
try: try:
new.info = self.info.copy() new.info = self.info.copy()
@ -1014,7 +1014,7 @@ class Image:
"'offset' is deprecated; use 'ImageChops.offset' instead", "'offset' is deprecated; use 'ImageChops.offset' instead",
DeprecationWarning, stacklevel=2 DeprecationWarning, stacklevel=2
) )
import ImageChops from . import ImageChops
return ImageChops.offset(self, xoffset, yoffset) return ImageChops.offset(self, xoffset, yoffset)
## ##
@ -1081,7 +1081,7 @@ class Image:
box = box + (box[0]+size[0], box[1]+size[1]) box = box + (box[0]+size[0], box[1]+size[1])
if isStringType(im): if isStringType(im):
import ImageColor from . import ImageColor
im = ImageColor.getcolor(im, self.mode) im = ImageColor.getcolor(im, self.mode)
elif isImageType(im): elif isImageType(im):
@ -1227,6 +1227,7 @@ class Image:
def putpalette(self, data, rawmode="RGB"): def putpalette(self, data, rawmode="RGB"):
"Put palette data into an image." "Put palette data into an image."
from . import ImagePalette
if self.mode not in ("L", "P"): if self.mode not in ("L", "P"):
raise ValueError("illegal image mode") raise ValueError("illegal image mode")
@ -1758,7 +1759,7 @@ def new(mode, size, color=0):
if isStringType(color): if isStringType(color):
# css3-style specifier # css3-style specifier
import ImageColor from . import ImageColor
color = ImageColor.getcolor(color, mode) color = ImageColor.getcolor(color, mode)
return Image()._new(core.fill(mode, size, color)) return Image()._new(core.fill(mode, size, color))
@ -2139,5 +2140,5 @@ def _show(image, **options):
apply(_showxv, (image,), options) apply(_showxv, (image,), options)
def _showxv(image, title=None, **options): def _showxv(image, title=None, **options):
import ImageShow from . import ImageShow
apply(ImageShow.show, (image, title), options) apply(ImageShow.show, (image, title), options)

2
PIL/ImageChops.py
View File

@ -15,7 +15,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
## ##
# The <b>ImageChops</b> module contains a number of arithmetical image # The <b>ImageChops</b> module contains a number of arithmetical image

6
PIL/ImageCms.py
View File

@ -81,7 +81,7 @@ VERSION = "0.1.0 pil"
# --------------------------------------------------------------------. # --------------------------------------------------------------------.
import Image from . import Image
import _imagingcms import _imagingcms
core = _imagingcms core = _imagingcms
@ -207,7 +207,7 @@ class ImageCmsTransform(Image.ImagePointHandler):
def get_display_profile(handle=None): def get_display_profile(handle=None):
import sys import sys
if sys.platform == "win32": if sys.platform == "win32":
import ImageWin from . import ImageWin
if isinstance(handle, ImageWin.HDC): if isinstance(handle, ImageWin.HDC):
profile = core.get_display_profile_win32(handle, 1) profile = core.get_display_profile_win32(handle, 1)
else: else:
@ -771,7 +771,7 @@ def versions():
if __name__ == "__main__": if __name__ == "__main__":
# create a cheap manual from the __doc__ strings for the functions above # create a cheap manual from the __doc__ strings for the functions above
import ImageCms from . import ImageCms
print(__doc__) print(__doc__)
for f in dir(pyCMS): for f in dir(pyCMS):

2
PIL/ImageColor.py
View File

@ -17,7 +17,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
import re import re

6
PIL/ImageDraw.py
View File

@ -30,7 +30,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image, ImageColor from . import Image, ImageColor
try: try:
import warnings import warnings
@ -127,7 +127,7 @@ class ImageDraw:
def getfont(self): def getfont(self):
if not self.font: if not self.font:
# FIXME: should add a font repository # FIXME: should add a font repository
import ImageFont from . import ImageFont
self.font = ImageFont.load_default() self.font = ImageFont.load_default()
return self.font return self.font
@ -318,7 +318,7 @@ def getdraw(im=None, hints=None):
except ImportError: except ImportError:
pass pass
if handler is None: if handler is None:
import ImageDraw2 from . import ImageDraw2
handler = ImageDraw2 handler = ImageDraw2
if im: if im:
im = handler.Draw(im) im = handler.Draw(im)

2
PIL/ImageDraw2.py
View File

@ -16,7 +16,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image, ImageColor, ImageDraw, ImageFont, ImagePath from . import Image, ImageColor, ImageDraw, ImageFont, ImagePath
class Pen: class Pen:
def __init__(self, color, width=1, opacity=255): def __init__(self, color, width=1, opacity=255):

2
PIL/ImageEnhance.py
View File

@ -18,7 +18,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image, ImageFilter, ImageStat from . import Image, ImageFilter, ImageStat
class _Enhance: class _Enhance:

2
PIL/ImageFile.py
View File

@ -27,7 +27,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
import traceback, os import traceback, os
import io import io

2
PIL/ImageFont.py
View File

@ -27,7 +27,7 @@
from __future__ import print_function from __future__ import print_function
import Image from . import Image
import os, sys import os, sys
class _imagingft_not_installed: class _imagingft_not_installed:

5
PIL/ImageGrab.py
View File

@ -15,7 +15,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
## ##
# (New in 1.1.3) The <b>ImageGrab</b> module can be used to copy # (New in 1.1.3) The <b>ImageGrab</b> module can be used to copy
@ -66,6 +66,7 @@ def grabclipboard():
debug = 0 # temporary interface debug = 0 # temporary interface
data = Image.core.grabclipboard(debug) data = Image.core.grabclipboard(debug)
if Image.isStringType(data): if Image.isStringType(data):
import BmpImagePlugin, StringIO from . import BmpImagePlugin
import StringIO
return BmpImagePlugin.DibImageFile(StringIO.StringIO(data)) return BmpImagePlugin.DibImageFile(StringIO.StringIO(data))
return data return data

2
PIL/ImageMath.py
View File

@ -15,7 +15,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
import _imagingmath import _imagingmath
import sys import sys

2
PIL/ImageMode.py
View File

@ -36,7 +36,7 @@ class ModeDescriptor:
def getmode(mode): def getmode(mode):
if not _modes: if not _modes:
# initialize mode cache # initialize mode cache
import Image from . import Image
# core modes # core modes
for m, (basemode, basetype, bands) in Image._MODEINFO.items(): for m, (basemode, basetype, bands) in Image._MODEINFO.items():
_modes[m] = ModeDescriptor(m, bands, basemode, basetype) _modes[m] = ModeDescriptor(m, bands, basemode, basetype)

4
PIL/ImageOps.py
View File

@ -17,7 +17,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
import operator import operator
from functools import reduce from functools import reduce
@ -44,7 +44,7 @@ def _border(border):
def _color(color, mode): def _color(color, mode):
if Image.isStringType(color): if Image.isStringType(color):
import ImageColor from . import ImageColor
color = ImageColor.getcolor(color, mode) color = ImageColor.getcolor(color, mode)
return color return color

8
PIL/ImagePalette.py
View File

@ -17,7 +17,7 @@
# #
import array import array
import Image, ImageColor from . import Image, ImageColor
## ##
# Colour palette wrapper for palette mapped images. # Colour palette wrapper for palette mapped images.
@ -150,7 +150,7 @@ def load(filename):
if not lut: if not lut:
try: try:
import GimpPaletteFile from . import GimpPaletteFile
fp.seek(0) fp.seek(0)
p = GimpPaletteFile.GimpPaletteFile(fp) p = GimpPaletteFile.GimpPaletteFile(fp)
lut = p.getpalette() lut = p.getpalette()
@ -159,7 +159,7 @@ def load(filename):
if not lut: if not lut:
try: try:
import GimpGradientFile from . import GimpGradientFile
fp.seek(0) fp.seek(0)
p = GimpGradientFile.GimpGradientFile(fp) p = GimpGradientFile.GimpGradientFile(fp)
lut = p.getpalette() lut = p.getpalette()
@ -168,7 +168,7 @@ def load(filename):
if not lut: if not lut:
try: try:
import PaletteFile from . import PaletteFile
fp.seek(0) fp.seek(0)
p = PaletteFile.PaletteFile(fp) p = PaletteFile.PaletteFile(fp)
lut = p.getpalette() lut = p.getpalette()

2
PIL/ImagePath.py
View File

@ -14,7 +14,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
## ##
# Path wrapper. # Path wrapper.

2
PIL/ImageQt.py
View File

@ -15,7 +15,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
from PyQt4.QtGui import QImage, qRgb from PyQt4.QtGui import QImage, qRgb

2
PIL/ImageShow.py
View File

@ -14,7 +14,7 @@
from __future__ import print_function from __future__ import print_function
import Image from . import Image
import os, sys import os, sys
_viewers = [] _viewers = []

2
PIL/ImageStat.py
View File

@ -21,7 +21,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
import operator, math import operator, math
from functools import reduce from functools import reduce

3
PIL/ImageTk.py
View File

@ -25,7 +25,8 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Tkinter, Image import Tkinter
from . import Image
## ##
# The <b>ImageTk</b> module contains support to create and modify # The <b>ImageTk</b> module contains support to create and modify

2
PIL/ImageTransform.py
View File

@ -13,7 +13,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
class Transform(Image.ImageTransformHandler): class Transform(Image.ImageTransformHandler):
def __init__(self, data): def __init__(self, data):

2
PIL/ImageWin.py
View File

@ -17,7 +17,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
## ##
# The <b>ImageWin</b> module contains support to create and display # The <b>ImageWin</b> module contains support to create and display

2
PIL/ImtImagePlugin.py
View File

@ -19,7 +19,7 @@ __version__ = "0.2"
import re import re
import Image, ImageFile from . import Image, ImageFile
# #
# -------------------------------------------------------------------- # --------------------------------------------------------------------

4
PIL/IptcImagePlugin.py
View File

@ -20,7 +20,7 @@ from __future__ import print_function
__version__ = "0.3" __version__ = "0.3"
import Image, ImageFile from . import Image, ImageFile
import os, tempfile import os, tempfile
@ -219,7 +219,7 @@ Image.register_extension("IPTC", ".iim")
def getiptcinfo(im): def getiptcinfo(im):
import TiffImagePlugin, JpegImagePlugin from . import TiffImagePlugin, JpegImagePlugin
import StringIO import StringIO
data = None data = None

5
PIL/JpegImagePlugin.py
View File

@ -35,7 +35,7 @@
__version__ = "0.6" __version__ = "0.6"
import array, struct import array, struct
import Image, ImageFile from . import Image, ImageFile
def i16(c,o=0): def i16(c,o=0):
return ord(c[o+1]) + (ord(c[o])<<8) return ord(c[o+1]) + (ord(c[o])<<8)
@ -361,7 +361,8 @@ class JpegImageFile(ImageFile.ImageFile):
# Extract EXIF information. This method is highly experimental, # Extract EXIF information. This method is highly experimental,
# and is likely to be replaced with something better in a future # and is likely to be replaced with something better in a future
# version. # version.
import TiffImagePlugin, StringIO from . import TiffImagePlugin
import StringIO
def fixup(value): def fixup(value):
if len(value) == 1: if len(value) == 1:
return value[0] return value[0]

2
PIL/McIdasImagePlugin.py
View File

@ -19,7 +19,7 @@
__version__ = "0.2" __version__ = "0.2"
import struct import struct
import Image, ImageFile from . import Image, ImageFile
def _accept(s): def _accept(s):
return s[:8] == "\x00\x00\x00\x00\x00\x00\x00\x04" return s[:8] == "\x00\x00\x00\x00\x00\x00\x00\x04"

4
PIL/MicImagePlugin.py
View File

@ -20,8 +20,8 @@
__version__ = "0.1" __version__ = "0.1"
import Image, TiffImagePlugin from . import Image, TiffImagePlugin
from OleFileIO import * from .OleFileIO import *
# #

2
PIL/MpegImagePlugin.py
View File

@ -15,7 +15,7 @@
__version__ = "0.1" __version__ = "0.1"
import Image, ImageFile from . import Image, ImageFile
# #
# Bitstream parser # Bitstream parser

2
PIL/MspImagePlugin.py
View File

@ -19,7 +19,7 @@
__version__ = "0.1" __version__ = "0.1"
import Image, ImageFile from . import Image, ImageFile
# #

2
PIL/PSDraw.py
View File

@ -17,7 +17,7 @@
from __future__ import print_function from __future__ import print_function
import EpsImagePlugin from . import EpsImagePlugin
## ##
# Simple Postscript graphics interface. # Simple Postscript graphics interface.

2
PIL/PalmImagePlugin.py
View File

@ -9,7 +9,7 @@
__version__ = "1.0" __version__ = "1.0"
import Image, ImageFile from . import Image, ImageFile
_Palm8BitColormapValues = ( _Palm8BitColormapValues = (
( 255, 255, 255 ), ( 255, 204, 255 ), ( 255, 153, 255 ), ( 255, 102, 255 ), ( 255, 255, 255 ), ( 255, 204, 255 ), ( 255, 153, 255 ), ( 255, 102, 255 ),

2
PIL/PcdImagePlugin.py
View File

@ -18,7 +18,7 @@
__version__ = "0.1" __version__ = "0.1"
import Image, ImageFile from . import Image, ImageFile
## ##
# Image plugin for PhotoCD images. This plugin only reads the 768x512 # Image plugin for PhotoCD images. This plugin only reads the 768x512

4
PIL/PcfFontFile.py
View File

@ -16,8 +16,8 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import Image from . import Image
import FontFile from . import FontFile
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# declarations # declarations

2
PIL/PcxImagePlugin.py
View File

@ -27,7 +27,7 @@
__version__ = "0.6" __version__ = "0.6"
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
def i16(c,o): def i16(c,o):
return ord(c[o]) + (ord(c[o+1])<<8) return ord(c[o]) + (ord(c[o+1])<<8)

2
PIL/PdfImagePlugin.py
View File

@ -22,7 +22,7 @@
__version__ = "0.4" __version__ = "0.4"
import Image, ImageFile from . import Image, ImageFile
import StringIO import StringIO

2
PIL/PixarImagePlugin.py
View File

@ -21,7 +21,7 @@
__version__ = "0.1" __version__ = "0.1"
import Image, ImageFile from . import Image, ImageFile
# #
# helpers # helpers

3
PIL/PngImagePlugin.py
View File

@ -37,7 +37,8 @@ __version__ = "0.9"
import re import re
import Image, ImageFile, ImagePalette, zlib from . import Image, ImageFile, ImagePalette
import zlib
def i16(c): def i16(c):

2
PIL/PpmImagePlugin.py
View File

@ -19,7 +19,7 @@ __version__ = "0.2"
import string import string
import Image, ImageFile from . import Image, ImageFile
# #
# -------------------------------------------------------------------- # --------------------------------------------------------------------

2
PIL/PsdImagePlugin.py
View File

@ -18,7 +18,7 @@
__version__ = "0.4" __version__ = "0.4"
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
MODES = { MODES = {
# (photoshop mode, bits) -> (pil mode, required channels) # (photoshop mode, bits) -> (pil mode, required channels)

2
PIL/SgiImagePlugin.py
View File

@ -21,7 +21,7 @@
__version__ = "0.2" __version__ = "0.2"
import Image, ImageFile from . import Image, ImageFile
def i16(c): def i16(c):

4
PIL/SpiderImagePlugin.py
View File

@ -35,7 +35,7 @@
from __future__ import print_function from __future__ import print_function
import Image, ImageFile from . import Image, ImageFile
import os, struct, sys import os, struct, sys
def isInt(f): def isInt(f):
@ -173,7 +173,7 @@ class SpiderImageFile(ImageFile.ImageFile):
# returns a ImageTk.PhotoImage object, after rescaling to 0..255 # returns a ImageTk.PhotoImage object, after rescaling to 0..255
def tkPhotoImage(self): def tkPhotoImage(self):
import ImageTk from . import ImageTk
return ImageTk.PhotoImage(self.convert2byte(), palette=256) return ImageTk.PhotoImage(self.convert2byte(), palette=256)
# -------------------------------------------------------------------- # --------------------------------------------------------------------

2
PIL/SunImagePlugin.py
View File

@ -20,7 +20,7 @@
__version__ = "0.3" __version__ = "0.3"
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
def i16(c): def i16(c):

2
PIL/TarIO.py
View File

@ -14,7 +14,7 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
import ContainerIO from . import ContainerIO
## ##
# A file object that provides read access to a given member of a TAR # A file object that provides read access to a given member of a TAR

2
PIL/TgaImagePlugin.py
View File

@ -19,7 +19,7 @@
__version__ = "0.3" __version__ = "0.3"
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
# #

8
PIL/TiffImagePlugin.py
View File

@ -43,8 +43,8 @@ from __future__ import print_function
__version__ = "1.3.5" __version__ = "1.3.5"
import Image, ImageFile from . import Image, ImageFile
import ImagePalette from . import ImagePalette
import array, sys import array, sys
import collections import collections
@ -351,7 +351,7 @@ class ImageFileDirectory(collections.MutableMapping):
tag, typ = i16(ifd), i16(ifd, 2) tag, typ = i16(ifd), i16(ifd, 2)
if Image.DEBUG: if Image.DEBUG:
import TiffTags from . import TiffTags
tagname = TiffTags.TAGS.get(tag, "unknown") tagname = TiffTags.TAGS.get(tag, "unknown")
typname = TiffTags.TYPES.get(typ, "unknown") typname = TiffTags.TYPES.get(typ, "unknown")
print("tag: %s (%d)" % (tagname, tag), end=' ') print("tag: %s (%d)" % (tagname, tag), end=' ')
@ -448,7 +448,7 @@ class ImageFileDirectory(collections.MutableMapping):
data = "".join(map(o32, value)) data = "".join(map(o32, value))
if Image.DEBUG: if Image.DEBUG:
import TiffTags from . import TiffTags
tagname = TiffTags.TAGS.get(tag, "unknown") tagname = TiffTags.TAGS.get(tag, "unknown")
typname = TiffTags.TYPES.get(typ, "unknown") typname = TiffTags.TYPES.get(typ, "unknown")
print("save: %s (%d)" % (tagname, tag), end=' ') print("save: %s (%d)" % (tagname, tag), end=' ')

2
PIL/WalImageFile.py
View File

@ -23,7 +23,7 @@
from __future__ import print_function from __future__ import print_function
import Image from . import Image
def i32(c, o=0): def i32(c, o=0):
return ord(c[o])+(ord(c[o+1])<<8)+(ord(c[o+2])<<16)+(ord(c[o+3])<<24) return ord(c[o])+(ord(c[o+1])<<8)+(ord(c[o+2])<<16)+(ord(c[o+3])<<24)

2
PIL/WmfImagePlugin.py
View File

@ -17,7 +17,7 @@
__version__ = "0.2" __version__ = "0.2"
import Image, ImageFile from . import Image, ImageFile
_handler = None _handler = None

2
PIL/XVThumbImagePlugin.py
View File

@ -19,7 +19,7 @@
__version__ = "0.1" __version__ = "0.1"
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
# standard color palette for thumbnails (RGB332) # standard color palette for thumbnails (RGB332)
PALETTE = "" PALETTE = ""

2
PIL/XbmImagePlugin.py
View File

@ -22,7 +22,7 @@
__version__ = "0.6" __version__ = "0.6"
import re import re
import Image, ImageFile from . import Image, ImageFile
# XBM header # XBM header
xbm_head = re.compile( xbm_head = re.compile(

2
PIL/XpmImagePlugin.py
View File

@ -19,7 +19,7 @@ __version__ = "0.2"
import re import re
import Image, ImageFile, ImagePalette from . import Image, ImageFile, ImagePalette
# XPM header # XPM header
xpm_head = re.compile("\"([0-9]*) ([0-9]*) ([0-9]*) ([0-9]*)") xpm_head = re.compile("\"([0-9]*) ([0-9]*) ([0-9]*) ([0-9]*)")