[Python-modules-commits] r25124 - in packages/circuits/trunk/debian (3 files)

[eriol-guest at users.alioth.debian.org]

    Date: Tuesday, July 9, 2013 @ 00:02:22
  Author: eriol-guest
Revision: 25124

Fix PIL import

Added:
  packages/circuits/trunk/debian/patches/05_fix-pil-import.patch
Modified:
  packages/circuits/trunk/debian/changelog
  packages/circuits/trunk/debian/patches/series

Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog	2013-07-08 23:36:36 UTC (rev 25123)
+++ packages/circuits/trunk/debian/changelog	2013-07-09 00:02:22 UTC (rev 25124)
@@ -9,11 +9,13 @@
     - Simplified override_dh_auto_clean
   * debian/patches/03_force-localhost-as-host-name.patch
     - Renamed to 03_disable-address-check.patch
-  * debian/patch/03_disable-03_disable-address-check.patch
+  * debian/patches/03_disable-03_disable-address-check.patch
     - Disable address check since these tests are conceived
       to run on the same machine (Closes: #713757)
+  * debian/patches/05_fix-pil-import.patch
+    - Fix PIL import
 
- -- Daniele Tricoli <eriol at mornie.org>  Tue, 09 Jul 2013 01:13:18 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Tue, 09 Jul 2013 01:57:55 +0200
 
 circuits (2.1.0-1) experimental; urgency=low
 

Added: packages/circuits/trunk/debian/patches/05_fix-pil-import.patch
===================================================================
--- packages/circuits/trunk/debian/patches/05_fix-pil-import.patch	                        (rev 0)
+++ packages/circuits/trunk/debian/patches/05_fix-pil-import.patch	2013-07-09 00:02:22 UTC (rev 25124)
@@ -0,0 +1,21 @@
+Description: Fix PIL import
+ see http://lists.debian.org/debian-python/2013/02/msg00017.html for details.
+Author: Daniele Tricoli <eriol at mornie.org>
+Last-Update: 2013-07-09
+
+--- a/circuits/web/apps/memorymonitor/__init__.py
++++ b/circuits/web/apps/memorymonitor/__init__.py
+@@ -6,8 +6,11 @@
+ import threading
+ from types import FrameType, ModuleType
+ 
+-import Image
+-import ImageDraw
++try:
++    from PIL import Image, ImageDraw
++except ImportError:
++    import Image
++    import ImageDraw
+ 
+ from circuits import handler
+ from circuits.web import Controller

Modified: packages/circuits/trunk/debian/patches/series
===================================================================
--- packages/circuits/trunk/debian/patches/series	2013-07-08 23:36:36 UTC (rev 25123)
+++ packages/circuits/trunk/debian/patches/series	2013-07-09 00:02:22 UTC (rev 25124)
@@ -2,3 +2,4 @@
 02_remove_templatebuiltins_js.patch
 03_disable-address-check.patch
 04_fix-python3-sintax-error.patch
+05_fix-pil-import.patch