mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-24 08:17:27 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
Fix PIL imports for Pillow compat
|
|
https://bugs.gentoo.org/show_bug.cgi?id=471506
|
|
--- HTMLgen/ImageH.py 1999-04-20 22:40:28.000000000 -0400
|
|
+++ HTMLgen/ImageH.py 2013-06-08 14:00:49.261734532 -0400
|
|
@@ -576,7 +576,7 @@
|
|
"Display image (for debug purposes only)"
|
|
|
|
try:
|
|
- import ImageTk
|
|
+ from PIL import ImageTk
|
|
ImageTk._show(self, title)
|
|
# note: caller must enter mainloop
|
|
except:
|
|
--- HTMLgen/ImagePaletteH.py 2013-06-08 13:56:03.476318926 -0400
|
|
+++ HTMLgen/ImagePaletteH.py 2013-06-08 14:01:26.564871622 -0400
|
|
@@ -87,7 +87,7 @@
|
|
|
|
if not lut:
|
|
try:
|
|
- import GimpPaletteFile
|
|
+ from PIL import GimpPaletteFile
|
|
fp.seek(0)
|
|
p = GimpPaletteFile.GimpPaletteFile(fp)
|
|
lut = p.getpalette()
|
|
@@ -96,7 +96,7 @@
|
|
|
|
if not lut:
|
|
try:
|
|
- import GimpGradientFile
|
|
+ from PIL import GimpGradientFile
|
|
fp.seek(0)
|
|
p = GimpGradientFile.GimpGradientFile(fp)
|
|
lut = p.getpalette()
|
|
@@ -105,7 +105,7 @@
|
|
|
|
if not lut:
|
|
try:
|
|
- import PaletteFile
|
|
+ from PIL import PaletteFile
|
|
fp.seek(0)
|
|
p = PaletteFile.PaletteFile(fp)
|
|
lut = p.getpalette()
|
|
--- HTMLgen/imgsize.py 1998-05-25 13:56:37.000000000 -0400
|
|
+++ HTMLgen/imgsize.py 2013-06-08 14:01:48.731358969 -0400
|
|
@@ -15,7 +15,7 @@
|
|
|
|
try: #Following switcheroo ensures that if PIL is installed it's used instead
|
|
# of the HTMLgen-bundled copies.
|
|
- import Image
|
|
+ from PIL import Image
|
|
except ImportError:
|
|
import ImageH
|
|
Image = ImageH
|