Replaced absolute PIL imports with relative imports

python-pillow · Jan 15, 2017 · 01fb67d · 01fb67d
1 parent b7a2753
commit 01fb67d
Show file tree

Hide file tree

Showing 73 changed files with 159 additions and 258 deletions.
diff --git a/PIL/BdfFontFile.py b/PIL/BdfFontFile.py
@@ -19,8 +19,7 @@
 
 from __future__ import print_function
 
-from PIL import Image
-from PIL import FontFile
+from . import Image, FontFile
 
 
 # --------------------------------------------------------------------

diff --git a/PIL/BmpImagePlugin.py b/PIL/BmpImagePlugin.py
@@ -24,18 +24,13 @@
 #
 
 
-from PIL import Image, ImageFile, ImagePalette, _binary
+from . import Image, ImageFile, ImagePalette
+from ._binary import i8, i16le as i16, i32le as i32, \
+                     o8, o16le as o16, o32le as o32
 import math
 
 __version__ = "0.7"
 
-i8 = _binary.i8
-i16 = _binary.i16le
-i32 = _binary.i32le
-o8 = _binary.o8
-o16 = _binary.o16le
-o32 = _binary.o32le
-
 #
 # --------------------------------------------------------------------
 # Read BMP file

diff --git a/PIL/BufrStubImagePlugin.py b/PIL/BufrStubImagePlugin.py
@@ -9,7 +9,7 @@
 # See the README file for information on usage and redistribution.
 #
 
-from PIL import Image, ImageFile
+from . import Image, ImageFile
 
 _handler = None
 

diff --git a/PIL/CurImagePlugin.py b/PIL/CurImagePlugin.py
@@ -18,17 +18,14 @@
 
 from __future__ import print_function
 
-from PIL import Image, BmpImagePlugin, _binary
+from . import Image, BmpImagePlugin
+from ._binary import i8, i16le as i16, i32le as i32
 
 __version__ = "0.1"
 
 #
 # --------------------------------------------------------------------
 
-i8 = _binary.i8
-i16 = _binary.i16le
-i32 = _binary.i32le
-
 
 def _accept(prefix):
     return prefix[:4] == b"\0\0\2\0"

diff --git a/PIL/DcxImagePlugin.py b/PIL/DcxImagePlugin.py
@@ -21,15 +21,14 @@
 # See the README file for information on usage and redistribution.
 #
 
-from PIL import Image, _binary
-from PIL.PcxImagePlugin import PcxImageFile
+from . import Image
+from ._binary import i32le as i32
+from .PcxImagePlugin import PcxImageFile
 
 __version__ = "0.2"
 
 MAGIC = 0x3ADE68B1  # QUIZ: what's this value, then?
 
-i32 = _binary.i32le
-
 
 def _accept(prefix):
     return len(prefix) >= 4 and i32(prefix) == MAGIC

diff --git a/PIL/DdsImagePlugin.py b/PIL/DdsImagePlugin.py
@@ -12,7 +12,7 @@
 
 import struct
 from io import BytesIO
-from PIL import Image, ImageFile
+from . import Image, ImageFile
 
 
 # Magic ("DDS ")

diff --git a/PIL/EpsImagePlugin.py b/PIL/EpsImagePlugin.py
@@ -23,16 +23,14 @@
 import re
 import io
 import sys
-from PIL import Image, ImageFile, _binary
+from . import Image, ImageFile
+from ._binary import i32le as i32, o32le as o32
 
 __version__ = "0.5"
 
 #
 # --------------------------------------------------------------------
 
-i32 = _binary.i32le
-o32 = _binary.o32le
-
 split = re.compile(r"^%%([^:]*):[ \t]*(.*)[ \t]*$")
 field = re.compile(r"^%[%!\w]([^:]*)[ \t]*$")
 

diff --git a/PIL/FitsStubImagePlugin.py b/PIL/FitsStubImagePlugin.py
@@ -9,7 +9,7 @@
 # See the README file for information on usage and redistribution.
 #
 
-from PIL import Image, ImageFile
+from . import Image, ImageFile
 
 _handler = None
 

diff --git a/PIL/FliImagePlugin.py b/PIL/FliImagePlugin.py
@@ -16,15 +16,11 @@
 #
 
 
-from PIL import Image, ImageFile, ImagePalette, _binary
+from . import Image, ImageFile, ImagePalette
+from ._binary import i8, i16le as i16, i32le as i32, o8
 
 __version__ = "0.2"
 
-i8 = _binary.i8
-i16 = _binary.i16le
-i32 = _binary.i32le
-o8 = _binary.o8
-
 
 #
 # decoder

diff --git a/PIL/FontFile.py b/PIL/FontFile.py
@@ -17,7 +17,7 @@
 from __future__ import print_function
 
 import os
-from PIL import Image, _binary
+from . import Image, _binary
 
 WIDTH = 800
 

diff --git a/PIL/FpxImagePlugin.py b/PIL/FpxImagePlugin.py
@@ -17,15 +17,13 @@
 
 from __future__ import print_function
 
-from PIL import Image, ImageFile, _binary
+from . import Image, ImageFile
+from ._binary import i32le as i32, i8
 
 import olefile
 
 __version__ = "0.1"
 
-i32 = _binary.i32le
-i8 = _binary.i8
-
 # we map from colour field tuples to (mode, rawmode) descriptors
 MODES = {
     # opacity

diff --git a/PIL/FtexImagePlugin.py b/PIL/FtexImagePlugin.py
@@ -42,7 +42,7 @@
 
 import struct
 from io import BytesIO
-from PIL import Image, ImageFile
+from . import Image, ImageFile
 
 
 MAGIC = b"FTEX"

diff --git a/PIL/GbrImagePlugin.py b/PIL/GbrImagePlugin.py
@@ -24,9 +24,8 @@
 # Version 3 files have a format specifier of 18 for 16bit floats in
 #   the color depth field. This is currently unsupported by Pillow.
 
-from PIL import Image, ImageFile, _binary
-
-i32 = _binary.i32be
+from . import Image, ImageFile
+from ._binary import i32be as i32
 
 
 def _accept(prefix):

diff --git a/PIL/GdImageFile.py b/PIL/GdImageFile.py
@@ -23,8 +23,9 @@
 # purposes only.
 
 
-from PIL import ImageFile, ImagePalette, _binary
-from PIL._util import isPath
+from . import ImageFile, ImagePalette
+from ._binary import i16be as i16
+from ._util import isPath
 
 __version__ = "0.1"
 
@@ -34,8 +35,6 @@
     import __builtin__
     builtins = __builtin__
 
-i16 = _binary.i16be
-
 
 ##
 # Image plugin for the GD uncompressed format.  Note that this format

diff --git a/PIL/GifImagePlugin.py b/PIL/GifImagePlugin.py
@@ -24,20 +24,16 @@
 # See the README file for information on usage and redistribution.
 #
 
-from PIL import Image, ImageFile, ImagePalette, \
-                ImageChops, ImageSequence, _binary
+from . import Image, ImageFile, ImagePalette, \
+              ImageChops, ImageSequence
+from ._binary import i8, i16le as i16, o8, o16le as o16
 
 __version__ = "0.9"
 
 
 # --------------------------------------------------------------------
 # Helpers
 
-i8 = _binary.i8
-i16 = _binary.i16le
-o8 = _binary.o8
-o16 = _binary.o16le
-
 
 # --------------------------------------------------------------------
 # Identify/read GIF files

diff --git a/PIL/GimpGradientFile.py b/PIL/GimpGradientFile.py
@@ -14,7 +14,7 @@
 #
 
 from math import pi, log, sin, sqrt
-from PIL._binary import o8
+from ._binary import o8
 
 # --------------------------------------------------------------------
 # Stuff to translate curve segments to palette values (derived from

diff --git a/PIL/GimpPaletteFile.py b/PIL/GimpPaletteFile.py
@@ -15,7 +15,7 @@
 #
 
 import re
-from PIL._binary import o8
+from ._binary import o8
 
 
 ##

diff --git a/PIL/GribStubImagePlugin.py b/PIL/GribStubImagePlugin.py
@@ -9,7 +9,7 @@
 # See the README file for information on usage and redistribution.
 #
 
-from PIL import Image, ImageFile
+from . import Image, ImageFile
 
 _handler = None
 

diff --git a/PIL/Hdf5StubImagePlugin.py b/PIL/Hdf5StubImagePlugin.py
@@ -9,7 +9,7 @@
 # See the README file for information on usage and redistribution.
 #
 
-from PIL import Image, ImageFile
+from . import Image, ImageFile
 
 _handler = None
 

diff --git a/PIL/IcnsImagePlugin.py b/PIL/IcnsImagePlugin.py
@@ -15,7 +15,8 @@
 # See the README file for information on usage and redistribution.
 #
 
-from PIL import Image, ImageFile, PngImagePlugin, _binary
+from PIL import Image, ImageFile, PngImagePlugin
+from PIL._binary import i8
 import io
 import os
 import shutil
@@ -27,8 +28,6 @@
 if enable_jpeg2k:
     from PIL import Jpeg2KImagePlugin
 
-i8 = _binary.i8
-
 HEADERSIZE = 8
 
 

diff --git a/PIL/IcoImagePlugin.py b/PIL/IcoImagePlugin.py
@@ -25,18 +25,15 @@
 import struct
 from io import BytesIO
 
-from PIL import Image, ImageFile, BmpImagePlugin, PngImagePlugin, _binary
+from . import Image, ImageFile, BmpImagePlugin, PngImagePlugin
+from ._binary import i8, i16le as i16, i32le as i32
 from math import log, ceil
 
 __version__ = "0.1"
 
 #
 # --------------------------------------------------------------------
 
-i8 = _binary.i8
-i16 = _binary.i16le
-i32 = _binary.i32le
-
 _MAGIC = b"\0\0\1\0"
 
 

diff --git a/PIL/ImImagePlugin.py b/PIL/ImImagePlugin.py
@@ -27,8 +27,8 @@
 
 
 import re
-from PIL import Image, ImageFile, ImagePalette
-from PIL._binary import i8
+from . import Image, ImageFile, ImagePalette
+from ._binary import i8
 
 __version__ = "0.7"
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
     #
     import re
-    from PIL._binary import o8
+    from ._binary import o8
     ##
@@ Expand Down @@