mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-27 15:57:28 -07: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
22 lines
607 B
Diff
22 lines
607 B
Diff
https://bugs.gentoo.org/show_bug.cgi?id=471510
|
|
--- a/editor/__init__.py
|
|
+++ b/editor/__init__.py
|
|
@@ -52,7 +52,7 @@
|
|
|
|
if obj.face.material and obj.face.material.texture:
|
|
try:
|
|
- import Image, ImageTk
|
|
+ from PIL import Image, ImageTk
|
|
|
|
self.image = Image.open(os.path.join(soya.path[0], obj.face.material.texture.filename))
|
|
|
|
@@ -71,7 +71,7 @@
|
|
self.cancel = self.master.cancel
|
|
|
|
def label_conf(self, event = None):
|
|
- import Image, ImageTk
|
|
+ from PIL import Image, ImageTk
|
|
|
|
if self.image_width != self.label.winfo_width():
|
|
self.image_width = self.label.winfo_width()
|