Fix imports

This commit is contained in:
Alex Clark 2013-03-07 11:20:28 -05:00
parent de957b6382
commit 3020c16eaa
72 changed files with 111 additions and 111 deletions

View File

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

View File

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

View File

@ -27,7 +27,7 @@
__version__ = "0.7"
from . import Image, ImageFile, ImagePalette, _binary
from PIL import Image, ImageFile, ImagePalette, _binary
i8 = _binary.i8
i16 = _binary.i16le

View File

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

View File

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

View File

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

View File

@ -22,7 +22,7 @@ __version__ = "0.5"
import re
import io
from . import Image, ImageFile, _binary
from PIL import Image, ImageFile, _binary
#
# --------------------------------------------------------------------

View File

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

View File

@ -18,7 +18,7 @@
__version__ = "0.2"
from . import Image, ImageFile, ImagePalette, _binary
from PIL import Image, ImageFile, ImagePalette, _binary
i8 = _binary.i8
i16 = _binary.i16le

View File

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

View File

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

View File

@ -13,7 +13,7 @@
# See the README file for information on usage and redistribution.
#
from . import Image, ImageFile, _binary
from PIL import Image, ImageFile, _binary
i32 = _binary.i32be

View File

@ -25,7 +25,7 @@
__version__ = "0.1"
from . import ImageFile, ImagePalette, _binary
from PIL import ImageFile, ImagePalette, _binary
try:
import builtins

View File

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

View File

@ -14,7 +14,7 @@
#
from math import pi, log, sin, sqrt
from ._binary import o8
from PIL._binary import o8
# --------------------------------------------------------------------
# Stuff to translate curve segments to palette values (derived from

View File

@ -15,7 +15,7 @@
#
import re
from ._binary import o8
from PIL._binary import o8
##
# File handler for GIMP's palette format.

View File

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

View File

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

View File

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

View File

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

View File

@ -29,8 +29,8 @@
__version__ = "0.7"
import re
from . import Image, ImageFile, ImagePalette
from ._binary import i8, o8
from PIL import Image, ImageFile, ImagePalette
from PIL._binary import i8, o8
# --------------------------------------------------------------------

View File

@ -72,8 +72,8 @@ except ImportError:
import __builtin__
builtins = __builtin__
from . import ImageMode
from ._binary import i8, o8
from PIL import ImageMode
from PIL._binary import i8, o8
import os, sys
@ -279,23 +279,23 @@ def preinit():
return
try:
from . import BmpImagePlugin
from PIL import BmpImagePlugin
except ImportError:
pass
try:
from . import GifImagePlugin
from PIL import GifImagePlugin
except ImportError:
pass
try:
from . import JpegImagePlugin
from PIL import JpegImagePlugin
except ImportError:
pass
try:
from . import PpmImagePlugin
from PIL import PpmImagePlugin
except ImportError:
pass
try:
from . import PngImagePlugin
from PIL import PngImagePlugin
except ImportError:
pass
# try:
@ -453,7 +453,7 @@ class Image:
new.size = im.size
new.palette = self.palette
if im.mode == "P":
from . import ImagePalette
from PIL import ImagePalette
new.palette = ImagePalette.ImagePalette()
try:
new.info = self.info.copy()
@ -1025,7 +1025,7 @@ class Image:
"'offset' is deprecated; use 'ImageChops.offset' instead",
DeprecationWarning, stacklevel=2
)
from . import ImageChops
from PIL import ImageChops
return ImageChops.offset(self, xoffset, yoffset)
##
@ -1092,7 +1092,7 @@ class Image:
box = box + (box[0]+size[0], box[1]+size[1])
if isStringType(im):
from . import ImageColor
from PIL import ImageColor
im = ImageColor.getcolor(im, self.mode)
elif isImageType(im):
@ -1238,7 +1238,7 @@ class Image:
def putpalette(self, data, rawmode="RGB"):
"Put palette data into an image."
from . import ImagePalette
from PIL import ImagePalette
if self.mode not in ("L", "P"):
raise ValueError("illegal image mode")
@ -1772,7 +1772,7 @@ def new(mode, size, color=0):
if isStringType(color):
# css3-style specifier
from . import ImageColor
from PIL import ImageColor
color = ImageColor.getcolor(color, mode)
return Image()._new(core.fill(mode, size, color))
@ -2165,5 +2165,5 @@ def _show(image, **options):
_showxv(image, **options)
def _showxv(image, title=None, **options):
from . import ImageShow
from PIL import ImageShow
ImageShow.show(image, title, **options)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -32,7 +32,7 @@ except ImportError:
tkinter = Tkinter
del Tkinter
from . import Image
from PIL import Image
##
# The <b>ImageTk</b> module contains support to create and modify

View File

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

View File

@ -18,7 +18,7 @@
#
import warnings
from . import Image
from PIL import Image
##
# The <b>ImageWin</b> module contains support to create and display

View File

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

View File

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

View File

@ -35,7 +35,7 @@
__version__ = "0.6"
import array, struct
from . import Image, ImageFile, _binary
from PIL import Image, ImageFile, _binary
i8 = _binary.i8
o8 = _binary.o8
@ -360,7 +360,7 @@ class JpegImageFile(ImageFile.ImageFile):
# Extract EXIF information. This method is highly experimental,
# and is likely to be replaced with something better in a future
# version.
from . import TiffImagePlugin
from PIL import TiffImagePlugin
import io
def fixup(value):
if len(value) == 1:

View File

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

View File

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

View File

@ -15,8 +15,8 @@
__version__ = "0.1"
from . import Image, ImageFile
from ._binary import i8
from PIL import Image, ImageFile
from PIL._binary import i8
#
# Bitstream parser

View File

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

View File

@ -40,7 +40,7 @@ from __future__ import print_function
import io
import sys
from . import _binary
from PIL import _binary
if str is not bytes:
long = int

View File

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

View File

@ -13,7 +13,7 @@
# See the README file for information on usage and redistribution.
#
from ._binary import o8
from PIL._binary import o8
##
# File handler for Teragon-style palette files.

View File

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

View File

@ -18,7 +18,7 @@
__version__ = "0.1"
from . import Image, ImageFile, _binary
from PIL import Image, ImageFile, _binary
i8 = _binary.i8

View File

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

View File

@ -27,7 +27,7 @@
__version__ = "0.6"
from . import Image, ImageFile, ImagePalette, _binary
from PIL import Image, ImageFile, ImagePalette, _binary
i8 = _binary.i8
i16 = _binary.i16le

View File

@ -22,8 +22,8 @@
__version__ = "0.4"
from . import Image, ImageFile
from ._binary import i8
from PIL import Image, ImageFile
from PIL._binary import i8
import io

View File

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

View File

@ -37,7 +37,7 @@ __version__ = "0.9"
import re
from . import Image, ImageFile, ImagePalette, _binary
from PIL import Image, ImageFile, ImagePalette, _binary
import zlib
i8 = _binary.i8

View File

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

View File

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

View File

@ -21,7 +21,7 @@
__version__ = "0.2"
from . import Image, ImageFile, _binary
from PIL import Image, ImageFile, _binary
i8 = _binary.i8
i16 = _binary.i16be

View File

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

View File

@ -20,7 +20,7 @@
__version__ = "0.3"
from . import Image, ImageFile, ImagePalette, _binary
from PIL import Image, ImageFile, ImagePalette, _binary
i16 = _binary.i16be
i32 = _binary.i32be

View File

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

View File

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

View File

@ -43,9 +43,9 @@ from __future__ import print_function
__version__ = "1.3.5"
from . import Image, ImageFile
from . import ImagePalette
from . import _binary
from PIL import Image, ImageFile
from PIL import ImagePalette
from PIL import _binary
import array, sys
import collections
@ -232,7 +232,7 @@ class ImageFileDirectory(collections.MutableMapping):
def named(self):
"""Returns the complete tag dictionary, with named tags where posible."""
from . import TiffTags
from PIL import TiffTags
result = {}
for tag_code, value in self.items():
tag_name = TiffTags.TAGS.get(tag_code, tag_code)
@ -362,7 +362,7 @@ class ImageFileDirectory(collections.MutableMapping):
tag, typ = i16(ifd), i16(ifd, 2)
if Image.DEBUG:
from . import TiffTags
from PIL import TiffTags
tagname = TiffTags.TAGS.get(tag, "unknown")
typname = TiffTags.TYPES.get(typ, "unknown")
print("tag: %s (%d)" % (tagname, tag), end=' ')
@ -458,7 +458,7 @@ class ImageFileDirectory(collections.MutableMapping):
data = b"".join(map(o32, value))
if Image.DEBUG:
from . import TiffTags
from PIL import TiffTags
tagname = TiffTags.TAGS.get(tag, "unknown")
typname = TiffTags.TYPES.get(typ, "unknown")
print("save: %s (%d)" % (tagname, tag), end=' ')

View File

@ -23,7 +23,7 @@
from __future__ import print_function
from . import Image, _binary
from PIL import Image, _binary
try:
import builtins

View File

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

View File

@ -19,7 +19,7 @@
__version__ = "0.1"
from . import Image, ImageFile, ImagePalette, _binary
from PIL import Image, ImageFile, ImagePalette, _binary
o8 = _binary.o8

View File

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

View File

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